Ticket #10335: tzinfo-check-encoding-supported-by-python.diff

django/utils/tzinfo.py

@@ -4 +4 @@
 import time
 from datetime import timedelta, tzinfo
 from django.utils.encoding import smart_unicode
+from encodings import codecs
 
 try:
     DEFAULT_ENCODING = locale.getdefaultlocale()[1] or 'ascii'
+    codecs.getdecoder(DEFAULT_ENCODING) # check that it is supported by Python, see #10335
 except:
-    # Any problems at all determining the locale and we fallback. See #5846.
+    # Any problems at all determining the encoding and we fallback. See #5846.
     DEFAULT_ENCODING = 'ascii'
 
 class FixedOffset(tzinfo):