From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Tue, 22 Sep 2015 21:46:08 +0000 (+0200)
Subject: localedata: Rename to locale-data
X-Git-Tag: dev-2a51c9b95d06~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d1882edeef621f3bacbfa6af2d7b5a5d34a81f1;p=thirdparty%2Fbabel.git

localedata: Rename to locale-data

To fix the ImportError because of the name clash with localedata.py.
locale-data is no valid python identifier and thus a nice indicator that
this directory actually contains data.
---

diff --git a/MANIFEST.in b/MANIFEST.in
index a53a51f1..6c1e7aff 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 include Makefile CHANGES LICENSE AUTHORS
 include conftest.py tox.ini
 include babel/global.dat
-include babel/localedata/*.dat
+include babel/locale-data/*.dat
 recursive-include docs *
 recursive-exclude docs/_build *
 include scripts/*
diff --git a/Makefile b/Makefile
index 12dbb5eb..74b9a673 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ import-cldr:
 	@python scripts/download_import_cldr.py
 
 clean-cldr:
-	@rm -f babel/localedata/*.dat
+	@rm -f babel/locale-data/*.dat
 	@rm -f babel/global.dat
 
 clean-pyc:
diff --git a/babel/localedata/.gitignore b/babel/locale-data/.gitignore
similarity index 100%
rename from babel/localedata/.gitignore
rename to babel/locale-data/.gitignore
diff --git a/babel/localedata.py b/babel/localedata.py
index 1d3af9bf..79b4d863 100644
--- a/babel/localedata.py
+++ b/babel/localedata.py
@@ -21,7 +21,7 @@ from babel._compat import pickle
 
 _cache = {}
 _cache_lock = threading.RLock()
-_dirname = os.path.join(os.path.dirname(__file__), 'localedata')
+_dirname = os.path.join(os.path.dirname(__file__), 'locale-data')
 
 
 def exists(name):
diff --git a/scripts/import_cldr.py b/scripts/import_cldr.py
index 789924c2..85132c7e 100755
--- a/scripts/import_cldr.py
+++ b/scripts/import_cldr.py
@@ -271,7 +271,7 @@ def main():
             continue
 
         full_filename = os.path.join(srcdir, 'main', filename)
-        data_filename = os.path.join(destdir, 'localedata', stem + '.dat')
+        data_filename = os.path.join(destdir, 'locale-data', stem + '.dat')
 
         data = {}
         if not need_conversion(data_filename, data, full_filename):
diff --git a/setup.py b/setup.py
index ed46467a..4b8db027 100755
--- a/setup.py
+++ b/setup.py
@@ -62,7 +62,7 @@ setup(
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     packages=['babel', 'babel.messages', 'babel.localtime'],
-    package_data={'babel': ['global.dat', 'localedata/*.dat']},
+    package_data={'babel': ['global.dat', 'locale-data/*.dat']},
     install_requires=[
         # This version identifier is currently necessary as
         # pytz otherwise does not install on pip 1.4 or
diff --git a/tests/test_core.py b/tests/test_core.py
index a4253d80..a643b36a 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -288,10 +288,10 @@ def test_compatible_classes_in_global_and_localedata():
             return Unpickler(f).load()
 
     load('babel/global.dat')
-    load('babel/localedata/root.dat')
-    load('babel/localedata/en.dat')
-    load('babel/localedata/en_US.dat')
-    load('babel/localedata/en_US_POSIX.dat')
-    load('babel/localedata/zh_Hans_CN.dat')
-    load('babel/localedata/zh_Hant_TW.dat')
-    load('babel/localedata/es_419.dat')
+    load('babel/locale-data/root.dat')
+    load('babel/locale-data/en.dat')
+    load('babel/locale-data/en_US.dat')
+    load('babel/locale-data/en_US_POSIX.dat')
+    load('babel/locale-data/zh_Hans_CN.dat')
+    load('babel/locale-data/zh_Hant_TW.dat')
+    load('babel/locale-data/es_419.dat')