followthemoney 3.7.1__py2.py3-none-any.whl → 3.7.3__py2.py3-none-any.whl

followthemoney/__init__.py

@@ -3,7 +3,7 @@ import os
 from followthemoney.model import Model
 from followthemoney.util import set_model_locale
 
-__version__ = "3.7.1"
+__version__ = "3.7.3"
 
 
 model_path = os.path.dirname(__file__)

followthemoney/export/csv.py

@@ -47,7 +47,7 @@ class CSVMixin(object):
         return writer
 
     def close(self) -> None:
-        for (handle, _) in self.handles.values():
+        for handle, _ in self.handles.values():
             handle.close()
 
 

followthemoney/schema/Company.yaml

@@ -104,11 +104,6 @@ Company:
     ticker:
       label: Stock ticker symbol
       type: identifier
-    permId:
-      label: PermID
-      description: LSEG/Refinitiv code for a company
-      type: identifier
-      maxLength: 16
     ricCode:
       label: Reuters Instrument Code
       type: identifier

followthemoney/schema/Organization.yaml

@@ -22,3 +22,8 @@ Organization:
       label: CAGE
       description: Commercial and Government Entity Code (CAGE)
       type: identifier
+    permId:
+      label: PermID
+      description: LSEG/Refinitiv code for a company
+      type: identifier
+      maxLength: 16

followthemoney/types/country.py

@@ -28,6 +28,7 @@ class CountryType(EnumType):
         names = {
             "zz": gettext("Global"),
             "eu": gettext("European Union"),
+            "un": gettext("United Nations"),
             "zr": gettext("Zaire"),
             # Overwrite "Czechia" label:
             "cz": gettext("Czech Republic"),
@@ -46,11 +47,12 @@ class CountryType(EnumType):
             "cy-trnc": gettext("Northern Cyprus"),
             "az-nk": gettext("Nagorno-Karabakh"),
             "cn-xz": gettext("Tibet"),
-            "gg-srk": gettext("Sark"),
+            "cq": gettext("Sark"),
             "gb-wls": gettext("Wales"),
             "gb-sct": gettext("Scotland"),
             "gb-nir": gettext("Northern Ireland"),
             "md-pmr": gettext("Transnistria (PMR)"),
+            "pk-km": gettext("Kashmir"),
         }
         for code, label in locale.territories.items():
             code = code.lower()
@@ -60,6 +62,12 @@ class CountryType(EnumType):
                 int(code)
             except ValueError:
                 names[code] = label
