mirror of
				https://github.com/django/django.git
				synced 2025-10-31 09:41:08 +00:00 
			
		
		
		
	Fixed #5095 -- newforms now checks for EnvironmentError when importing settings. Thanks, SmileyChris
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
		| @@ -344,7 +344,7 @@ url_re = re.compile( | |||||||
| try: | try: | ||||||
|     from django.conf import settings |     from django.conf import settings | ||||||
|     URL_VALIDATOR_USER_AGENT = settings.URL_VALIDATOR_USER_AGENT |     URL_VALIDATOR_USER_AGENT = settings.URL_VALIDATOR_USER_AGENT | ||||||
| except ImportError: | except (ImportError, EnvironmentError): | ||||||
|     # It's OK if Django settings aren't configured. |     # It's OK if Django settings aren't configured. | ||||||
|     URL_VALIDATOR_USER_AGENT = 'Django (http://www.djangoproject.com/)' |     URL_VALIDATOR_USER_AGENT = 'Django (http://www.djangoproject.com/)' | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user