From 2dbb08e5dc7fe97d912855de530713a4ff7e42c0 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Fri, 29 Feb 2008 17:13:20 +0000 Subject: [PATCH] Fixed #5846 -- Bullet-proofed the default timezone encoding test. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7184 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/tzinfo.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/django/utils/tzinfo.py b/django/utils/tzinfo.py index 7d5ead9290..d8bdee390a 100644 --- a/django/utils/tzinfo.py +++ b/django/utils/tzinfo.py @@ -5,7 +5,11 @@ import time from datetime import timedelta, tzinfo from django.utils.encoding import smart_unicode -DEFAULT_ENCODING = locale.getdefaultlocale()[1] or 'ascii' +try: + DEFAULT_ENCODING = locale.getdefaultlocale()[1] or 'ascii' +except: + # Any problems at all determining the locale and we fallback. See #5846. + DEFAULT_ENCODING = 'ascii' class FixedOffset(tzinfo): "Fixed offset in minutes east from UTC."