From 4ba6348a004352ba1790c043e7bc195637cb0b72 Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Tue, 2 Nov 2010 16:19:17 +0000 Subject: [PATCH] Fixed #14598 -- Changed some 'domain.com' uses to 'example.com' git-svn-id: http://code.djangoproject.com/svn/django/trunk@14440 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/global_settings.py | 2 +- django/conf/project_template/settings.py | 2 +- tests/modeltests/validators/tests.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index e9ab5c7c987..6ca07042574 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -21,7 +21,7 @@ DEBUG_PROPAGATE_EXCEPTIONS = False USE_ETAGS = False # People who get code error notifications. -# In the format (('Full Name', 'email@domain.com'), ('Full Name', 'anotheremail@domain.com')) +# In the format (('Full Name', 'email@example.com'), ('Full Name', 'anotheremail@example.com')) ADMINS = () # Tuple of IP addresses, as strings, that: diff --git a/django/conf/project_template/settings.py b/django/conf/project_template/settings.py index 7791b47cab5..d3e6973d04b 100644 --- a/django/conf/project_template/settings.py +++ b/django/conf/project_template/settings.py @@ -4,7 +4,7 @@ DEBUG = True TEMPLATE_DEBUG = DEBUG ADMINS = ( - # ('Your Name', 'your_email@domain.com'), + # ('Your Name', 'your_email@example.com'), ) MANAGERS = ADMINS diff --git a/tests/modeltests/validators/tests.py b/tests/modeltests/validators/tests.py index b4411a221a9..6fe154288d5 100644 --- a/tests/modeltests/validators/tests.py +++ b/tests/modeltests/validators/tests.py @@ -92,7 +92,7 @@ TEST_DATA = ( (URLValidator(), 'http://www.example.com/', None), (URLValidator(), 'http://www.example.com:8000/test', None), (URLValidator(), 'http://valid-with-hyphens.com/', None), - (URLValidator(), 'http://subdomain.domain.com/', None), + (URLValidator(), 'http://subdomain.example.com/', None), (URLValidator(), 'http://200.8.9.10/', None), (URLValidator(), 'http://200.8.9.10:8000/test', None), (URLValidator(), 'http://valid-----hyphens.com/', None),