countries-dictionary 7.0.0.dev2__tar.gz → 8.0.0.dev1__tar.gz

{countries_dictionary-7.0.0.dev2 → countries_dictionary-8.0.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: countries_dictionary
-Version: 7.0.0.dev2
+Version: 8.0.0.dev1
 Summary: Provides dictionaries contains countries and unrecognised states and information about them
 Author-email: Ngô Trần Quang Thiện <quangthienngotran@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{countries_dictionary-7.0.0.dev2 → countries_dictionary-8.0.0.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "countries_dictionary"
-version = "7.0.0.dev2"
+version = "8.0.0.dev1"
 description = "Provides dictionaries contains countries and unrecognised states and information about them"
 readme = "README.md"
 requires-python = ">=3.7"

countries_dictionary-8.0.0.dev1/src/countries_dictionary/__init__.py

@@ -0,0 +1,10 @@
+from countries_dictionary.countries import COUNTRIES
+from countries_dictionary.russia import RUSSIA
+from countries_dictionary.united_states import UNITED_STATES
+from countries_dictionary.vietnam import VIETNAM
+
+from countries_dictionary.unrecognised_states import UNRECOGNISED_STATES
+from countries_dictionary.unrecognised_states.transnistria import TRANSNISTRIA
+
+from countries_dictionary.tools.quick_functions import quick_function, json_dictionary, sort_dictionary
+from countries_dictionary.tools.iso_finder import iso_finder, iso_ru_finder, iso_us_finder, iso_vn_finder

{countries_dictionary-7.0.0.dev2/src/countries_dictionary → countries_dictionary-8.0.0.dev1/src/countries_dictionary/tools}/iso_finder.py

@@ -1,7 +1,5 @@
-from countries_dictionary.quick_functions import quick_function
-from countries_dictionary.russia import RUSSIA
-from countries_dictionary.united_states import UNITED_STATES
-from countries_dictionary.vietnam import VIETNAM
+from countries_dictionary import quick_function
+from countries_dictionary import RUSSIA, UNITED_STATES, VIETNAM
 
 countries = quick_function(addition="ISO 3166-2")
 

{countries_dictionary-7.0.0.dev2/src/countries_dictionary → countries_dictionary-8.0.0.dev1/src/countries_dictionary/tools}/quick_functions.py

@@ -1,7 +1,4 @@
-from countries_dictionary import COUNTRIES
-from countries_dictionary.russia import RUSSIA
-from countries_dictionary.united_states import UNITED_STATES
-from countries_dictionary.vietnam import VIETNAM
+from countries_dictionary import COUNTRIES, RUSSIA, UNITED_STATES, VIETNAM, UNRECOGNISED_STATES, TRANSNISTRIA
 
 from json import dumps
 from copy import deepcopy
@@ -13,17 +10,19 @@ def quick_function(dictionary: str = "countries", addition: str = ""):
         case "russia": thanhbinh = deepcopy(RUSSIA)
         case "united states" | "america": thanhbinh = deepcopy(UNITED_STATES)
         case "vietnam": thanhbinh = deepcopy(VIETNAM)
+        case "unrecognised_states" | "unrecognized_states" | "unrecognised" | "unrecognized": thanhbinh = deepcopy(UNRECOGNISED_STATES)
+        case "transnistria" | "pridnestrovie": thanhbinh = deepcopy(TRANSNISTRIA)
         case _: raise Exception("This dictionary does not exist (yet)")
     match addition.casefold():
         case "population density":
-            if dictionary.casefold() == "countries":
+            if dictionary.casefold() in ("countries", "unrecognised_states", "unrecognized_states", "unrecognised", "unrecognized"):
                 for x in thanhbinh: thanhbinh[x]["population density"] = thanhbinh[x]["population"] / thanhbinh[x]["land area"]
             else:
                 for x in thanhbinh: thanhbinh[x]["population density"] = thanhbinh[x]["population"] / thanhbinh[x]["area"]
         case "gdp per capita":
-            if dictionary.casefold() == "countries":
+            if dictionary.casefold() in ("countries", "unrecognised_states", "unrecognized_states", "unrecognised", "unrecognized"):
                 for x in thanhbinh: thanhbinh[x]["GDP per capita"] = thanhbinh[x]["nominal GDP"] / thanhbinh[x]["population"]
-            else: raise Exception("Only works with the Countries dictionary")
+            else: raise Exception("Only works with the Countries and Unrecognised states dictionary")
         case "iso 3166-2":
             if dictionary.casefold() == "countries":
                 for x in thanhbinh: thanhbinh[x]["ISO 3166-2"] = "ISO 3166-2:" + thanhbinh[x]["ISO 3166-1"]["alpha-2"]

{countries_dictionary-7.0.0.dev2 → countries_dictionary-8.0.0.dev1}/src/countries_dictionary.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: countries_dictionary
-Version: 7.0.0.dev2
+Version: 8.0.0.dev1
 Summary: Provides dictionaries contains countries and unrecognised states and information about them
 Author-email: Ngô Trần Quang Thiện <quangthienngotran@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{countries_dictionary-7.0.0.dev2 → countries_dictionary-8.0.0.dev1}/src/countries_dictionary.egg-info/SOURCES.txt

@@ -2,9 +2,7 @@ LICENCE
 README.md
 pyproject.toml
 src/countries_dictionary/__init__.py
-src/countries_dictionary/iso_finder.py
-src/countries_dictionary/main_countries.py
-src/countries_dictionary/quick_functions.py
+src/countries_dictionary/countries.py
 src/countries_dictionary/russia.py
 src/countries_dictionary/united_states.py
 src/countries_dictionary/vietnam.py
@@ -12,5 +10,7 @@ src/countries_dictionary.egg-info/PKG-INFO
 src/countries_dictionary.egg-info/SOURCES.txt
 src/countries_dictionary.egg-info/dependency_links.txt
 src/countries_dictionary.egg-info/top_level.txt
-src/countries_dictionary/unrecognised_states/transnistria.py
-src/countries_dictionary/unrecognised_states/unrecognised.py
+src/countries_dictionary/tools/iso_finder.py
+src/countries_dictionary/tools/quick_functions.py
+src/countries_dictionary/unrecognised_states/__init__.py
+src/countries_dictionary/unrecognised_states/transnistria.py

countries_dictionary-7.0.0.dev2/src/countries_dictionary/__init__.py

@@ -1,10 +0,0 @@
-from countries_dictionary.main_countries import COUNTRIES
-from countries_dictionary.russia import RUSSIA
-from countries_dictionary.united_states import UNITED_STATES
-from countries_dictionary.vietnam import VIETNAM
-
-from countries_dictionary.quick_functions import quick_function, json_dictionary, sort_dictionary
-from countries_dictionary.iso_finder import iso_finder, iso_ru_finder, iso_us_finder, iso_vn_finder
-
-from countries_dictionary.unrecognised_states.unrecognised import UNRECOGNISED_STATES
-from countries_dictionary.unrecognised_states.transnistria import TRANSNISTRIA