Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #10335: handle system locals unknown to Python in timezone name…

… handling. Thanks, mitsuhiko.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 60cfd45107d33da6f655efe566d29190525c8f33 1 parent 5950775
@jacobian jacobian authored
Showing with 15 additions and 10 deletions.
  1. +11 −0 django/utils/encoding.py
  2. +4 −10 django/utils/tzinfo.py
View
11 django/utils/encoding.py
@@ -1,6 +1,8 @@
import types
import urllib
+import locale
import datetime
+import codecs
from django.utils.functional import Promise
@@ -136,3 +138,12 @@ def iri_to_uri(iri):
return iri
return urllib.quote(smart_str(iri), safe='/#%[]=:;$&()+,!?*')
+
+# The encoding of the default system locale but falls back to the
+# given fallback encoding if the encoding is unsupported by python or could
+# not be determined. See tickets #10335 and #5846
+try:
+ DEFAULT_LOCALE_ENCODING = locale.getdefaultlocale()[1] or 'ascii'
+ codecs.lookup(DEFAULT_LOCALE_ENCODING)
+except:
+ DEFAULT_LOCALE_ENCODING = 'ascii'
View
14 django/utils/tzinfo.py
@@ -1,15 +1,8 @@
"Implementation of tzinfo classes for use with datetime.datetime."
-import locale
import time
from datetime import timedelta, tzinfo
-from django.utils.encoding import smart_unicode
-
-try:
- DEFAULT_ENCODING = locale.getdefaultlocale()[1] or 'ascii'
-except:
- # Any problems at all determining the locale and we fallback. See #5846.
- DEFAULT_ENCODING = 'ascii'
+from django.utils.encoding import smart_unicode, smart_str, DEFAULT_LOCALE_ENCODING
class FixedOffset(tzinfo):
"Fixed offset in minutes east from UTC."
@@ -41,7 +34,7 @@ def __init__(self, dt):
self._tzname = self.tzname(dt)
def __repr__(self):
- return self._tzname
+ return smart_str(self._tzname)
def utcoffset(self, dt):
if self._isdst(dt):
@@ -57,7 +50,8 @@ def dst(self, dt):
def tzname(self, dt):
try:
- return smart_unicode(time.tzname[self._isdst(dt)], DEFAULT_ENCODING)
+ return smart_unicode(time.tzname[self._isdst(dt)],
+ DEFAULT_LOCALE_ENCODING)
except UnicodeDecodeError:
return None
Please sign in to comment.
Something went wrong with that request. Please try again.