Merge ~vskytta/pytz:encname into pytz:master

[Ville Skyttä]

Unmerged commits

d807daf... by Ville Skyttä on 2016-07-26

Lookup ASCII by alias 'ASCII' instead of 'US-ASCII'

For improved performance on CPython:
https://docs.python.org/library/codecs.html#standard-encodings

diff --git a/src/pytz/__init__.py b/src/pytz/__init__.py
index 3ef1636..a8980a6 100644
--- a/src/pytz/__init__.py
+++ b/src/pytz/__init__.py
@@ -57,7 +57,7 @@ except NameError: # Python 3.x
             ...
         UnicodeEncodeError: ...
         """
-        s.encode('US-ASCII') # Raise an exception if not ASCII
+        s.encode('ASCII') # Raise an exception if not ASCII
         return s # But return the original string - not a byte string.
 
 else: # Python 2.x
@@ -73,7 +73,7 @@ else: # Python 2.x
             ...
         UnicodeEncodeError: ...
         """
-        return s.encode('US-ASCII')
+        return s.encode('ASCII')
 
 
 def open_resource(name):
diff --git a/src/pytz/tests/test_docs.py b/src/pytz/tests/test_docs.py
index fb49ec1..ae189d3 100644
--- a/src/pytz/tests/test_docs.py
+++ b/src/pytz/tests/test_docs.py
@@ -13,7 +13,7 @@ class DocumentationTestCase(unittest.TestCase):
         '''Confirm the README.txt is pure ASCII.'''
         f = open(README, 'rb')
         try:
-            f.read().decode('US-ASCII')
+            f.read().decode('ASCII')
         finally:
             f.close()
 
diff --git a/src/pytz/tzfile.py b/src/pytz/tzfile.py
index 9c007c8..323e097 100644
--- a/src/pytz/tzfile.py
+++ b/src/pytz/tzfile.py
@@ -15,13 +15,13 @@ from pytz.tzinfo import memorized_datetime, memorized_timedelta
 
 def _byte_string(s):
     """Cast a string or byte string to an ASCII byte string."""
-    return s.encode('US-ASCII')
+    return s.encode('ASCII')
 
 _NULL = _byte_string('\0')
 
 def _std_string(s):
     """Cast a string or byte string to an ASCII string."""
-    return str(s.decode('US-ASCII'))
+    return str(s.decode('ASCII'))
 
 def build_tzinfo(zone, fp):
     head_fmt = '>4s c 15x 6l'