From: Jun Omae <jun66j5@gmail.com>
Date: Tue, 4 Aug 2015 11:15:25 +0000 (+0900)
Subject: Removed uses of datetime.date class from *.dat files (#174)
X-Git-Tag: dev-2a51c9b95d06~33^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94f68302796149898fe99c14edc2a5519baad5e8;p=thirdparty%2Fbabel.git

Removed uses of datetime.date class from *.dat files (#174)

To avoid incompatible *.dat files between Python 2 and 3.
---

diff --git a/babel/numbers.py b/babel/numbers.py
index 01af774d..35705b59 100644
--- a/babel/numbers.py
+++ b/babel/numbers.py
@@ -135,6 +135,10 @@ def get_territory_currencies(territory, start_date=None, end_date=None,
 
     result = []
     for currency_code, start, end, is_tender in curs:
+        if start:
+            start = date_(*start)
+        if end:
+            end = date_(*end)
         if ((is_tender and tender) or \
             (not is_tender and non_tender)) and _is_active(start, end):
             if include_details:
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 7dcd171c..1b009234 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -21,8 +21,6 @@ try:
 except ImportError:
     from xml.etree import ElementTree
 
-from datetime import date
-
 # Make sure we're using Babel source, and not some previously installed version
 sys.path.insert(0, os.path.join(os.path.dirname(sys.argv[0]), '..'))
 
@@ -103,12 +101,12 @@ def _parse_currency_date(s):
     if not s:
         return None
     parts = s.split('-', 2)
-    return date(*map(int, parts + [1] * (3 - len(parts))))
+    return tuple(map(int, parts + [1] * (3 - len(parts))))
 
 
 def _currency_sort_key(tup):
     code, start, end, tender = tup
-    return int(not tender), start or date(1, 1, 1)
+    return int(not tender), start or (1, 1, 1)
 
 
 def main():