From 50b1c8f7756e5b8f84d3164754b67139a3195589 Mon Sep 17 00:00:00 2001
From: David Paleino <dapal@debian.org>
Date: Fri, 14 Dec 2018 02:03:07 -0500
Subject: [PATCH] Use system iso-codes
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
src/pycountry/__init__.py | 22 +++++++++-------------
src/pycountry/tests/test_general.py | 2 +-
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/pycountry/__init__.py b/src/pycountry/__init__.py
index 2fdaf40..fe0da5b 100644
--- a/src/pycountry/__init__.py
+++ b/src/pycountry/__init__.py
@@ -9,17 +9,13 @@ import pycountry.db
try:
import pkg_resources
- resource_filename = pkg_resources.resource_filename
__version__ = pkg_resources.get_distribution("pycountry").version
except ImportError:
__version__ = "n/a"
- def resource_filename(package_or_requirement, resource_name):
- return os.path.join(os.path.dirname(__file__), resource_name)
-
-LOCALES_DIR = resource_filename("pycountry", "locales")
-DATABASE_DIR = resource_filename("pycountry", "databases")
+LOCALES_DIR = "/usr/share/locale"
+DATABASE_DIR = "/usr/share/iso-codes/json"
def remove_accents(input_str):
@@ -199,17 +195,17 @@ class Subdivisions(pycountry.db.Database):
return subdivisions
-countries = ExistingCountries(os.path.join(DATABASE_DIR, "iso3166-1.json"))
-subdivisions = Subdivisions(os.path.join(DATABASE_DIR, "iso3166-2.json"))
+countries = ExistingCountries(os.path.join(DATABASE_DIR, "iso_3166-1.json"))
+subdivisions = Subdivisions(os.path.join(DATABASE_DIR, "iso_3166-2.json"))
historic_countries = HistoricCountries(
- os.path.join(DATABASE_DIR, "iso3166-3.json")
+ os.path.join(DATABASE_DIR, "iso_3166-3.json")
)
-currencies = Currencies(os.path.join(DATABASE_DIR, "iso4217.json"))
+currencies = Currencies(os.path.join(DATABASE_DIR, "iso_4217.json"))
-languages = Languages(os.path.join(DATABASE_DIR, "iso639-3.json"))
+languages = Languages(os.path.join(DATABASE_DIR, "iso_639-3.json"))
language_families = LanguageFamilies(
- os.path.join(DATABASE_DIR, "iso639-5.json")
+ os.path.join(DATABASE_DIR, "iso_639-5.json")
)
-scripts = Scripts(os.path.join(DATABASE_DIR, "iso15924.json"))
+scripts = Scripts(os.path.join(DATABASE_DIR, "iso_15924.json"))
diff --git a/src/pycountry/tests/test_general.py b/src/pycountry/tests/test_general.py
index 70588be..749859e 100644
--- a/src/pycountry/tests/test_general.py
+++ b/src/pycountry/tests/test_general.py
@@ -152,7 +152,7 @@ def test_language_families():
def test_locales():
german = gettext.translation(
- "iso3166", pycountry.LOCALES_DIR, languages=["de"]
+ "iso_3166", pycountry.LOCALES_DIR, languages=["de"]
)
german.install()
assert __builtins__["_"]("Germany") == "Deutschland"
--
2.35.1