+        # Remove some ISO-3611 codes that are not countries:
+        names.pop("xa", None)
+        names.pop("xb", None)
+        names.pop("qo", None)
+        names.pop("ea", None)
+        names.pop("ez", None)
         return names
 
     def clean_text(

followthemoney/util.py

@@ -18,12 +18,8 @@ DEFAULT_LOCALE = "en"
 T = TypeVar("T")
 K = TypeVar("K")
 V = TypeVar("V")
-try:
-    # Work-around for Python 3.8 backward compat:
-    PathLike = Union[str, os.PathLike[str]]
-except TypeError:
-    PathLike = Union[str, os.PathLike]  # type: ignore
 
+PathLike = Union[str, os.PathLike[str]]
 i18n_path = os.path.join(os.path.dirname(__file__), "translations")
 state = local()
 log = logging.getLogger(__name__)

{followthemoney-3.7.1.dist-info → followthemoney-3.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: followthemoney
-Version: 3.7.1
+Version: 3.7.3
 Home-page: https://followthemoney.tech/
 Author: Organized Crime and Corruption Reporting Project
 Author-email: data@occrp.org

{followthemoney-3.7.1.dist-info → followthemoney-3.7.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-followthemoney/__init__.py,sha256=6hMjBgb9YywaZiMkhsA8krBJLg9cw2fafkZAovou5mM,360
+followthemoney/__init__.py,sha256=CszTkzvwgXMhYQpwAC8cW3DZHzbqfirdRH8R8ZTxJ0U,360
 followthemoney/compare.py,sha256=1GFkCfTzA8QR0CH90kvySR8hvl9hQRUerW5Xw2Ivmpg,5134
 followthemoney/exc.py,sha256=ynZs_UnTVxHR-iBfat_CpVLraYzVX5yLtVf5Ti14hl4,734
 followthemoney/graph.py,sha256=VNDKrUBkz_-DmKsr5v-Xm8VfxzabnTwkU_MFk92_TjA,10848
@@ -13,7 +13,7 @@ followthemoney/proxy.py,sha256=M7RIPF0k-P3v7GYKYhRVVaO1cnUf5FArJepE-2c0KMQ,20033
 followthemoney/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 followthemoney/rdf.py,sha256=_BzWiBc61UYjiyadvGKya4P4JlJfvZtNrn8SP2hC2JM,328
 followthemoney/schema.py,sha256=Tk61vRmWaawW-1HOmu-hbYZtkD8it0fIvNtSRxBEQxA,16774
-followthemoney/util.py,sha256=ec_n8Q_CVAfN4HkUnOZB6IRbMz-p4XXxxwTm1RzLYV4,4508
+followthemoney/util.py,sha256=wpbofEWScRrbaVAFjfpzcYf_V-qT-XruWJRnWGM9WIY,4376
 followthemoney/cli/__init__.py,sha256=Fl05wMr5-FlOSMRpmu1HJSNfPRpy8u9as5IRbGXdo4U,421
 followthemoney/cli/aggregate.py,sha256=Gwfi5Bt1LCwqbpsCu4P1Cr-QJtCWhbaqgGEzfwJUUL4,2142
 followthemoney/cli/cli.py,sha256=yrPw2iyKY-E-uRWe6KN9W3ayvz-22vfpe_ZeD0RiI0c,3591
@@ -23,7 +23,7 @@ followthemoney/cli/sieve.py,sha256=Wh1UQxzyM9Gh60ooS4s4ydlW1b69bMzFM08tg8ttSIY,1
 followthemoney/cli/util.py,sha256=CFcS-PEwpMasMWX_Yg283O_PaAhcPwkvahFNWc13C8c,4769
 followthemoney/export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 followthemoney/export/common.py,sha256=_YrXrwsqmyboDZDhtJ_PazUUJYe1Y-Trqc9lz4YlVR8,991
-followthemoney/export/csv.py,sha256=WPAeHMEKnQE1ZL1_I5qgxki-qKJ5gytur-sTOHAubW0,2635
+followthemoney/export/csv.py,sha256=AvWgyWg0nICAVLv4k9QgWRlgJhJonKCjzlZkrahe5Tg,2633
 followthemoney/export/excel.py,sha256=pj6zNpIbye_Zm3vhCamcqHEe9Fw-RyjtWQDCFY6608s,2645
 followthemoney/export/graph.py,sha256=v0z1FgadyFk5aQ0A5q8E9R4fSO-Tpi5JU9YTDwnRKD8,2765
 followthemoney/export/neo4j.py,sha256=JCLb1eW5FFIJXqmnpNMRzRs1KYuYkCtHZp7KJcu-JNY,7104
@@ -46,7 +46,7 @@ followthemoney/schema/Audio.yaml,sha256=Eb1rZGUEOX7XDAj_1YIN28NCBzMvkopQBNwgHt_k
 followthemoney/schema/BankAccount.yaml,sha256=Pvw9FxJYwwnJMoo3IblyPki9VRjLsM4F30jzKZWv9dE,1452
 followthemoney/schema/Call.yaml,sha256=kbVCnVxucBrEplxehXHThLSJAJjy_GhWan-IeZZjr0M,980
 followthemoney/schema/CallForTenders.yaml,sha256=2IWonTzfSbrkynMoEWqv5fekUeFM_xDKpKIbRe1XDbo,3227
-followthemoney/schema/Company.yaml,sha256=T3ATP_RBbdjaTbntD9lW-Ax1veosXKzwFvkKOdO_g_I,3381
+followthemoney/schema/Company.yaml,sha256=s0zAckdj0b2Ht1I7dT101NE4NpBquJKLYfwuAseYJaE,3253
 followthemoney/schema/Contract.yaml,sha256=-wVVUBu_KvmiWEjXrw1zgY2m9AAkiHCDd-hxFCUzj6k,1586
 followthemoney/schema/ContractAward.yaml,sha256=b2spaZHYCaP1yR1RCsrI7mUjk-fAF7BUE3dc8Vl3cUQ,1689
 followthemoney/schema/CourtCase.yaml,sha256=lcovnY0Ne_xcggvkqfCW_RHvsRKo8kFTCPCyovAXRtI,599
@@ -74,7 +74,7 @@ followthemoney/schema/Mention.yaml,sha256=nBeulR_Jm4x75aJ7yNF0TAVhHJqXQaEzOutLIn
 followthemoney/schema/Message.yaml,sha256=89k3kdN2w_Vfz1UjbUUPojZtMsAvmZGiDSkHeSNMl8w,1484
 followthemoney/schema/Note.yaml,sha256=NohwtFupxIssZuEgQowiQWqKit4uQ-OatAu3yp9eJj4,411
 followthemoney/schema/Occupancy.yaml,sha256=-alsy15cz3RXC_2xYN6rXxwxSOW_hazCNyIvmp7Jawo,773
-followthemoney/schema/Organization.yaml,sha256=AxASyXY18xGXO9FmAwIrARoRy8OxxRPUXlbUqch7Vi4,562
+followthemoney/schema/Organization.yaml,sha256=cy8Fu4R1ZE3qSfYlr9tHz600ymB67CnsCHQYffFAAqY,690
 followthemoney/schema/Ownership.yaml,sha256=naWvWoqJph463fwk6SdC14RAVF03l98bWwpscrW_vJg,997
 followthemoney/schema/Package.yaml,sha256=gPr-P3lcg7OOAav_KVa8baK4yK57JwfcXwxXheD96UQ,310
 followthemoney/schema/Page.yaml,sha256=sQt_CnVyjDVGVECLQoGYZH4hxpjdPhxVRz4XJW-_1OU,1107
@@ -132,7 +132,7 @@ followthemoney/types/__init__.py,sha256=X9XeM6JktzirAw5gGkyDKGM70NuiJ9Tbjoq0IwVc
 followthemoney/types/address.py,sha256=P6ctzojJks70RZIwk5Bhc9djxejZo4Te0m5pQ9M7bAM,1651
 followthemoney/types/checksum.py,sha256=OqjCsBPyMIV3_Y20kTTvjkyayy32pBtaI5KKwYQb6lY,937
 followthemoney/types/common.py,sha256=Yk-7LZ6uDgFzKXUZxQ_j5miN2ZMnlBOziU0iFC7FE9I,10202
-followthemoney/types/country.py,sha256=Ll4NENog6XgPZmt85GCQWnBzpswlZvwDCvhSmJhiVJs,3073
+followthemoney/types/country.py,sha256=v4Y28X7GYs8Te2kbXZG3y0PcdRX4GUwpKtXRn2_WI9A,3366
 followthemoney/types/date.py,sha256=4lZCd0aws-T3HE2BYkb-a-t8iQDr0nqFSAEBoUKiTlM,2683
 followthemoney/types/email.py,sha256=zAnMHwC_FZh7IagpDRhGZf-GfQR6uW8d-lZP4UCdGcM,2745
 followthemoney/types/entity.py,sha256=RCDD9j7MWA_dd0Ib33dl1E6PubsiS1yfVeIOsDxWYpY,2431
@@ -177,10 +177,10 @@ tests/types/test_phones.py,sha256=_GTl-0r5hok8ovUJPRqP7k9kJYMVbanjYUMLrbzFb5U,11
 tests/types/test_registry.py,sha256=IkrHjrEiIIPd4PdMFUg_jVh_gsE6CzGXIF8s3LIbnl0,296
 tests/types/test_topic.py,sha256=m35GSwTy-r77YACGDDac09nYLBIUua42Dy7z292m9EU,707
 tests/types/test_urls.py,sha256=JVmzJ0DKDBle_xLjmOHn0hgDTCpLmljrcfbOM1GSGRw,1170
-followthemoney-3.7.1.dist-info/LICENSE,sha256=Jln3uF70A9AQySyrP9JAW6sQTubLoKVQunvuJqISv7w,1098
-followthemoney-3.7.1.dist-info/METADATA,sha256=_2AsZMq64-w-F0Nwg6uJ5ZTbtVpOoEFrSaYfc4Whe1g,4453
-followthemoney-3.7.1.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-followthemoney-3.7.1.dist-info/entry_points.txt,sha256=wpgi-5-jyqCy-yw0eYZbnhBuPja_q3RJmiEl7NymXtQ,593
-followthemoney-3.7.1.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-followthemoney-3.7.1.dist-info/top_level.txt,sha256=O33_kGPehy6-69B_k01UgMK55_JOhwqe2de7ND23b-Y,21
-followthemoney-3.7.1.dist-info/RECORD,,
+followthemoney-3.7.3.dist-info/LICENSE,sha256=Jln3uF70A9AQySyrP9JAW6sQTubLoKVQunvuJqISv7w,1098
+followthemoney-3.7.3.dist-info/METADATA,sha256=n1OHjUg-uXmTbh8bariDKjdpcIyPL2wCwj0HyBAtLGg,4453
+followthemoney-3.7.3.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+followthemoney-3.7.3.dist-info/entry_points.txt,sha256=wpgi-5-jyqCy-yw0eYZbnhBuPja_q3RJmiEl7NymXtQ,593
+followthemoney-3.7.3.dist-info/namespace_packages.txt,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+followthemoney-3.7.3.dist-info/top_level.txt,sha256=O33_kGPehy6-69B_k01UgMK55_JOhwqe2de7ND23b-Y,21
+followthemoney-3.7.3.dist-info/RECORD,,