Merge branch 'master' into Ukrainian-localflavor

Author: illia-v

.travis.yml

@@ -36,13 +36,17 @@ matrix:
       env: TOXENV=py35-1.10
     - python: 3.5
       env: TOXENV=py35-master
+    - python: 3.6
+      env: TOXENV=py36-master
   allow_failures:
     - python: 2.7
       env: TOXENV=py27-master
     - python: 3.4
       env: TOXENV=py34-master
     - python: 3.5
       env: TOXENV=py35-master
+    - python: 3.6
+      env: TOXENV=py36-master
 install:
     - pip wheel -r tests/requirements.txt codecov
     # virtualenv>=14.0.0 has dropped Python 3.2 support

README.rst

@@ -33,6 +33,8 @@ Package Index: https://pypi.python.org/pypi/django-localflavor
 You're encouraged to use the latest version of this package unless you need
 support for an unsupported version of Django.
 
+**2017-01-03 - 1.4**: Django 1.8 - 1.10
+
 **2016-05-06 - 1.3**: Django 1.7 - 1.9
 
 **2015-11-27 - 1.2**: Django 1.5 - 1.9

docs/authors.rst

@@ -68,6 +68,7 @@ Authors
 * Michał Sałaban
 * Mike Lissner
 * Olivier Sels
+* Paul Donohue
 * Paulo Poiati
 * Rael Max
 * Ramiro Morales

docs/changelog.rst

@@ -22,7 +22,7 @@ Other changes:
 
 - None
 
-1.4   (unreleased)
+1.4   (2017-01-03)
 ------------------
 
 New flavors:
@@ -72,10 +72,13 @@ Other changes:
 - Ensure the migration framework generates schema migrations for model fields that change the max_length
   (`gh-257 <https://github.com/django/django-localflavor/pull/257>`_). Users will need to generate migrations for any
   model fields they use with 'makemigrations'.
-
+- Lazily generate US_STATES, STATE_CHOICES, and USPS_CHOICES
+  (`gh-203 <https://github.com/django/django-localflavor/issues/203>`_
+  `gh-272 <https://github.com/django/django-localflavor/pull/272>`_).
 - Deprecated Phone Number fields
-  (`gh-262 <https://github.com/django/django-localflavor/pull/262>`_)
-
+  (`gh-262 <https://github.com/django/django-localflavor/pull/262>`_).
+- Bumped versions of requirements for testing
+  (`gh-274 <https://github.com/django/django-localflavor/pull/274>`_).
 
 1.3   (2016-05-06)
 ------------------

docs/index.rst

@@ -210,7 +210,7 @@ We might have an extra release if there are enough features in between django re
 =========== =========== ===============
   Version     Django     Date
 =========== =========== ===============
-1.4         1.10         December 2016
+1.4         1.10         January 2017
 1.x         ...          ...
 2.0         2.0          January 2018
 =========== =========== ===============

docs/localflavor/us.rst

@@ -18,7 +18,7 @@ Data
 
 .. autodata:: localflavor.us.us_states.CONTIGUOUS_STATES
 
-.. autodata:: localflavor.us.us_states.US_STATES
+.. autodata:: localflavor.us.us_states.NON_CONTIGUOUS_STATES
 
 .. autodata:: localflavor.us.us_states.US_TERRITORIES
 
@@ -28,8 +28,82 @@ Data
 
 .. autodata:: localflavor.us.us_states.OBSOLETE_STATES
 
-.. autodata:: localflavor.us.us_states.STATE_CHOICES
+.. data:: localflavor.us.us_states.US_STATES
+    :annotation: = CONTIGUOUS_STATES + NON_CONTIGUOUS_STATES
 
-.. autodata:: localflavor.us.us_states.USPS_CHOICES
+    All US states.
+
+    This tuple is lazily generated and may not work as expected in all cases due
+    to tuple optimizations in the Python interpreter which do not account for
+    lazily generated tuples.  For example::
+
+      US_STATES + ('XX', _('Select a State'))
+
+    should work as expected, but::
+
+      ('XX', _('Select a State')) + US_STATES
+
+    may throw:
+
+    ``TypeError: can only concatenate tuple (not "proxy") to tuple``
+
+    due to a Python optimization that causes the concatenation to occur before
+    US_STATES has been lazily generated.  To work around these issues, you
+    can use a slice index (``[:]``) to force the generation of US_STATES
+    before any other operations are processed by the Python interpreter::
+
+      ('XX', _('Select a State')) + US_STATES[:]
+
+.. data:: localflavor.us.us_states.STATE_CHOICES
+    :annotation: = CONTIGUOUS_STATES + NON_CONTIGUOUS_STATES + US_TERRITORIES + ARMED_FORCES_STATES
+
+    All US states and territories plus DC and military mail.
+
+    This tuple is lazily generated and may not work as expected in all cases due
+    to tuple optimizations in the Python interpreter which do not account for
+    lazily generated tuples.  For example::
+
+      STATE_CHOICES + ('XX', _('Select a State'))
+
+    should work as expected, but::
+
+      ('XX', _('Select a State')) + STATE_CHOICES
+
+    may throw:
+
+    ``TypeError: can only concatenate tuple (not "proxy") to tuple``
+
+    due to a Python optimization that causes the concatenation to occur before
+    STATE_CHOICES has been lazily generated.  To work around these issues, you
+    can use a slice index (``[:]``) to force the generation of STATE_CHOICES
+    before any other operations are processed by the Python interpreter::
+
+      ('XX', _('Select a State')) + STATE_CHOICES[:]
+
+.. data:: localflavor.us.us_states.USPS_CHOICES
+    :annotation: = CONTIGUOUS_STATES + NON_CONTIGUOUS_STATES + US_TERRITORIES + ARMED_FORCES_STATES + COFA_STATES
+
+    All US Postal Service locations.
+
+    This tuple is lazily generated and may not work as expected in all cases due
+    to tuple optimizations in the Python interpreter which do not account for
+    lazily generated tuples.  For example::
+
+      USPS_CHOICES + ('XX', _('Select a State'))
+
+    should work as expected, but::
+
+      ('XX', _('Select a State')) + USPS_CHOICES
+
+    may throw:
+
+      ``TypeError: can only concatenate tuple (not "proxy") to tuple``
+
+    due to a Python optimization that causes the concatenation to occur before
+    USPS_CHOICES has been lazily generated.  To work around these issues, you
+    can use a slice index (``[:]``) to force the generation of USPS_CHOICES
+    before any other operations are processed by the Python interpreter::
+
+      ('XX', _('Select a State')) + USPS_CHOICES[:]
 
 .. autodata:: localflavor.us.us_states.STATES_NORMALIZED

localflavor/__init__.py

@@ -1 +1 @@
-__version__ = '1.3'
+__version__ = '1.4'