Merge pull request #533 from yagebu/fix-pyinstaller

* Revert "Also check for `sys._MEIPASS` before assuming PyInstallerness (#526)" (0b34807)
* Revert "Merge pull request #505 from wodo/pi_support" (commit 653e6d4, reversing
changes made to 5f3b008)

babel/core.py

@@ -68,7 +68,7 @@ def get_global(key):
     """
     global _global_data
     if _global_data is None:
-        dirname = localedata.get_base_dir()
+        dirname = os.path.join(os.path.dirname(__file__))
         filename = os.path.join(dirname, 'global.dat')
         if not os.path.isfile(filename):
             _raise_no_data_error()

babel/localedata.py

@@ -16,23 +16,13 @@
 import threading
 from collections import MutableMapping
 from itertools import chain
-import sys
 
 from babel._compat import pickle, string_types
 
 
-def get_base_dir():
-    if getattr(sys, 'frozen', False) and getattr(sys, '_MEIPASS', None):
-        # we are running in a |PyInstaller| bundle
-        basedir = sys._MEIPASS
-    else:
-        # we are running in a normal Python environment
-        basedir = os.path.dirname(__file__)
-    return basedir
-
 _cache = {}
 _cache_lock = threading.RLock()
-_dirname = os.path.join(get_base_dir(), 'locale-data')
+_dirname = os.path.join(os.path.dirname(__file__), 'locale-data')
 
 
 def normalize_locale(name):

tests/test_localedata.py

@@ -14,7 +14,6 @@
 import unittest
 import random
 from operator import methodcaller
-import sys
 
 from babel import localedata, numbers
 
@@ -94,17 +93,6 @@ def test_mixedcased_locale():
             methodcaller(random.choice(['lower', 'upper']))(c) for c in l])
         assert localedata.exists(locale_id)
 
-
-def test_pi_support_frozen(monkeypatch):
-    monkeypatch.setattr(sys, '_MEIPASS', 'testdir', raising=False)
-    monkeypatch.setattr(sys, 'frozen', True, raising=False)
-    assert localedata.get_base_dir() == 'testdir'
-
-
-def test_pi_support_not_frozen():
-    assert not getattr(sys, 'frozen', False)
-    assert localedata.get_base_dir().endswith('babel')
-
 def test_locale_argument_acceptance():
     # Testing None input.
     normalized_locale = localedata.normalize_locale(None)