Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #17798 -- Tweaked the CA localflavor.

Thanks shelldweller.
  • Loading branch information...
commit 46648b641d86b663f825227df5af5473f13a3fb4 1 parent 73f7d34
Aymeric Augustin authored May 10, 2012
6  django/contrib/localflavor/ca/ca_provinces.py
@@ -8,11 +8,6 @@
8 8
 This exists in this standalone file so that it's only imported into memory 
9 9
 when explicitly needed. 
10 10
 """ 
11  
-import warnings
12  
-warnings.warn(
13  
-    'There have been recent changes to the CA localflavor. See the release notes for details',
14  
-    RuntimeWarning
15  
-)
16 11
 
17 12
 PROVINCE_CHOICES = ( 
18 13
     ('AB', 'Alberta'), 
@@ -56,6 +51,7 @@
56 51
     'pei': 'PE',
57 52
     'p.e.i.': 'PE',
58 53
     'prince edward island': 'PE',
  54
+    'pq' : 'QC',
59 55
     'qc': 'QC',
60 56
     'quebec': 'QC',
61 57
     'sk': 'SK',
3  docs/releases/1.5.txt
@@ -44,6 +44,9 @@ Django 1.5 also includes several smaller improvements worth noting:
44 44
 * :mod:`django.utils.timezone` provides a helper for converting aware
45 45
   datetimes between time zones. See :func:`~django.utils.timezone.localtime`.
46 46
 
  47
+* In the localflavor for Canada, "pq" was added to the acceptable codes for
  48
+  Quebec. It's an old abbreviation.
  49
+
47 50
 Backwards incompatible changes in 1.5
48 51
 =====================================
49 52
 
1  tests/regressiontests/localflavor/ca/tests.py
@@ -93,6 +93,7 @@ def test_CAProvinceField(self):
93 93
             'BC': 'BC',
94 94
             'nova scotia': 'NS',
95 95
             '  manitoba ': 'MB',
  96
+            'pq': 'QC',
96 97
         }
97 98
         invalid = {
98 99
             'T2S 2H7': error_format,

0 notes on commit 46648b6

Please sign in to comment.
Something went wrong with that request. Please try again.