incremental tmp

the heat
whoops, missed dev flag
2021-03-09 03:09:52 +01:00 · 2020-08-12 17:02:54 +02:00 · 2020-08-12 17:01:06 +02:00 · 2020-08-12 16:09:53 +02:00 · 2020-08-08 03:46:57 +02:00 · 2020-07-26 03:12:35 +02:00
32 changed files with 1024 additions and 15935 deletions
@@ -1,3 +1,20 @@
+2.6.5.3217
+
+subscene, addic7ed
+- either of those providers might impose a reCAPTCHA verification. In order to use those providers, please create an account at an AntiCaptcha service ([anti-captcha.com](http://getcaptchasolution.com/kkvviom7nh) or [deathbycaptcha.com](http://deathbycaptcha.com)), add funds, then supply your credentials/apikey in the configuration
+
+Changelog
+- core: also extract (missing) embedded subtitles when SearchAllRecentlyAddedMissing is running
+- core: core: clarify detecting streams (in logs)
+- core: UnRAR: set binary to executable, even if not checked out from git; might fix #693
+- core: bazarr-backport: morpheus65535/bazarr#703: use proper language code detection instead of a wild guess; should fix bad existing subtitle detection
+- core: bazarr-backport: morpheus65535/bazarr#660: fix BOM encoding stuff
+- core: bazarr-backport: morpheus65535/bazarr#656 further generalize formats; skip release group match if format match failed
+- core: fix stream detection when using mediainfo (#711)
+- config/core: make periodic SZ-internal subtitle maintenance interval configurable
+- providers: add BSPlayer Subtitles
+- providers: add ScrewZira (Hebrew)
+
 2.6.5.3183

 subscene, addic7ed
@@ -262,7 +262,8 @@ class SubZeroAgent(object):


 class SubZeroSubtitlesAgentMovies(SubZeroAgent, Agent.Movies):
-    contributes_to = ['com.plexapp.agents.imdb', 'com.plexapp.agents.xbmcnfo', 'com.plexapp.agents.themoviedb', 'com.plexapp.agents.hama']
+    contributes_to = ['com.plexapp.agents.imdb', 'com.plexapp.agents.xbmcnfo', 'com.plexapp.agents.themoviedb',
+                      'com.plexapp.agents.hama',  'tv.plex.agents.movie']
    score_prefs_key = "subtitles.search.minimumMovieScore2"
    agent_type_verbose = "Movies"

@@ -10,6 +10,8 @@ import jstyleson
 import datetime
 import stat
 import traceback
+import socket
+import requests

 import subliminal
 import subliminal_patch
@@ -63,7 +65,9 @@ def int_or_default(s, default):


 VALID_THROTTLE_EXCEPTIONS = (TooManyRequests, DownloadLimitExceeded, DownloadLimitPerDayExceeded,
-                             ServiceUnavailable, APIThrottled)
+                             ServiceUnavailable, APIThrottled, requests.Timeout, requests.ReadTimeout, socket.timeout)
+
+def_timeout = (datetime.timedelta(minutes=20), "20 minutes")

 PROVIDER_THROTTLE_MAP = {
    "default": {
@@ -73,6 +77,9 @@ PROVIDER_THROTTLE_MAP = {
        ServiceUnavailable: (datetime.timedelta(minutes=20), "20 minutes"),
        APIThrottled: (datetime.timedelta(minutes=10), "10 minutes"),
        AuthenticationError: (datetime.timedelta(hours=2), "2 hours"),
+        requests.Timeout: def_timeout,
+        socket.timeout: def_timeout,
+        requests.ReadTimeout: def_timeout,
    },
    "opensubtitles": {
        TooManyRequests: (datetime.timedelta(hours=3), "3 hours"),
@@ -666,12 +673,18 @@ class Config(object):
            if not agent.primary:
                continue

-            for t in list(agent.media_types):
-                if t.media_type in (MOVIE, SHOW):
-                    related_agents = Plex.primary_agent(agent.identifier, t.media_type)
+            media_types = [t.media_type for t in list(agent.media_types)]
+
+            # the new movie agent doesn't populate its media types, workaround
+            if not media_types and agent.identifier == "tv.plex.agents.movie":
+                media_types = [MOVIE]
+
+            for media_type in media_types:
+                if media_type in (MOVIE, SHOW):
+                    related_agents = Plex.primary_agent(agent.identifier, media_type)
                    for a in related_agents:
                        if a.identifier == PLUGIN_IDENTIFIER and a.enabled:
-                            enabled_for_primary_agents[MEDIA_TYPE_TO_STRING[t.media_type]].append(agent.identifier)
+                            enabled_for_primary_agents[MEDIA_TYPE_TO_STRING[media_type]].append(agent.identifier)

        # find the libraries that use them
        for library in self.sections:
@@ -670,7 +670,7 @@ class FindBetterSubtitles(DownloadSubtitleMixin, SubtitleListingMixin, Task):
        min_score_series = int(Prefs["subtitles.search.minimumTVScore2"].strip())
        min_score_movies = int(Prefs["subtitles.search.minimumMovieScore2"].strip())
        min_score_extracted_series = config.advanced.find_better_as_extracted_tv_score or 352
-        min_score_extracted_movies = config.advanced.find_better_as_extracted_movie_score or 82
+        min_score_extracted_movies = config.advanced.find_better_as_extracted_movie_score or 112
        overwrite_manually_modified = cast_bool(
            Prefs["scheduler.tasks.FindBetterSubtitles.overwrite_manually_modified"])
        overwrite_manually_selected = cast_bool(
@@ -13,7 +13,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-        <string>2.6.5.3237</string>
+        <string>2.6.5.3247</string>
        <key>PlexFrameworkVersion</key>
        <string>2</string>
        <key>PlexPluginClass</key>
@@ -32,7 +32,7 @@

 &lt;h1&gt;Sub-Zero for Plex&lt;/h1&gt;&lt;i&gt;Subtitles done right&lt;/i&gt;

-Version 2.6.5.3237 DEV
+Version 2.6.5.3247 DEV

 Originally based on @bramwalet's awesome &lt;a href=&quot;https://github.com/bramwalet/Subliminal.bundle&quot;&gt;Subliminal.bundle&lt;/a&gt;

@@ -1,3 +1,3 @@
-from .core import where
+from .core import contents, where

-__version__ = "2019.03.09"
+__version__ = "2020.06.20"
@@ -1,2 +1,12 @@
-from certifi import where
-print(where())
+import argparse
+
+from certifi import contents, where
+
+parser = argparse.ArgumentParser()
+parser.add_argument("-c", "--contents", action="store_true")
+args = parser.parse_args()
+
+if args.contents:
+    print(contents())
+else:
+    print(where())
@@ -58,38 +58,6 @@ AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
 TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
 -----END CERTIFICATE-----

-# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
-# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
-# Label: "Verisign Class 3 Public Primary Certification Authority - G3"
-# Serial: 206684696279472310254277870180966723415
-# MD5 Fingerprint: cd:68:b6:a7:c7:c4:ce:75:e0:1d:4f:57:44:61:92:09
-# SHA1 Fingerprint: 13:2d:0d:45:53:4b:69:97:cd:b2:d5:c3:39:e2:55:76:60:9b:5c:c6
-# SHA256 Fingerprint: eb:04:cf:5e:b1:f3:9a:fa:76:2f:2b:b1:20:f2:96:cb:a5:20:c1:b9:7d:b1:58:95:65:b8:1c:b9:a1:7b:72:44
-----BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
-LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
-aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
-VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
-aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
-bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
-IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
-N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
-KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
-kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
-CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
-Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
-imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
-2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
-DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
-F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
-TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
-----END CERTIFICATE-----
-
 # Issuer: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
 # Subject: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
 # Label: "Entrust.net Premium 2048 Secure Server CA"
@@ -152,39 +120,6 @@ ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
 R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
 -----END CERTIFICATE-----

-# Issuer: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
-# Subject: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
-# Label: "AddTrust External Root"
-# Serial: 1
-# MD5 Fingerprint: 1d:35:54:04:85:78:b0:3f:42:42:4d:bf:20:73:0a:3f
-# SHA1 Fingerprint: 02:fa:f3:e2:91:43:54:68:60:78:57:69:4d:f5:e4:5b:68:85:18:68
-# SHA256 Fingerprint: 68:7f:a4:51:38:22:78:ff:f0:c8:b1:1f:8d:43:d5:76:67:1c:6e:b2:bc:ea:b4:13:fb:83:d9:65:d0:6d:2f:f2
-----BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
-----END CERTIFICATE-----
-
 # Issuer: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
 # Subject: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
 # Label: "Entrust Root Certification Authority"
@@ -771,36 +706,6 @@ vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
 +OkuE6N36B9K
 -----END CERTIFICATE-----

-# Issuer: CN=Class 2 Primary CA O=Certplus
-# Subject: CN=Class 2 Primary CA O=Certplus
-# Label: "Certplus Class 2 Primary CA"
-# Serial: 177770208045934040241468760488327595043
-# MD5 Fingerprint: 88:2c:8c:52:b8:a2:3c:f3:f7:bb:03:ea:ae:ac:42:0b
-# SHA1 Fingerprint: 74:20:74:41:72:9c:dd:92:ec:79:31:d8:23:10:8d:c2:81:92:e2:bb
-# SHA256 Fingerprint: 0f:99:3c:8a:ef:97:ba:af:56:87:14:0e:d5:9a:d1:82:1b:b4:af:ac:f0:aa:9a:58:b5:d5:7a:33:8a:3a:fb:cb
-----BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
-PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
-cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
-MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
-IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
-ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
-VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
-kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
-EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
-H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
-HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
-DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
-QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
-Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
-AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
-yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
-FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
-ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
-kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
-l7+ijrRU
-----END CERTIFICATE-----
-
 # Issuer: CN=DST Root CA X3 O=Digital Signature Trust Co.
 # Subject: CN=DST Root CA X3 O=Digital Signature Trust Co.
 # Label: "DST Root CA X3"
@@ -1219,36 +1124,6 @@ t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
 WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
 -----END CERTIFICATE-----

-# Issuer: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
-# Subject: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
-# Label: "Deutsche Telekom Root CA 2"
-# Serial: 38
-# MD5 Fingerprint: 74:01:4a:91:b1:08:c4:58:ce:47:cd:f0:dd:11:53:08
-# SHA1 Fingerprint: 85:a4:08:c0:9c:19:3e:5d:51:58:7d:cd:d6:13:30:fd:8c:de:37:bf
-# SHA256 Fingerprint: b6:19:1a:50:d0:c3:97:7f:7d:a9:9b:cd:aa:c8:6a:22:7d:ae:b9:67:9e:c7:0b:a3:b0:c9:d9:22:71:c1:70:d3
-----BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
-MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
-IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
-IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
-RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
-U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
-IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
-ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
-QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
-rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
-NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
-QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
-txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
-BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
-AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
-tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
-IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
-6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
-xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
-Cm26OWMohpLzGITY+9HPBVZkVw==
-----END CERTIFICATE-----
-
 # Issuer: CN=Cybertrust Global Root O=Cybertrust, Inc
 # Subject: CN=Cybertrust Global Root O=Cybertrust, Inc
 # Label: "Cybertrust Global Root"
@@ -1559,47 +1434,6 @@ uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
 XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
 -----END CERTIFICATE-----

-# Issuer: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
-# Subject: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
-# Label: "Staat der Nederlanden Root CA - G2"
-# Serial: 10000012
-# MD5 Fingerprint: 7c:a5:0f:f8:5b:9a:7d:6d:30:ae:54:5a:e3:42:a2:8a
-# SHA1 Fingerprint: 59:af:82:79:91:86:c7:b4:75:07:cb:cf:03:57:46:eb:04:dd:b7:16
-# SHA256 Fingerprint: 66:8c:83:94:7d:a6:3b:72:4b:ec:e1:74:3c:31:a0:e6:ae:d0:db:8e:c5:b3:1b:e3:77:bb:78:4f:91:b6:71:6f
-----BEGIN CERTIFICATE-----
-MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
-TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
-dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
-DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
-ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
-b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
-qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
-uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
-Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
-pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
-5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
-UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
-GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
-5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
-6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
-eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
-B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
-BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
-L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
-SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
-CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
-5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
-IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
-gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
-+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
-vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
-bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
-N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
-Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
-ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
-----END CERTIFICATE-----
-
 # Issuer: CN=Hongkong Post Root CA 1 O=Hongkong Post
 # Subject: CN=Hongkong Post Root CA 1 O=Hongkong Post
 # Label: "Hongkong Post Root CA 1"
@@ -2200,6 +2034,45 @@ t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
 SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
 -----END CERTIFICATE-----

+# Issuer: CN=EC-ACC O=Agencia Catalana de Certificacio (NIF Q-0801176-I) OU=Serveis Publics de Certificacio/Vegeu https://www.catcert.net/verarrel (c)03/Jerarquia Entitats de Certificacio Catalanes
+# Subject: CN=EC-ACC O=Agencia Catalana de Certificacio (NIF Q-0801176-I) OU=Serveis Publics de Certificacio/Vegeu https://www.catcert.net/verarrel (c)03/Jerarquia Entitats de Certificacio Catalanes
+# Label: "EC-ACC"
+# Serial: -23701579247955709139626555126524820479
+# MD5 Fingerprint: eb:f5:9d:29:0d:61:f9:42:1f:7c:c2:ba:6d:e3:15:09
+# SHA1 Fingerprint: 28:90:3a:63:5b:52:80:fa:e6:77:4c:0b:6d:a7:d6:ba:a6:4a:f2:e8
+# SHA256 Fingerprint: 88:49:7f:01:60:2f:31:54:24:6a:e2:8c:4d:5a:ef:10:f1:d8:7e:bb:76:62:6f:4a:e0:b7:f9:5b:a7:96:87:99
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB
+8zELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2Vy
+dGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1
+YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3
+dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UECxMsSmVyYXJxdWlh
+IEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMTBkVD
+LUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQG
+EwJFUzE7MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8g
+KE5JRiBRLTA4MDExNzYtSSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBD
+ZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQu
+bmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMg
+ZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUNDMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R
+85iKw5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm
+4CgPukLjbo73FCeTae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaV
+HMf5NLWUhdWZXqBIoH7nF2W4onW4HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNd
+QlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0aE9jD2z3Il3rucO2n5nzbcc8t
+lGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw0JDnJwIDAQAB
+o4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4
+opvpXY0wfwYDVR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBo
+dHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidW
+ZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAwDQYJKoZIhvcN
+AQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJlF7W2u++AVtd0x7Y
+/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNaAl6k
+SBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhy
+Rp/7SNVel+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOS
+Agu+TGbrIP65y7WZf+a2E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xl
+nJ2lYJU6Un/10asIbvPuW/mIPX64b24D5EI=
+-----END CERTIFICATE-----
+
 # Issuer: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
 # Subject: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
 # Label: "Hellenic Academic and Research Institutions RootCA 2011"
@@ -3453,46 +3326,6 @@ AAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3CekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ
 5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
 -----END CERTIFICATE-----

-# Issuer: CN=Certinomis - Root CA O=Certinomis OU=0002 433998903
-# Subject: CN=Certinomis - Root CA O=Certinomis OU=0002 433998903
-# Label: "Certinomis - Root CA"
-# Serial: 1
-# MD5 Fingerprint: 14:0a:fd:8d:a8:28:b5:38:69:db:56:7e:61:22:03:3f
-# SHA1 Fingerprint: 9d:70:bb:01:a5:a4:a0:18:11:2e:f7:1c:01:b9:32:c5:34:e7:88:a8
-# SHA256 Fingerprint: 2a:99:f5:bc:11:74:b7:3c:bb:1d:62:08:84:e0:1c:34:e5:1c:cb:39:78:da:12:5f:0e:33:26:88:83:bf:41:58
-----BEGIN CERTIFICATE-----
-MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjET
-MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAb
-BgNVBAMTFENlcnRpbm9taXMgLSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMz
-MTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMx
-FzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRDZXJ0aW5vbWlzIC0g
-Um9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQosP5L2
-fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJfl
-LieY6pOod5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQV
-WZUKxkd8aRi5pwP5ynapz8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDF
-TKWrteoB4owuZH9kb/2jJZOLyKIOSY008B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb
-5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09xRLWtwHkziOC/7aOgFLSc
-CbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE6OXWk6Ri
-wsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJ
-wx3tFvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SG
-m/lg0h9tkQPTYKbVPZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4
-F2iw4lNVYC2vPsKD2NkJK/DAZNuHi5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZng
-WVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I6tNxIqSSaHh0
-2TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
-AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/
-0KGRHCwPT5iVWVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWw
-F6YSjNRieOpWauwK0kDDPAUwPk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZS
-g081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAXlCOotQqSD7J6wWAsOMwaplv/8gzj
-qh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJy29SWwNyhlCVCNSN
-h4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9Iff/
-ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8V
-btaw5BngDwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwj
-Y/M50n92Uaf0yKHxDHYiI0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ
-8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nMcyrDflOR1m749fPH0FFNjkulW+YZFzvW
-gQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVrhkIGuUE=
-----END CERTIFICATE-----
-
 # Issuer: CN=OISTE WISeKey Global Root GB CA O=WISeKey OU=OISTE Foundation Endorsed
 # Subject: CN=OISTE WISeKey Global Root GB CA O=WISeKey OU=OISTE Foundation Endorsed
 # Label: "OISTE WISeKey Global Root GB CA"
@@ -3849,47 +3682,6 @@ CkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1AE47xDqUEpHJWEadIRNyp4iciuRMStuW
 1KyLa2tJElMzrdfkviT8tQp21KW8EA==
 -----END CERTIFICATE-----

-# Issuer: CN=LuxTrust Global Root 2 O=LuxTrust S.A.
-# Subject: CN=LuxTrust Global Root 2 O=LuxTrust S.A.
-# Label: "LuxTrust Global Root 2"
-# Serial: 59914338225734147123941058376788110305822489521
-# MD5 Fingerprint: b2:e1:09:00:61:af:f7:f1:91:6f:c4:ad:8d:5e:3b:7c
-# SHA1 Fingerprint: 1e:0e:56:19:0a:d1:8b:25:98:b2:04:44:ff:66:8a:04:17:99:5f:3f
-# SHA256 Fingerprint: 54:45:5f:71:29:c2:0b:14:47:c4:18:f9:97:16:8f:24:c5:8f:c5:02:3b:f5:da:5b:e2:eb:6e:1d:d8:90:2e:d5
-----BEGIN CERTIFICATE-----
-MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQEL
-BQAwRjELMAkGA1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNV
-BAMMFkx1eFRydXN0IEdsb2JhbCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUw
-MzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEWMBQGA1UECgwNTHV4VHJ1c3QgUy5B
-LjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wmKb3F
-ibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTem
-hfY7RBi2xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1
-EMShduxq3sVs35a0VkBCwGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsn
-Xpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4
-zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkmFRseTJIpgp7VkoGSQXAZ
-96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niFwpN6cj5m
-j5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4g
-DEa/a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+
-8kPREd8vZS9kzl8UubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2j
-X5t/Lax5Gw5CMZdjpPuKadUiDTSQMC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmH
-hFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB/zBCBgNVHSAEOzA5MDcGByuB
-KwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5Lmx1eHRydXN0
-Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
-+Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQEL
-BQADggIBAGoZFO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9
-BzZAcg4atmpZ1gDlaCDdLnINH2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTO
-jFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW7MM3LGVYvlcAGvI1+ut7MV3CwRI9
-loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIuZY+kt9J/Z93I055c
-qqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWAVWe+
-2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/
-JEAdemrRTxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKre
-zrnK+T+Tb/mjuuqlPpmt/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQf
-LSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+
-x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31IiyBMz2TWuJdGsE7RKlY6
-oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
-----END CERTIFICATE-----
-
 # Issuer: CN=TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1 O=Turkiye Bilimsel ve Teknolojik Arastirma Kurumu - TUBITAK OU=Kamu Sertifikasyon Merkezi - Kamu SM
 # Subject: CN=TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1 O=Turkiye Bilimsel ve Teknolojik Arastirma Kurumu - TUBITAK OU=Kamu Sertifikasyon Merkezi - Kamu SM
 # Label: "TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1"
@@ -4656,3 +4448,173 @@ L5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB60PZ2Pierc+xYw5F9KBa
 LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG
 mpv0
 -----END CERTIFICATE-----
+
+# Issuer: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only
+# Subject: CN=Entrust Root Certification Authority - G4 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2015 Entrust, Inc. - for authorized use only
+# Label: "Entrust Root Certification Authority - G4"
+# Serial: 289383649854506086828220374796556676440
+# MD5 Fingerprint: 89:53:f1:83:23:b7:7c:8e:05:f1:8c:71:38:4e:1f:88
+# SHA1 Fingerprint: 14:88:4e:86:26:37:b0:26:af:59:62:5c:40:77:ec:35:29:ba:96:01
+# SHA256 Fingerprint: db:35:17:d1:f6:73:2a:2d:5a:b9:7c:53:3e:c7:07:79:ee:32:70:a6:2f:b4:ac:42:38:37:24:60:e6:f0:1e:88
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw
+gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL
+Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg
+MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw
+BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0
+MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1
+c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ
+bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ
+2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E
+T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j
+5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM
+C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T
+DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX
+wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A
+2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm
+nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8
+dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl
+N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj
+c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS
+5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS
+Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr
+hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/
+B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI
+AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw
+H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+
+b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk
+2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol
+IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk
+5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY
+n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Microsoft ECC Root Certificate Authority 2017 O=Microsoft Corporation
+# Subject: CN=Microsoft ECC Root Certificate Authority 2017 O=Microsoft Corporation
+# Label: "Microsoft ECC Root Certificate Authority 2017"
+# Serial: 136839042543790627607696632466672567020
+# MD5 Fingerprint: dd:a1:03:e6:4a:93:10:d1:bf:f0:19:42:cb:fe:ed:67
+# SHA1 Fingerprint: 99:9a:64:c3:7f:f4:7d:9f:ab:95:f1:47:69:89:14:60:ee:c4:c3:c5
+# SHA256 Fingerprint: 35:8d:f3:9d:76:4a:f9:e1:b7:66:e9:c9:72:df:35:2e:e1:5c:fa:c2:27:af:6a:d1:d7:0e:8e:4a:6e:dc:ba:02
+-----BEGIN CERTIFICATE-----
+MIICWTCCAd+gAwIBAgIQZvI9r4fei7FK6gxXMQHC7DAKBggqhkjOPQQDAzBlMQsw
+CQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYD
+VQQDEy1NaWNyb3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIw
+MTcwHhcNMTkxMjE4MjMwNjQ1WhcNNDIwNzE4MjMxNjA0WjBlMQswCQYDVQQGEwJV
+UzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1NaWNy
+b3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAATUvD0CQnVBEyPNgASGAlEvaqiBYgtlzPbKnR5vSmZR
+ogPZnZH6thaxjG7efM3beaYvzrvOcS/lpaso7GMEZpn4+vKTEAXhgShC48Zo9OYb
+hGBKia/teQ87zvH2RPUBeMCjVDBSMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8E
+BTADAQH/MB0GA1UdDgQWBBTIy5lycFIM+Oa+sgRXKSrPQhDtNTAQBgkrBgEEAYI3
+FQEEAwIBADAKBggqhkjOPQQDAwNoADBlAjBY8k3qDPlfXu5gKcs68tvWMoQZP3zV
+L8KxzJOuULsJMsbG7X7JNpQS5GiFBqIb0C8CMQCZ6Ra0DvpWSNSkMBaReNtUjGUB
+iudQZsIxtzm6uBoiB078a1QWIP8rtedMDE2mT3M=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Microsoft RSA Root Certificate Authority 2017 O=Microsoft Corporation
+# Subject: CN=Microsoft RSA Root Certificate Authority 2017 O=Microsoft Corporation
+# Label: "Microsoft RSA Root Certificate Authority 2017"
+# Serial: 40975477897264996090493496164228220339
+# MD5 Fingerprint: 10:ff:00:ff:cf:c9:f8:c7:7a:c0:ee:35:8e:c9:0f:47
+# SHA1 Fingerprint: 73:a5:e6:4a:3b:ff:83:16:ff:0e:dc:cc:61:8a:90:6e:4e:ae:4d:74
+# SHA256 Fingerprint: c7:41:f7:0f:4b:2a:8d:88:bf:2e:71:c1:41:22:ef:53:ef:10:eb:a0:cf:a5:e6:4c:fa:20:f4:18:85:30:73:e0
+-----BEGIN CERTIFICATE-----
+MIIFqDCCA5CgAwIBAgIQHtOXCV/YtLNHcB6qvn9FszANBgkqhkiG9w0BAQwFADBl
+MQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYw
+NAYDVQQDEy1NaWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
+IDIwMTcwHhcNMTkxMjE4MjI1MTIyWhcNNDIwNzE4MjMwMDIzWjBlMQswCQYDVQQG
+EwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1N
+aWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKW76UM4wplZEWCpW9R2LBifOZ
+Nt9GkMml7Xhqb0eRaPgnZ1AzHaGm++DlQ6OEAlcBXZxIQIJTELy/xztokLaCLeX0
+ZdDMbRnMlfl7rEqUrQ7eS0MdhweSE5CAg2Q1OQT85elss7YfUJQ4ZVBcF0a5toW1
+HLUX6NZFndiyJrDKxHBKrmCk3bPZ7Pw71VdyvD/IybLeS2v4I2wDwAW9lcfNcztm
+gGTjGqwu+UcF8ga2m3P1eDNbx6H7JyqhtJqRjJHTOoI+dkC0zVJhUXAoP8XFWvLJ
+jEm7FFtNyP9nTUwSlq31/niol4fX/V4ggNyhSyL71Imtus5Hl0dVe49FyGcohJUc
+aDDv70ngNXtk55iwlNpNhTs+VcQor1fznhPbRiefHqJeRIOkpcrVE7NLP8TjwuaG
+YaRSMLl6IE9vDzhTyzMMEyuP1pq9KsgtsRx9S1HKR9FIJ3Jdh+vVReZIZZ2vUpC6
+W6IYZVcSn2i51BVrlMRpIpj0M+Dt+VGOQVDJNE92kKz8OMHY4Xu54+OU4UZpyw4K
+UGsTuqwPN1q3ErWQgR5WrlcihtnJ0tHXUeOrO8ZV/R4O03QK0dqq6mm4lyiPSMQH
+FJDOvTKVTUssKZqwJz58oHhEmrARdlns87/I6KJClTUFLkqqNfs+avNJVgyeY+Q
+W5g5xAgGwax/Dj0ApQIDAQABo1QwUjAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUCctZf4aycI8awznjwNnpv7tNsiMwEAYJKwYBBAGC
+NxUBBAMCAQAwDQYJKoZIhvcNAQEMBQADggIBAKyvPl3CEZaJjqPnktaXFbgToqZC
+LgLNFgVZJ8og6Lq46BrsTaiXVq5lQ7GPAJtSzVXNUzltYkyLDVt8LkS/gxCP81OC
+gMNPOsduET/m4xaRhPtthH80dK2Jp86519efhGSSvpWhrQlTM93uCupKUY5vVau6
+tZRGrox/2KJQJWVggEbbMwSubLWYdFQl3JPk+ONVFT24bcMKpBLBaYVu32TxU5nh
+SnUgnZUP5NbcA/FZGOhHibJXWpS2qdgXKxdJ5XbLwVaZOjex/2kskZGT4d9Mozd2
+TaGf+G0eHdP67Pv0RR0Tbc/3WeUiJ3IrhvNXuzDtJE3cfVa7o7P4NHmJweDyAmH3
+pvwPuxwXC65B2Xy9J6P9LjrRk5Sxcx0ki69bIImtt2dmefU6xqaWM/5TkshGsRGR
+xpl/j8nWZjEgQRCHLQzWwa80mMpkg/sTV9HB8Dx6jKXB/ZUhoHHBk2dxEuqPiApp
+GWSZI1b7rCoucL5mxAyE7+WL85MB+GqQk2dLsmijtWKP6T+MejteD+eMuMZ87zf9
+dOLITzNy4ZQ5bb0Sr74MTnB8G2+NszKTc0QWbej09+CVgI+WXTik9KveCjCHk9hN
+AHFiRSdLOkKEW39lt2c0Ui2cFmuqqNh7o0JMcccMyj6D5KbvtwEwXlGjefVwaaZB
+RA+GsCyRxj3qrg+E
+-----END CERTIFICATE-----
+
+# Issuer: CN=e-Szigno Root CA 2017 O=Microsec Ltd.
+# Subject: CN=e-Szigno Root CA 2017 O=Microsec Ltd.
+# Label: "e-Szigno Root CA 2017"
+# Serial: 411379200276854331539784714
+# MD5 Fingerprint: de:1f:f6:9e:84:ae:a7:b4:21:ce:1e:58:7d:d1:84:98
+# SHA1 Fingerprint: 89:d4:83:03:4f:9e:9a:48:80:5f:72:37:d4:a9:a6:ef:cb:7c:1f:d1
+# SHA256 Fingerprint: be:b0:0b:30:83:9b:9b:c3:2c:32:e4:44:79:05:95:06:41:f2:64:21:b1:5e:d0:89:19:8b:51:8a:e2:ea:1b:99
+-----BEGIN CERTIFICATE-----
+MIICQDCCAeWgAwIBAgIMAVRI7yH9l1kN9QQKMAoGCCqGSM49BAMCMHExCzAJBgNV
+BAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRk
+LjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3ppZ25vIFJv
+b3QgQ0EgMjAxNzAeFw0xNzA4MjIxMjA3MDZaFw00MjA4MjIxMjA3MDZaMHExCzAJ
+BgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMg
+THRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3ppZ25v
+IFJvb3QgQ0EgMjAxNzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJbcPYrYsHtv
+xie+RJCxs1YVe45DJH0ahFnuY2iyxl6H0BVIHqiQrb1TotreOpCmYF9oMrWGQd+H
+Wyx7xf58etqjYzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBSHERUI0arBeAyxr87GyZDvvzAEwDAfBgNVHSMEGDAWgBSHERUI0arB
+eAyxr87GyZDvvzAEwDAKBggqhkjOPQQDAgNJADBGAiEAtVfd14pVCzbhhkT61Nlo
+jbjcI4qKDdQvfepz7L9NbKgCIQDLpbQS+ue16M9+k/zzNY9vTlp8tLxOsvxyqltZ
+efcMQ==
+-----END CERTIFICATE-----
+
+# Issuer: O=CERTSIGN SA OU=certSIGN ROOT CA G2
+# Subject: O=CERTSIGN SA OU=certSIGN ROOT CA G2
+# Label: "certSIGN Root CA G2"
+# Serial: 313609486401300475190
+# MD5 Fingerprint: 8c:f1:75:8a:c6:19:cf:94:b7:f7:65:20:87:c3:97:c7
+# SHA1 Fingerprint: 26:f9:93:b4:ed:3d:28:27:b0:b9:4b:a7:e9:15:1d:a3:8d:92:e5:32
+# SHA256 Fingerprint: 65:7c:fe:2f:a7:3f:aa:38:46:25:71:f3:32:a2:36:3a:46:fc:e7:02:09:51:71:07:02:cd:fb:b6:ee:da:33:05
+-----BEGIN CERTIFICATE-----
+MIIFRzCCAy+gAwIBAgIJEQA0tk7GNi02MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV
+BAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEcMBoGA1UECxMTY2VydFNJR04g
+Uk9PVCBDQSBHMjAeFw0xNzAyMDYwOTI3MzVaFw00MjAyMDYwOTI3MzVaMEExCzAJ
+BgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEcMBoGA1UECxMTY2VydFNJ
+R04gUk9PVCBDQSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDF
+dRmRfUR0dIf+DjuW3NgBFszuY5HnC2/OOwppGnzC46+CjobXXo9X69MhWf05N0Iw
+vlDqtg+piNguLWkh59E3GE59kdUWX2tbAMI5Qw02hVK5U2UPHULlj88F0+7cDBrZ
+uIt4ImfkabBoxTzkbFpG583H+u/E7Eu9aqSs/cwoUe+StCmrqzWaTOTECMYmzPhp
+n+Sc8CnTXPnGFiWeI8MgwT0PPzhAsP6CRDiqWhqKa2NYOLQV07YRaXseVO6MGiKs
+cpc/I1mbySKEwQdPzH/iV8oScLumZfNpdWO9lfsbl83kqK/20U6o2YpxJM02PbyW
+xPFsqa7lzw1uKA2wDrXKUXt4FMMgL3/7FFXhEZn91QqhngLjYl/rNUssuHLoPj1P
+rCy7Lobio3aP5ZMqz6WryFyNSwb/EkaseMsUBzXgqd+L6a8VTxaJW732jcZZroiF
+DsGJ6x9nxUWO/203Nit4ZoORUSs9/1F3dmKh7Gc+PoGD4FapUB8fepmrY7+EF3fx
+DTvf95xhszWYijqy7DwaNz9+j5LP2RIUZNoQAhVB/0/E6xyjyfqZ90bp4RjZsbgy
+LcsUDFDYg2WD7rlcz8sFWkz6GZdr1l0T08JcVLwyc6B49fFtHsufpaafItzRUZ6C
+eWRgKRM+o/1Pcmqr4tTluCRVLERLiohEnMqE0yo7AgMBAAGjQjBAMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSCIS1mxteg4BXrzkwJ
+d8RgnlRuAzANBgkqhkiG9w0BAQsFAAOCAgEAYN4auOfyYILVAzOBywaK8SJJ6ejq
+kX/GM15oGQOGO0MBzwdw5AgeZYWR5hEit/UCI46uuR59H35s5r0l1ZUa8gWmr4UC
+b6741jH/JclKyMeKqdmfS0mbEVeZkkMR3rYzpMzXjWR91M08KCy0mpbqTfXERMQl
+qiCA2ClV9+BB/AYm/7k29UMUA2Z44RGx2iBfRgB4ACGlHgAoYXhvqAEBj500mv/0
+OJD7uNGzcgbJceaBxXntC6Z58hMLnPddDnskk7RI24Zf3lCGeOdA5jGokHZwYa+c
+NywRtYK3qq4kNFtyDGkNzVmf9nGvnAvRCjj5BiKDUyUM/FHE5r7iOZULJK2v0ZXk
+ltd0ZGtxTgI8qoXzIKNDOXZbbFD+mpwUHmUUihW9o4JFWklWatKcsWMy5WHgUyIO
+pwpJ6st+H6jiYoD2EEVSmAYY3qXNL3+q1Ok+CHLsIwMCPKaq2LxndD0UF/tUSxfj
+03k9bWtJySgOLnRQvwzZRjoQhsmnP+mg7H/rpXdYaXHmgwo38oZJar55CJD2AhZk
+PuXaTH4MNMn5X7azKFGnpyuqSfqNZSlO42sTp5SjLVFteAxEy9/eCG/Oo2Sr05WE
+1LlSVHJ7liXMvGnjSG4N0MedJ5qq+BOS3R7fY581qRY27Iy4g/Q9iY/NtBde17MX
+QRBdJ3NghVdJIgc=
+-----END CERTIFICATE-----
@@ -4,12 +4,57 @@
 certifi.py
 ~~~~~~~~~~

-This module returns the installation location of cacert.pem.
+This module returns the installation location of cacert.pem or its contents.
 """
 import os

+try:
+    from importlib.resources import path as get_path, read_text

-def where():
-    f = os.path.dirname(__file__)
+    _CACERT_CTX = None
+    _CACERT_PATH = None

-    return os.path.join(f, 'cacert.pem')
+    def where():
+        # This is slightly terrible, but we want to delay extracting the file
+        # in cases where we're inside of a zipimport situation until someone
+        # actually calls where(), but we don't want to re-extract the file
+        # on every call of where(), so we'll do it once then store it in a
+        # global variable.
+        global _CACERT_CTX
+        global _CACERT_PATH
+        if _CACERT_PATH is None:
+            # This is slightly janky, the importlib.resources API wants you to
+            # manage the cleanup of this file, so it doesn't actually return a
+            # path, it returns a context manager that will give you the path
+            # when you enter it and will do any cleanup when you leave it. In
+            # the common case of not needing a temporary file, it will just
+            # return the file system location and the __exit__() is a no-op.
+            #
+            # We also have to hold onto the actual context manager, because
+            # it will do the cleanup whenever it gets garbage collected, so
+            # we will also store that at the global level as well.
+            _CACERT_CTX = get_path("certifi", "cacert.pem")
+            _CACERT_PATH = str(_CACERT_CTX.__enter__())
+
+        return _CACERT_PATH
+
+
+except ImportError:
+    # This fallback will work for Python versions prior to 3.7 that lack the
+    # importlib.resources module but relies on the existing `where` function
+    # so won't address issues with environments like PyOxidizer that don't set
+    # __file__ on modules.
+    def read_text(_module, _path, encoding="ascii"):
+        with open(where(), "r", encoding=encoding) as data:
+            return data.read()
+
+    # If we don't have importlib.resources, then we will just do the old logic
+    # of assuming we're on the filesystem and munge the path directly.
+    def where():
+        f = os.path.dirname(__file__)
+
+        return os.path.join(f, "cacert.pem")
+
+
+def contents():
+    return read_text("certifi", "cacert.pem", encoding="ascii")
@@ -2,20 +2,6 @@ import logging
 import re
 import sys
 import ssl
-import requests
-
-try:
-    import copyreg
-except ImportError:
-    import copy_reg as copyreg
-
-try:
-    from HTMLParser import HTMLParser
-except ImportError:
-    if sys.version_info >= (3, 4):
-        import html
-    else:
-        from html.parser import HTMLParser

 from copy import deepcopy
 from time import sleep
@@ -23,17 +9,9 @@ from collections import OrderedDict

 from requests.sessions import Session
 from requests.adapters import HTTPAdapter
-
-from .exceptions import (
-    CloudflareLoopProtection,
-    CloudflareCode1020,
-    CloudflareIUAMError,
-    CloudflareReCaptchaError,
-    CloudflareReCaptchaProvider
-)
+from requests.packages.urllib3.util.ssl_ import create_urllib3_context

 from .interpreters import JavaScriptInterpreter
-from .reCaptcha import reCaptcha
 from .user_agent import User_Agent

 try:
@@ -47,540 +25,219 @@ except ImportError:
    pass

 try:
-    from urlparse import urlparse, urljoin
+    from urlparse import urlparse
+    from urlparse import urlunparse
 except ImportError:
-    from urllib.parse import urlparse, urljoin
+    from urllib.parse import urlparse
+    from urllib.parse import urlunparse

+##########################################################################################################################################################

-# ------------------------------------------------------------------------------- #
+__version__ = '1.1.9'

-__version__ = '1.2.31'
+BUG_REPORT = 'Cloudflare may have changed their technique, or there may be a bug in the script.'

-# ------------------------------------------------------------------------------- #
+##########################################################################################################################################################


 class CipherSuiteAdapter(HTTPAdapter):

-    __attrs__ = [
-        'ssl_context',
-        'max_retries',
-        'config',
-        '_pool_connections',
-        '_pool_maxsize',
-        '_pool_block'
-    ]
+    def __init__(self, cipherSuite=None, **kwargs):
+        self.cipherSuite = cipherSuite

-    def __init__(self, *args, **kwargs):
-        self.ssl_context = kwargs.pop('ssl_context', None)
-        self.cipherSuite = kwargs.pop('cipherSuite', None)
-
-        if not self.ssl_context:
-            self.ssl_context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH)
-            self.ssl_context.set_ciphers(self.cipherSuite)
-            self.ssl_context.options |= (ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3 | ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1)
+        if hasattr(ssl, 'PROTOCOL_TLS'):
+            self.ssl_context = create_urllib3_context(
+                ssl_version=getattr(ssl, 'PROTOCOL_TLSv1_3', ssl.PROTOCOL_TLSv1_2),
+                ciphers=self.cipherSuite
+            )
+        else:
+            self.ssl_context = create_urllib3_context(ssl_version=ssl.PROTOCOL_TLSv1)

        super(CipherSuiteAdapter, self).__init__(**kwargs)

-    # ------------------------------------------------------------------------------- #
+    ##########################################################################################################################################################

    def init_poolmanager(self, *args, **kwargs):
        kwargs['ssl_context'] = self.ssl_context
        return super(CipherSuiteAdapter, self).init_poolmanager(*args, **kwargs)

-    # ------------------------------------------------------------------------------- #
+    ##########################################################################################################################################################

    def proxy_manager_for(self, *args, **kwargs):
        kwargs['ssl_context'] = self.ssl_context
        return super(CipherSuiteAdapter, self).proxy_manager_for(*args, **kwargs)

-# ------------------------------------------------------------------------------- #
+##########################################################################################################################################################


 class CloudScraper(Session):
-
    def __init__(self, *args, **kwargs):
        self.debug = kwargs.pop('debug', False)
        self.delay = kwargs.pop('delay', None)
-        self.cipherSuite = kwargs.pop('cipherSuite', None)
-        self.interpreter = kwargs.pop('interpreter', 'native')
-        self.recaptcha = kwargs.pop('recaptcha', {})
-        self.allow_brotli = kwargs.pop(
-            'allow_brotli',
-            True if 'brotli' in sys.modules.keys() else False
-        )
-
-        self.user_agent = User_Agent(
-            allow_brotli=self.allow_brotli,
-            browser=kwargs.pop('browser', None)
-        )
-
-        self._solveDepthCnt = 0
-        self.solveDepth = kwargs.pop('solveDepth', 3)
+        self.interpreter = kwargs.pop('interpreter', 'js2py')
+        self.allow_brotli = kwargs.pop('allow_brotli', True if 'brotli' in sys.modules.keys() else False)
+        self.cipherSuite = None

        super(CloudScraper, self).__init__(*args, **kwargs)

-        # pylint: disable=E0203
        if 'requests' in self.headers['User-Agent']:
-            # ------------------------------------------------------------------------------- #
            # Set a random User-Agent if no custom User-Agent has been set
-            # ------------------------------------------------------------------------------- #
-            self.headers = self.user_agent.headers
-            if not self.cipherSuite:
-                self.cipherSuite = self.user_agent.cipherSuite
+            self.headers = User_Agent(allow_brotli=self.allow_brotli).headers

-        if isinstance(self.cipherSuite, list):
-            self.cipherSuite = ':'.join(self.cipherSuite)
+        self.mount('https://', CipherSuiteAdapter(self.loadCipherSuite()))

-        self.mount(
-            'https://',
-            CipherSuiteAdapter(
-                cipherSuite=self.cipherSuite
-            )
-        )
-
-        # purely to allow us to pickle dump
-        copyreg.pickle(ssl.SSLContext, lambda obj: (obj.__class__, (obj.protocol,)))
-
-    # ------------------------------------------------------------------------------- #
-    # Allow us to pickle our session back with all variables
-    # ------------------------------------------------------------------------------- #
-
-    def __getstate__(self):
-        return self.__dict__
-
-    # ------------------------------------------------------------------------------- #
-    # Raise an Exception with no stacktrace and reset depth counter.
-    # ------------------------------------------------------------------------------- #
-
-    def simpleException(self, exception, msg):
-        self._solveDepthCnt = 0
-        sys.tracebacklimit = 0
-        raise exception(msg)
-
-    # ------------------------------------------------------------------------------- #
-    # debug the request via the response
-    # ------------------------------------------------------------------------------- #
+    ##########################################################################################################################################################

    @staticmethod
    def debugRequest(req):
        try:
            print(dump.dump_all(req).decode('utf-8'))
-        except ValueError as e:
-            print("Debug Error: {}".format(getattr(e, 'message', e)))
+        except:  # noqa
+            pass

-    # ------------------------------------------------------------------------------- #
-    # Unescape / decode html entities
-    # ------------------------------------------------------------------------------- #
+    ##########################################################################################################################################################

-    @staticmethod
-    def unescape(html_text):
-        if sys.version_info >= (3, 0):
-            if sys.version_info >= (3, 4):
-                return html.unescape(html_text)
+    def loadCipherSuite(self):
+        if self.cipherSuite:
+            return self.cipherSuite

-            return HTMLParser().unescape(html_text)
+        self.cipherSuite = ''

-        return HTMLParser().unescape(html_text)
+        if hasattr(ssl, 'PROTOCOL_TLS'):
+            ciphers = [
+                'ECDHE-ECDSA-AES128-GCM-SHA256', 'ECDHE-RSA-AES128-GCM-SHA256', 'ECDHE-ECDSA-AES256-GCM-SHA384',
+                'ECDHE-RSA-AES256-GCM-SHA384', 'ECDHE-ECDSA-CHACHA20-POLY1305-SHA256', 'ECDHE-RSA-CHACHA20-POLY1305-SHA256',
+                'ECDHE-RSA-AES128-CBC-SHA', 'ECDHE-RSA-AES256-CBC-SHA', 'RSA-AES128-GCM-SHA256', 'RSA-AES256-GCM-SHA384',
+                'ECDHE-RSA-AES128-GCM-SHA256', 'RSA-AES256-SHA', '3DES-EDE-CBC'
+            ]

-    # ------------------------------------------------------------------------------- #
-    # Decode Brotli on older versions of urllib3 manually
-    # ------------------------------------------------------------------------------- #
+            if hasattr(ssl, 'PROTOCOL_TLSv1_3'):
+                ciphers.insert(0, ['GREASE_3A', 'GREASE_6A', 'AES128-GCM-SHA256', 'AES256-GCM-SHA256', 'AES256-GCM-SHA384', 'CHACHA20-POLY1305-SHA256'])

-    def decodeBrotli(self, resp):
-        if requests.packages.urllib3.__version__ < '1.25.1' and resp.headers.get('Content-Encoding') == 'br':
+            ctx = ssl.SSLContext(getattr(ssl, 'PROTOCOL_TLSv1_3', ssl.PROTOCOL_TLSv1_2))
+
+            for cipher in ciphers:
+                try:
+                    ctx.set_ciphers(cipher)
+                    self.cipherSuite = '{}:{}'.format(self.cipherSuite, cipher).rstrip(':')
+                except ssl.SSLError:
+                    pass
+
+        return self.cipherSuite
+
+    ##########################################################################################################################################################
+
+    def request(self, method, url, *args, **kwargs):
+        ourSuper = super(CloudScraper, self)
+        resp = ourSuper.request(method, url, *args, **kwargs)
+
+        if resp.headers.get('Content-Encoding') == 'br':
            if self.allow_brotli and resp._content:
                resp._content = brotli.decompress(resp.content)
            else:
-                logging.warning(
-                    'You\'re running urllib3 {}, Brotli content detected, '
-                    'Which requires manual decompression, '
-                    'But option allow_brotli is set to False, '
-                    'We will not continue to decompress.'.format(requests.packages.urllib3.__version__)
-                )
+                logging.warning('Brotli content detected, But option is disabled, we will not continue.')
+                return resp

-        return resp
-
-    # ------------------------------------------------------------------------------- #
-    # Our hijacker request function
-    # ------------------------------------------------------------------------------- #
-
-    def request(self, method, url, *args, **kwargs):
-        # pylint: disable=E0203
-        if kwargs.get('proxies') and kwargs.get('proxies') != self.proxies:
-            self.proxies = kwargs.get('proxies')
-
-        resp = self.decodeBrotli(
-            super(CloudScraper, self).request(method, url, *args, **kwargs)
-        )
-
-        # ------------------------------------------------------------------------------- #
        # Debug request
-        # ------------------------------------------------------------------------------- #
-
        if self.debug:
            self.debugRequest(resp)

        # Check if Cloudflare anti-bot is on
-        if self.is_Challenge_Request(resp):
-            # ------------------------------------------------------------------------------- #
-            # Try to solve the challenge and send it back
-            # ------------------------------------------------------------------------------- #
-
-            if self._solveDepthCnt >= self.solveDepth:
-                _ = self._solveDepthCnt
-                self.simpleException(
-                    CloudflareLoopProtection,
-                    "!!Loop Protection!! We have tried to solve {} time(s) in a row.".format(_)
-                )
-
-            self._solveDepthCnt += 1
-
-            resp = self.Challenge_Response(resp, **kwargs)
-        else:
-            if not resp.is_redirect and resp.status_code not in [429, 503]:
-                self._solveDepthCnt = 0
+        if self.isChallengeRequest(resp):
+            if resp.request.method != 'GET':
+                # Work around if the initial request is not a GET,
+                # Supersede with a GET then re-request the original METHOD.
+                self.request('GET', resp.url)
+                resp = ourSuper.request(method, url, *args, **kwargs)
+            else:
+                # Solve Challenge
+                resp = self.sendChallengeResponse(resp, **kwargs)

        return resp

-    # ------------------------------------------------------------------------------- #
-    # check if the response contains a valid Cloudflare challenge
-    # ------------------------------------------------------------------------------- #
+    ##########################################################################################################################################################

    @staticmethod
-    def is_IUAM_Challenge(resp):
-        try:
+    def isChallengeRequest(resp):
+        if resp.headers.get('Server', '').startswith('cloudflare'):
+            if b'why_captcha' in resp.content or b'/cdn-cgi/l/chk_captcha' in resp.content:
+                raise ValueError('Captcha')
+
            return (
-                resp.headers.get('Server', '').startswith('cloudflare')
-                and resp.status_code in [429, 503]
-                and re.search(
-                    r'action="/.*?__cf_chl_jschl_tk__=\S+".*?name="jschl_vc"\svalue=.*?',
-                    resp.text,
-                    re.M | re.DOTALL
-                )
+                resp.status_code in [429, 503]
+                and all(s in resp.content for s in [b'jschl_vc', b'jschl_answer'])
            )
-        except AttributeError:
-            pass

        return False

-    # ------------------------------------------------------------------------------- #
-    # check if the response contains a valid Cloudflare reCaptcha challenge
-    # ------------------------------------------------------------------------------- #
+    ##########################################################################################################################################################

-    @staticmethod
-    def is_reCaptcha_Challenge(resp):
-        try:
-            return (
-                resp.headers.get('Server', '').startswith('cloudflare')
-                and resp.status_code == 403
-                and re.search(
-                    r'action="/.*?__cf_chl_captcha_tk__=\S+".*?data\-sitekey=.*?',
-                    resp.text,
-                    re.M | re.DOTALL
-                )
-            )
-        except AttributeError:
-            pass
+    def sendChallengeResponse(self, resp, **original_kwargs):
+        body = resp.text

-        return False
+        # Cloudflare requires a delay before solving the challenge
+        if not self.delay:
+            try:
+                delay = float(re.search(r'submit\(\);\r?\n\s*},\s*([0-9]+)', body).group(1)) / float(1000)
+                if isinstance(delay, (int, float)):
+                    self.delay = delay
+            except:  # noqa
+                pass

-    # ------------------------------------------------------------------------------- #
-    # check if the response contains Firewall 1020 Error
-    # ------------------------------------------------------------------------------- #
+        sleep(self.delay)

-    @staticmethod
-    def is_Firewall_Blocked(resp):
-        try:
-            return (
-                resp.headers.get('Server', '').startswith('cloudflare')
-                and resp.status_code == 403
-                and re.search(
-                    r'<span class="cf-error-code">1020</span>',
-                    resp.text,
-                    re.M | re.DOTALL
-                )
-            )
-        except AttributeError:
-            pass
+        parsed_url = urlparse(resp.url)
+        domain = parsed_url.netloc
+        submit_url = '{}://{}/cdn-cgi/l/chk_jschl'.format(parsed_url.scheme, domain)

-        return False
-
-    # ------------------------------------------------------------------------------- #
-    # Wrapper for is_reCaptcha_Challenge, is_IUAM_Challenge, is_Firewall_Blocked
-    # ------------------------------------------------------------------------------- #
-
-    def is_Challenge_Request(self, resp):
-        if self.is_Firewall_Blocked(resp):
-            self.simpleException(
-                CloudflareCode1020,
-                'Cloudflare has blocked this request (Code 1020 Detected).'
-            )
-
-        if self.is_reCaptcha_Challenge(resp) or self.is_IUAM_Challenge(resp):
-            return True
-
-        return False
-
-    # ------------------------------------------------------------------------------- #
-    # Try to solve cloudflare javascript challenge.
-    # ------------------------------------------------------------------------------- #
-
-    def IUAM_Challenge_Response(self, body, url, interpreter):
-        try:
-            formPayload = re.search(
-                r'<form (?P<form>id="challenge-form" action="(?P<challengeUUID>.*?'
-                r'__cf_chl_jschl_tk__=\S+)"(.*?)</form>)',
-                body,
-                re.M | re.DOTALL
-            ).groupdict()
-
-            if not all(key in formPayload for key in ['form', 'challengeUUID']):
-                self.simpleException(
-                    CloudflareIUAMError,
-                    "Cloudflare IUAM detected, unfortunately we can't extract the parameters correctly."
-                )
-
-            payload = OrderedDict(
-                re.findall(
-                    r'name="(r|jschl_vc|pass)"\svalue="(.*?)"',
-                    formPayload['form']
-                )
-            )
-
-        except AttributeError:
-            self.simpleException(
-                CloudflareIUAMError,
-                "Cloudflare IUAM detected, unfortunately we can't extract the parameters correctly."
-            )
-
-        hostParsed = urlparse(url)
+        cloudflare_kwargs = deepcopy(original_kwargs)

        try:
-            payload['jschl_answer'] = JavaScriptInterpreter.dynamicImport(
-                interpreter
-            ).solveChallenge(body, hostParsed.netloc)
+            params = OrderedDict()
+
+            s = re.search(r'name="s"\svalue="(?P<s_value>[^"]+)', body)
+            if s:
+                params['s'] = s.group('s_value')
+
+            params.update(
+                [
+                    ('jschl_vc', re.search(r'name="jschl_vc" value="(\w+)"', body).group(1)),
+                    ('pass', re.search(r'name="pass" value="(.+?)"', body).group(1))
+                ]
+            )
+
+            params = cloudflare_kwargs.setdefault('params', params)
+
        except Exception as e:
-            self.simpleException(
-                CloudflareIUAMError,
-                'Unable to parse Cloudflare anti-bots page: {}'.format(
-                    getattr(e, 'message', e)
-                )
-            )
+            raise ValueError('Unable to parse Cloudflare anti-bots page: {} {}'.format(e.message, BUG_REPORT))

-        return {
-            'url': '{}://{}{}'.format(
-                hostParsed.scheme,
-                hostParsed.netloc,
-                self.unescape(formPayload['challengeUUID'])
-            ),
-            'data': payload
-        }
+        # Solve the Javascript challenge
+        params['jschl_answer'] = JavaScriptInterpreter.dynamicImport(self.interpreter).solveChallenge(body, domain)

-    # ------------------------------------------------------------------------------- #
-    #  Try to solve the reCaptcha challenge via 3rd party.
-    # ------------------------------------------------------------------------------- #
+        # Requests transforms any request into a GET after a redirect,
+        # so the redirect has to be handled manually here to allow for
+        # performing other types of requests even as the first request.

-    def reCaptcha_Challenge_Response(self, provider, provider_params, body, url):
-        try:
-            formPayload = re.search(
-                r'<form class="challenge-form" (?P<form>id="challenge-form" '
-                r'action="(?P<challengeUUID>.*?__cf_chl_captcha_tk__=\S+)"(.*?)</form>)',
-                body,
-                re.M | re.DOTALL
-            ).groupdict()
+        cloudflare_kwargs['allow_redirects'] = False

-            if not all(key in formPayload for key in ['form', 'challengeUUID']):
-                self.simpleException(
-                    CloudflareReCaptchaError,
-                    "Cloudflare reCaptcha detected, unfortunately we can't extract the parameters correctly."
-                )
-
-            payload = OrderedDict(
-                re.findall(
-                    r'(name="r"\svalue|data-ray|data-sitekey)="(.*?)"',
-                    formPayload['form']
-                )
-            )
-        except (AttributeError):
-            self.simpleException(
-                CloudflareReCaptchaError,
-                "Cloudflare reCaptcha detected, unfortunately we can't extract the parameters correctly."
-            )
-
-        hostParsed = urlparse(url)
-
-        return {
-            'url': '{}://{}{}'.format(
-                hostParsed.scheme,
-                hostParsed.netloc,
-                self.unescape(formPayload['challengeUUID'])
-            ),
-            'data': OrderedDict([
-                ('r', payload.get('name="r" value', '')),
-                ('id', payload.get('data-ray')),
+        redirect = self.request(resp.request.method, submit_url, **cloudflare_kwargs)
+        redirect_location = urlparse(redirect.headers['Location'])
+        if not redirect_location.netloc:
+            redirect_url = urlunparse(
                (
-                    'g-recaptcha-response',
-                    reCaptcha.dynamicImport(
-                        provider.lower()
-                    ).solveCaptcha(
-                        url,
-                        payload['data-sitekey'],
-                        provider_params
-                    )
+                    parsed_url.scheme,
+                    domain,
+                    redirect_location.path,
+                    redirect_location.params,
+                    redirect_location.query,
+                    redirect_location.fragment
                )
-            ])
-        }
-
-    # ------------------------------------------------------------------------------- #
-    # Attempt to handle and send the challenge response back to cloudflare
-    # ------------------------------------------------------------------------------- #
-
-    def Challenge_Response(self, resp, **kwargs):
-        if self.is_reCaptcha_Challenge(resp):
-            # ------------------------------------------------------------------------------- #
-            # double down on the request as some websites are only checking
-            # if cfuid is populated before issuing reCaptcha.
-            # ------------------------------------------------------------------------------- #
-
-            resp = self.decodeBrotli(
-                super(CloudScraper, self).request(resp.request.method, resp.url, **kwargs)
            )
+            return self.request(resp.request.method, redirect_url, **original_kwargs)

-            if not self.is_reCaptcha_Challenge(resp):
-                return resp
+        return self.request(resp.request.method, redirect.headers['Location'], **original_kwargs)

-            # ------------------------------------------------------------------------------- #
-            # if no reCaptcha provider raise a runtime error.
-            # ------------------------------------------------------------------------------- #
-
-            if not self.recaptcha or not isinstance(self.recaptcha, dict) or not self.recaptcha.get('provider'):
-                self.simpleException(
-                    CloudflareReCaptchaProvider,
-                    "Cloudflare reCaptcha detected, unfortunately you haven't loaded an anti reCaptcha provider "
-                    "correctly via the 'recaptcha' parameter."
-                )
-
-            # ------------------------------------------------------------------------------- #
-            # if provider is return_response, return the response without doing anything.
-            # ------------------------------------------------------------------------------- #
-
-            if self.recaptcha.get('provider') == 'return_response':
-                return resp
-
-            self.recaptcha['proxies'] = self.proxies
-            submit_url = self.reCaptcha_Challenge_Response(
-                self.recaptcha.get('provider'),
-                self.recaptcha,
-                resp.text,
-                resp.url
-            )
-        else:
-            # ------------------------------------------------------------------------------- #
-            # Cloudflare requires a delay before solving the challenge
-            # ------------------------------------------------------------------------------- #
-
-            if not self.delay:
-                try:
-                    delay = float(
-                        re.search(
-                            r'submit\(\);\r?\n\s*},\s*([0-9]+)',
-                            resp.text
-                        ).group(1)
-                    ) / float(1000)
-                    if isinstance(delay, (int, float)):
-                        self.delay = delay
-                except (AttributeError, ValueError):
-                    self.simpleException(
-                        CloudflareIUAMError,
-                        "Cloudflare IUAM possibility malformed, issue extracing delay value."
-                    )
-
-            sleep(self.delay)
-
-            # ------------------------------------------------------------------------------- #
-
-            submit_url = self.IUAM_Challenge_Response(
-                resp.text,
-                resp.url,
-                self.interpreter
-            )
-
-        # ------------------------------------------------------------------------------- #
-        # Send the Challenge Response back to Cloudflare
-        # ------------------------------------------------------------------------------- #
-
-        if submit_url:
-
-            def updateAttr(obj, name, newValue):
-                try:
-                    obj[name].update(newValue)
-                    return obj[name]
-                except (AttributeError, KeyError):
-                    obj[name] = {}
-                    obj[name].update(newValue)
-                    return obj[name]
-
-            cloudflare_kwargs = deepcopy(kwargs)
-            cloudflare_kwargs['allow_redirects'] = False
-            cloudflare_kwargs['data'] = updateAttr(
-                cloudflare_kwargs,
-                'data',
-                submit_url['data']
-            )
-
-            urlParsed = urlparse(resp.url)
-            cloudflare_kwargs['headers'] = updateAttr(
-                cloudflare_kwargs,
-                'headers',
-                {
-                    'Origin': '{}://{}'.format(urlParsed.scheme, urlParsed.netloc),
-                    'Referer': resp.url
-                }
-            )
-
-            challengeSubmitResponse = self.request(
-                'POST',
-                submit_url['url'],
-                **cloudflare_kwargs
-            )
-
-            # ------------------------------------------------------------------------------- #
-            # Return response if Cloudflare is doing content pass through instead of 3xx
-            # else request with redirect URL also handle protocol scheme change http -> https
-            # ------------------------------------------------------------------------------- #
-
-            if not challengeSubmitResponse.is_redirect:
-                return challengeSubmitResponse
-            else:
-                cloudflare_kwargs = deepcopy(kwargs)
-                cloudflare_kwargs['headers'] = updateAttr(
-                    cloudflare_kwargs,
-                    'headers',
-                    {'Referer': challengeSubmitResponse.url}
-                )
-
-                if not urlparse(challengeSubmitResponse.headers['Location']).netloc:
-                    redirect_location = urljoin(
-                        challengeSubmitResponse.url,
-                        challengeSubmitResponse.headers['Location']
-                    )
-                else:
-                    redirect_location = challengeSubmitResponse.headers['Location']
-
-                return self.request(
-                    resp.request.method,
-                    redirect_location,
-                    **cloudflare_kwargs
-                )
-
-        # ------------------------------------------------------------------------------- #
-        # We shouldn't be here...
-        # Re-request the original query and/or process again....
-        # ------------------------------------------------------------------------------- #
-
-        return self.request(resp.request.method, resp.url, **kwargs)
-
-    # ------------------------------------------------------------------------------- #
+    ##########################################################################################################################################################

    @classmethod
    def create_scraper(cls, sess=None, **kwargs):
@@ -590,30 +247,24 @@ class CloudScraper(Session):
        scraper = cls(**kwargs)

        if sess:
-            for attr in ['auth', 'cert', 'cookies', 'headers', 'hooks', 'params', 'proxies', 'data']:
+            attrs = ['auth', 'cert', 'cookies', 'headers', 'hooks', 'params', 'proxies', 'data']
+            for attr in attrs:
                val = getattr(sess, attr, None)
                if val:
                    setattr(scraper, attr, val)

        return scraper

-    # ------------------------------------------------------------------------------- #
-    # Functions for integrating cloudscraper with other applications and scripts
-    # ------------------------------------------------------------------------------- #
+    ##########################################################################################################################################################

+    # Functions for integrating cloudscraper with other applications and scripts
    @classmethod
    def get_tokens(cls, url, **kwargs):
        scraper = cls.create_scraper(
-            **{
-                field: kwargs.pop(field, None) for field in [
-                    'allow_brotli',
-                    'browser',
-                    'debug',
-                    'delay',
-                    'interpreter',
-                    'recaptcha'
-                ] if field in kwargs
-            }
+            debug=kwargs.pop('debug', False),
+            delay=kwargs.pop('delay', None),
+            interpreter=kwargs.pop('interpreter', 'js2py'),
+            allow_brotli=kwargs.pop('allow_brotli', True),
        )

        try:
@@ -632,11 +283,7 @@ class CloudScraper(Session):
                cookie_domain = d
                break
        else:
-            cls.simpleException(
-                CloudflareIUAMError,
-                "Unable to find Cloudflare cookies. Does the site actually "
-                "have Cloudflare IUAM (I'm Under Attack Mode) enabled?"
-            )
+            raise ValueError('Unable to find Cloudflare cookies. Does the site actually have Cloudflare IUAM ("I\'m Under Attack Mode") enabled?')

        return (
            {
@@ -646,7 +293,7 @@ class CloudScraper(Session):
            scraper.headers['User-Agent']
        )

-    # ------------------------------------------------------------------------------- #
+    ##########################################################################################################################################################

    @classmethod
    def get_cookie_string(cls, url, **kwargs):
@@ -657,18 +304,7 @@ class CloudScraper(Session):
        return '; '.join('='.join(pair) for pair in tokens.items()), user_agent


-# ------------------------------------------------------------------------------- #
-
-if ssl.OPENSSL_VERSION_INFO < (1, 1, 1):
-    print(
-        "DEPRECATION: The OpenSSL being used by this python install ({}) does not meet the minimum supported "
-        "version (>= OpenSSL 1.1.1) in order to support TLS 1.3 required by Cloudflare, "
-        "You may encounter an unexpected reCaptcha or cloudflare 1020 blocks.".format(
-            ssl.OPENSSL_VERSION
-        )
-    )
-
-# ------------------------------------------------------------------------------- #
+##########################################################################################################################################################

 create_scraper = CloudScraper.create_scraper
 get_tokens = CloudScraper.get_tokens
@@ -1,99 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# ------------------------------------------------------------------------------- #
-
-"""
-cloudscraper.exceptions
-~~~~~~~~~~~~~~~~~~~
-This module contains the set of cloudscraper exceptions.
-"""
-
-# ------------------------------------------------------------------------------- #
-
-
-class CloudflareException(Exception):
-    """
-    Base exception class for cloudscraper for Cloudflare
-    """
-
-
-class CloudflareLoopProtection(CloudflareException):
-    """
-    Raise an exception for recursive depth protection
-    """
-
-
-class CloudflareCode1020(CloudflareException):
-    """
-    Raise an exception for Cloudflare code 1020 block
-    """
-
-
-class CloudflareIUAMError(CloudflareException):
-    """
-    Raise an error for problem extracting IUAM paramters
-    from Cloudflare payload
-    """
-
-
-class CloudflareReCaptchaError(CloudflareException):
-    """
-    Raise an error for problem extracting reCaptcha paramters
-    from Cloudflare payload
-    """
-
-
-class CloudflareReCaptchaProvider(CloudflareException):
-    """
-    Raise an exception for no reCaptcha provider loaded for Cloudflare.
-    """
-
-# ------------------------------------------------------------------------------- #
-
-
-class reCaptchaException(Exception):
-    """
-    Base exception class for cloudscraper reCaptcha Providers
-    """
-
-
-class reCaptchaServiceUnavailable(reCaptchaException):
-    """
-    Raise an exception for external services that cannot be reached
-    """
-
-
-class reCaptchaAPIError(reCaptchaException):
-    """
-    Raise an error for error from API response.
-    """
-
-
-class reCaptchaAccountError(reCaptchaException):
-    """
-    Raise an error for reCaptcha provider account problem.
-    """
-
-
-class reCaptchaTimeout(reCaptchaException):
-    """
-    Raise an exception for reCaptcha provider taking too long.
-    """
-
-
-class reCaptchaParameter(reCaptchaException):
-    """
-    Raise an exception for bad or missing Parameter.
-    """
-
-
-class reCaptchaBadJobID(reCaptchaException):
-    """
-    Raise an exception for invalid job id.
-    """
-
-
-class reCaptchaReportError(reCaptchaException):
-    """
-    Raise an error for reCaptcha provider unable to report bad solve.
-    """
@@ -1,3 +1,4 @@
+import re
 import sys
 import logging
 import abc
@@ -7,24 +8,20 @@ if sys.version_info >= (3, 4):
 else:
    ABC = abc.ABCMeta('ABC', (), {})

-# ------------------------------------------------------------------------------- #
+##########################################################################################################################################################

-interpreters = {}
 BUG_REPORT = 'Cloudflare may have changed their technique, or there may be a bug in the script.'

-# ------------------------------------------------------------------------------- #
+##########################################################################################################################################################
+
+interpreters = {}


 class JavaScriptInterpreter(ABC):
-
-    # ------------------------------------------------------------------------------- #
-
    @abc.abstractmethod
    def __init__(self, name):
        interpreters[name] = self

-    # ------------------------------------------------------------------------------- #
-
    @classmethod
    def dynamicImport(cls, name):
        if name not in interpreters:
@@ -38,17 +35,55 @@ class JavaScriptInterpreter(ABC):

        return interpreters[name]

-    # ------------------------------------------------------------------------------- #
-
    @abc.abstractmethod
    def eval(self, jsEnv, js):
        pass

-    # ------------------------------------------------------------------------------- #
-
    def solveChallenge(self, body, domain):
        try:
-            return float(self.eval(body, domain))
+            js = re.search(
+                r'setTimeout\(function\(\){\s+(var s,t,o,p,b,r,e,a,k,i,n,g,f.+?\r?\n[\s\S]+?a\.value =.+?)\r?\n',
+                body
+            ).group(1)
+        except Exception:
+            raise ValueError('Unable to identify Cloudflare IUAM Javascript on website. {}'.format(BUG_REPORT))
+
+        js = re.sub(r'\s{2,}', ' ', js, flags=re.MULTILINE | re.DOTALL).replace('\'; 121\'', '')
+        js += '\na.value;'
+
+        jsEnv = '''
+            String.prototype.italics=function(str) {{return "<i>" + this + "</i>";}};
+            var document = {{
+                createElement: function () {{
+                    return {{ firstChild: {{ href: "https://{domain}/" }} }}
+                }},
+                getElementById: function () {{
+                    return {{"innerHTML": "{innerHTML}"}};
+                }}
+            }};
+        '''
+
+        try:
+            innerHTML = re.search(
+                r'<div(?: [^<>]*)? id="([^<>]*?)">([^<>]*?)</div>',
+                body,
+                re.MULTILINE | re.DOTALL
+            )
+            innerHTML = innerHTML.group(2) if innerHTML else ''
+
+        except:  # noqa
+            logging.error('Error extracting Cloudflare IUAM Javascript. {}'.format(BUG_REPORT))
+            raise
+
+        try:
+            result = self.eval(
+                re.sub(r'\s{2,}', ' ', jsEnv.format(domain=domain, innerHTML=innerHTML), flags=re.MULTILINE | re.DOTALL),
+                js
+            )
+
+            float(result)
        except Exception:
            logging.error('Error executing Cloudflare IUAM Javascript. {}'.format(BUG_REPORT))
            raise
+
+        return result
@@ -1,103 +0,0 @@
-from __future__ import absolute_import
-
-import os
-import sys
-import ctypes.util
-
-from ctypes import c_void_p, c_size_t, byref, create_string_buffer, CDLL
-
-from . import JavaScriptInterpreter
-from .encapsulated import template
-
-# ------------------------------------------------------------------------------- #
-
-
-class ChallengeInterpreter(JavaScriptInterpreter):
-
-    # ------------------------------------------------------------------------------- #
-
-    def __init__(self):
-        super(ChallengeInterpreter, self).__init__('chakracore')
-
-    # ------------------------------------------------------------------------------- #
-
-    def eval(self, body, domain):
-        chakraCoreLibrary = None
-
-        # check current working directory.
-        for _libraryFile in ['libChakraCore.so', 'libChakraCore.dylib', 'ChakraCore.dll']:
-            if os.path.isfile(os.path.join(os.getcwd(), _libraryFile)):
-                chakraCoreLibrary = os.path.join(os.getcwd(), _libraryFile)
-                continue
-
-        if not chakraCoreLibrary:
-            chakraCoreLibrary = ctypes.util.find_library('ChakraCore')
-
-        if not chakraCoreLibrary:
-            sys.tracebacklimit = 0
-            raise RuntimeError(
-                'ChakraCore library not found in current path or any of your system library paths, '
-                'please download from https://www.github.com/VeNoMouS/cloudscraper/tree/ChakraCore/, '
-                'or https://github.com/Microsoft/ChakraCore/'
-            )
-
-        try:
-            chakraCore = CDLL(chakraCoreLibrary)
-        except OSError:
-            sys.tracebacklimit = 0
-            raise RuntimeError('There was an error loading the ChakraCore library {}'.format(chakraCoreLibrary))
-
-        if sys.platform != 'win32':
-            chakraCore.DllMain(0, 1, 0)
-            chakraCore.DllMain(0, 2, 0)
-
-        script = create_string_buffer(template(body, domain).encode('utf-16'))
-
-        runtime = c_void_p()
-        chakraCore.JsCreateRuntime(0, 0, byref(runtime))
-
-        context = c_void_p()
-        chakraCore.JsCreateContext(runtime, byref(context))
-        chakraCore.JsSetCurrentContext(context)
-
-        fname = c_void_p()
-        chakraCore.JsCreateString(
-            'iuam-challenge.js',
-            len('iuam-challenge.js'),
-            byref(fname)
-        )
-
-        scriptSource = c_void_p()
-        chakraCore.JsCreateExternalArrayBuffer(
-            script,
-            len(script),
-            0,
-            0,
-            byref(scriptSource)
-        )
-
-        jsResult = c_void_p()
-        chakraCore.JsRun(scriptSource, 0, fname, 0x02, byref(jsResult))
-
-        resultJSString = c_void_p()
-        chakraCore.JsConvertValueToString(jsResult, byref(resultJSString))
-
-        stringLength = c_size_t()
-        chakraCore.JsCopyString(resultJSString, 0, 0, byref(stringLength))
-
-        resultSTR = create_string_buffer(stringLength.value + 1)
-        chakraCore.JsCopyString(
-            resultJSString,
-            byref(resultSTR),
-            stringLength.value + 1,
-            0
-        )
-
-        chakraCore.JsDisposeRuntime(runtime)
-
-        return resultSTR.value
-
-
-# ------------------------------------------------------------------------------- #
-
-ChallengeInterpreter()
@@ -1,58 +0,0 @@
-import logging
-import re
-
-# ------------------------------------------------------------------------------- #
-
-
-def template(body, domain):
-    BUG_REPORT = 'Cloudflare may have changed their technique, or there may be a bug in the script.'
-
-    try:
-        js = re.search(
-            r'setTimeout\(function\(\){\s+(var s,t,o,p,b,r,e,a,k,i,n,g,f.+?\r?\n[\s\S]+?a\.value =.+?)\r?\n',
-            body
-        ).group(1)
-    except Exception:
-        raise ValueError('Unable to identify Cloudflare IUAM Javascript on website. {}'.format(BUG_REPORT))
-
-    js = re.sub(r'\s{2,}', ' ', js, flags=re.MULTILINE | re.DOTALL).replace('\'; 121\'', '')
-    js += '\na.value;'
-
-    jsEnv = '''
-        String.prototype.italics=function(str) {{return "<i>" + this + "</i>";}};
-        var document = {{
-            createElement: function () {{
-                return {{ firstChild: {{ href: "https://{domain}/" }} }}
-            }},
-            getElementById: function () {{
-                return {{"innerHTML": "{innerHTML}"}};
-            }}
-        }};
-    '''
-
-    try:
-        innerHTML = re.search(
-            r'<div(?: [^<>]*)? id="([^<>]*?)">([^<>]*?)</div>',
-            body,
-            re.MULTILINE | re.DOTALL
-        )
-        innerHTML = innerHTML.group(2) if innerHTML else ''
-
-    except:  # noqa
-        logging.error('Error extracting Cloudflare IUAM Javascript. {}'.format(BUG_REPORT))
-        raise
-
-    return '{}{}'.format(
-        re.sub(
-            r'\s{2,}',
-            ' ',
-            jsEnv.format(
-                domain=domain,
-                innerHTML=innerHTML
-            ),
-            re.MULTILINE | re.DOTALL
-        ),
-        js
-    )
-
-# ------------------------------------------------------------------------------- #
@@ -6,39 +6,27 @@ import base64

 from . import JavaScriptInterpreter

-from .encapsulated import template
 from .jsunfuck import jsunfuck

-# ------------------------------------------------------------------------------- #
-

 class ChallengeInterpreter(JavaScriptInterpreter):

-    # ------------------------------------------------------------------------------- #
-
    def __init__(self):
        super(ChallengeInterpreter, self).__init__('js2py')

-    # ------------------------------------------------------------------------------- #
-
-    def eval(self, body, domain):
-
-        jsPayload = template(body, domain)
-
+    def eval(self, jsEnv, js):
        if js2py.eval_js('(+(+!+[]+[+!+[]]+(!![]+[])[!+[]+!+[]+!+[]]+[!+[]+!+[]]+[+[]])+[])[+!+[]]') == '1':
            logging.warning('WARNING - Please upgrade your js2py https://github.com/PiotrDabkowski/Js2Py, applying work around for the meantime.')
-            jsPayload = jsunfuck(jsPayload)
+            js = jsunfuck(js)

        def atob(s):
            return base64.b64decode('{}'.format(s)).decode('utf-8')

        js2py.disable_pyimport()
        context = js2py.EvalJs({'atob': atob})
-        result = context.eval(jsPayload)
+        result = context.eval('{}{}'.format(jsEnv, js))

        return result


-# ------------------------------------------------------------------------------- #
-
 ChallengeInterpreter()
@@ -1,120 +0,0 @@
-from __future__ import absolute_import
-
-import re
-import operator as op
-
-from . import JavaScriptInterpreter
-
-# ------------------------------------------------------------------------------- #
-
-
-class ChallengeInterpreter(JavaScriptInterpreter):
-
-    def __init__(self):
-        super(ChallengeInterpreter, self).__init__('native')
-
-    def eval(self, body, domain):
-        # ------------------------------------------------------------------------------- #
-
-        operators = {
-            '+': op.add,
-            '-': op.sub,
-            '*': op.mul,
-            '/': op.truediv
-        }
-
-        # ------------------------------------------------------------------------------- #
-
-        def jsfuckToNumber(jsFuck):
-            t = ''
-
-            split_numbers = re.compile(r'-?\d+').findall
-
-            for i in re.findall(
-                r'\((?:\d|\+|\-)*\)',
-                jsFuck.replace('!+[]', '1').replace('!![]', '1').replace('[]', '0').lstrip('+').replace('(+', '(')
-            ):
-                t = '{}{}'.format(t, sum(int(x) for x in split_numbers(i)))
-
-            return int(t)
-
-        # ------------------------------------------------------------------------------- #
-
-        def divisorMath(payload, needle, domain):
-            jsfuckMath = payload.split('/')
-            if needle in jsfuckMath[1]:
-                expression = re.findall(r"^(.*?)(.)\(function", jsfuckMath[1])[0]
-                expression_value = operators[expression[1]](
-                    float(jsfuckToNumber(expression[0])),
-                    float(ord(domain[jsfuckToNumber(jsfuckMath[1][
-                        jsfuckMath[1].find('"("+p+")")}') + len('"("+p+")")}'):-2
-                    ])]))
-                )
-            else:
-                expression_value = jsfuckToNumber(jsfuckMath[1])
-
-            expression_value = jsfuckToNumber(jsfuckMath[0]) / float(expression_value)
-
-            return expression_value
-
-        # ------------------------------------------------------------------------------- #
-
-        def challengeSolve(body, domain):
-            jschl_answer = 0
-
-            jsfuckChallenge = re.search(
-                r"setTimeout\(function\(\){\s+var.*?f,\s*(?P<variable>\w+).*?:(?P<init>\S+)};"
-                r".*?\('challenge-form'\);\s+;(?P<challenge>.*?a\.value)"
-                r"(?:.*id=\"cf-dn-.*?>(?P<k>\S+)<)?",
-                body,
-                re.DOTALL | re.MULTILINE
-            ).groupdict()
-
-            jsfuckChallenge['challenge'] = re.finditer(
-                r'{}.*?([+\-*/])=(.*?);(?=a\.value|{})'.format(
-                    jsfuckChallenge['variable'],
-                    jsfuckChallenge['variable']
-                ),
-                jsfuckChallenge['challenge']
-            )
-
-            # ------------------------------------------------------------------------------- #
-
-            if '/' in jsfuckChallenge['init']:
-                val = jsfuckChallenge['init'].split('/')
-                jschl_answer = jsfuckToNumber(val[0]) / float(jsfuckToNumber(val[1]))
-            else:
-                jschl_answer = jsfuckToNumber(jsfuckChallenge['init'])
-
-            # ------------------------------------------------------------------------------- #
-
-            for expressionMatch in jsfuckChallenge['challenge']:
-                oper, expression = expressionMatch.groups()
-
-                if '/' in expression:
-                    expression_value = divisorMath(expression, 'function(p)', domain)
-                else:
-                    if 'Element' in expression:
-                        expression_value = divisorMath(jsfuckChallenge['k'], '"("+p+")")}', domain)
-                    else:
-                        expression_value = jsfuckToNumber(expression)
-
-                jschl_answer = operators[oper](jschl_answer, expression_value)
-
-            # ------------------------------------------------------------------------------- #
-
-            if not jsfuckChallenge['k'] and '+ t.length' in body:
-                jschl_answer += len(domain)
-
-            # ------------------------------------------------------------------------------- #
-
-            return '{0:.10f}'.format(jschl_answer)
-
-        # ------------------------------------------------------------------------------- #
-
-        return challengeSolve(body, domain)
-
-
-# ------------------------------------------------------------------------------- #
-
-ChallengeInterpreter()
@@ -1,23 +1,22 @@
 import base64
+import logging
 import subprocess
-import sys

 from . import JavaScriptInterpreter
-from .encapsulated import template

-# ------------------------------------------------------------------------------- #
+##########################################################################################################################################################
+
+BUG_REPORT = 'Cloudflare may have changed their technique, or there may be a bug in the script.'
+
+##########################################################################################################################################################


 class ChallengeInterpreter(JavaScriptInterpreter):

-    # ------------------------------------------------------------------------------- #
-
    def __init__(self):
        super(ChallengeInterpreter, self).__init__('nodejs')

-    # ------------------------------------------------------------------------------- #
-
-    def eval(self, body, domain):
+    def eval(self, jsEnv, js):
        try:
            js = 'var atob = function(str) {return Buffer.from(str, "base64").toString("binary");};' \
                 'var challenge = atob("%s");' \
@@ -25,25 +24,23 @@ class ChallengeInterpreter(JavaScriptInterpreter):
                 'var options = {filename: "iuam-challenge.js", timeout: 4000};' \
                 'var answer = require("vm").runInNewContext(challenge, context, options);' \
                 'process.stdout.write(String(answer));' \
-                 % base64.b64encode(template(body, domain).encode('UTF-8')).decode('ascii')
+                 % base64.b64encode('{}{}'.format(jsEnv, js).encode('UTF-8')).decode('ascii')

            return subprocess.check_output(['node', '-e', js])

        except OSError as e:
            if e.errno == 2:
                raise EnvironmentError(
-                    'Missing Node.js runtime. Node is required and must be in the PATH (check with `node -v`).\n\n'
-                    'Your Node binary may be called `nodejs` rather than `node`, '
-                    'in which case you may need to run `apt-get install nodejs-legacy` on some Debian-based systems.\n\n'
-                    '(Please read the cloudscraper README\'s Dependencies section: '
-                    'https://github.com/VeNoMouS/cloudscraper#dependencies.)'
+                    'Missing Node.js runtime. Node is required and must be in the PATH (check with `node -v`). Your Node binary may be called `nodejs` rather than `node`, '
+                    'in which case you may need to run `apt-get install nodejs-legacy` on some Debian-based systems. (Please read the cloudscraper'
+                    ' README\'s Dependencies section: https://github.com/VeNoMouS/cloudscraper#dependencies.'
                )
            raise
        except Exception:
-            sys.tracebacklimit = 0
-            raise RuntimeError('Error executing Cloudflare IUAM Javascript in nodejs')
+            logging.error('Error executing Cloudflare IUAM Javascript. %s' % BUG_REPORT)
+            raise

+        pass

-# ------------------------------------------------------------------------------- #

 ChallengeInterpreter()
@@ -1,33 +0,0 @@
-from __future__ import absolute_import
-
-import sys
-
-try:
-    import v8eval
-except ImportError:
-    sys.tracebacklimit = 0
-    raise RuntimeError('Please install the python module v8eval either via pip or download it from https://github.com/sony/v8eval')
-
-from . import JavaScriptInterpreter
-from .encapsulated import template
-
-# ------------------------------------------------------------------------------- #
-
-
-class ChallengeInterpreter(JavaScriptInterpreter):
-
-    def __init__(self):
-        super(ChallengeInterpreter, self).__init__('v8')
-
-    # ------------------------------------------------------------------------------- #
-
-    def eval(self, body, domain):
-        try:
-            return v8eval.V8().eval(template(body, domain))
-        except (TypeError, v8eval.V8Error):
-            RuntimeError('We encountered an error running the V8 Engine.')
-
-
-# ------------------------------------------------------------------------------- #
-
-ChallengeInterpreter()
@@ -1,236 +0,0 @@
-from __future__ import absolute_import
-
-import requests
-
-
-from ..exceptions import (
-    reCaptchaServiceUnavailable,
-    reCaptchaAPIError,
-    reCaptchaTimeout,
-    reCaptchaParameter,
-    reCaptchaBadJobID,
-    reCaptchaReportError
-)
-
-try:
-    import polling
-except ImportError:
-    raise ImportError(
-        "Please install the python module 'polling' via pip or download it from "
-        "https://github.com/justiniso/polling/"
-    )
-
-from . import reCaptcha
-
-
-class captchaSolver(reCaptcha):
-
-    def __init__(self):
-        super(captchaSolver, self).__init__('2captcha')
-        self.host = 'https://2captcha.com'
-        self.session = requests.Session()
-
-    # ------------------------------------------------------------------------------- #
-
-    @staticmethod
-    def checkErrorStatus(response, request_type):
-        if response.status_code in [500, 502]:
-            raise reCaptchaServiceUnavailable('2Captcha: Server Side Error {}'.format(response.status_code))
-
-        errors = {
-            'in.php': {
-                "ERROR_WRONG_USER_KEY": "You've provided api_key parameter value is in incorrect format, it should contain 32 symbols.",
-                "ERROR_KEY_DOES_NOT_EXIST": "The api_key you've provided does not exists.",
-                "ERROR_ZERO_BALANCE": "You don't have sufficient funds on your account.",
-                "ERROR_PAGEURL": "pageurl parameter is missing in your request.",
-                "ERROR_NO_SLOT_AVAILABLE":
-                    "No Slots Available.\nYou can receive this error in two cases:\n"
-                    "1. If you solve ReCaptcha: the queue of your captchas that are not distributed to workers is too long. "
-                    "Queue limit changes dynamically and depends on total amount of captchas awaiting solution and usually it's between 50 and 100 captchas.\n"
-                    "2. If you solve Normal Captcha: your maximum rate for normal captchas is lower than current rate on the server."
-                    "You can change your maximum rate in your account's settings.",
-                "ERROR_IP_NOT_ALLOWED": "The request is sent from the IP that is not on the list of your allowed IPs.",
-                "IP_BANNED": "Your IP address is banned due to many frequent attempts to access the server using wrong authorization keys.",
-                "ERROR_BAD_TOKEN_OR_PAGEURL":
-                    "You can get this error code when sending ReCaptcha V2. "
-                    "That happens if your request contains invalid pair of googlekey and pageurl. "
-                    "The common reason for that is that ReCaptcha is loaded inside an iframe hosted on another domain/subdomain.",
-                "ERROR_GOOGLEKEY":
-                    "You can get this error code when sending ReCaptcha V2. "
-                    "That means that sitekey value provided in your request is incorrect: it's blank or malformed.",
-                "MAX_USER_TURN": "You made more than 60 requests within 3 seconds.Your account is banned for 10 seconds. Ban will be lifted automatically."
-            },
-            'res.php': {
-                "ERROR_CAPTCHA_UNSOLVABLE":
-                    "We are unable to solve your captcha - three of our workers were unable solve it "
-                    "or we didn't get an answer within 90 seconds (300 seconds for ReCaptcha V2). "
-                    "We will not charge you for that request.",
-                "ERROR_WRONG_USER_KEY": "You've provided api_key parameter value in incorrect format, it should contain 32 symbols.",
-                "ERROR_KEY_DOES_NOT_EXIST": "The api_key you've provided does not exists.",
-                "ERROR_WRONG_ID_FORMAT": "You've provided captcha ID in wrong format. The ID can contain numbers only.",
-                "ERROR_WRONG_CAPTCHA_ID": "You've provided incorrect captcha ID.",
-                "ERROR_BAD_DUPLICATES":
-                    "Error is returned when 100% accuracy feature is enabled. "
-                    "The error means that max numbers of tries is reached but min number of matches not found.",
-                "REPORT_NOT_RECORDED": "Error is returned to your complain request if you already complained lots of correctly solved captchas.",
-                "ERROR_IP_ADDRES":
-                    "You can receive this error code when registering a pingback (callback) IP or domain."
-                    "That happes if your request is coming from an IP address that doesn't match the IP address of your pingback IP or domain.",
-                "ERROR_TOKEN_EXPIRED": "You can receive this error code when sending GeeTest. That error means that challenge value you provided is expired.",
-                "ERROR_EMPTY_ACTION": "Action parameter is missing or no value is provided for action parameter."
-            }
-        }
-
-        if response.json().get('status') is False and response.json().get('request') in errors.get(request_type):
-            raise reCaptchaAPIError(
-                '{} {}'.format(
-                    response.json().get('request'),
-                    errors.get(request_type).get(response.json().get('request'))
-                )
-            )
-
-    # ------------------------------------------------------------------------------- #
-
-    def reportJob(self, jobID):
-        if not jobID:
-            raise reCaptchaBadJobID(
-                "2Captcha: Error bad job id to request reCaptcha."
-            )
-
-        def _checkRequest(response):
-            if response.ok and response.json().get('status') == 1:
-                return response
-
-            self.checkErrorStatus(response, 'res.php')
-
-            return None
-
-        response = polling.poll(
-            lambda: self.session.get(
-                '{}/res.php'.format(self.host),
-                params={
-                    'key': self.api_key,
-                    'action': 'reportbad',
-                    'id': jobID,
-                    'json': '1'
-                }
-            ),
-            check_success=_checkRequest,
-            step=5,
-            timeout=180
-        )
-
-        if response:
-            return True
-        else:
-            raise reCaptchaReportError(
-                "2Captcha: Error - Failed to report bad reCaptcha solve."
-            )
-
-    # ------------------------------------------------------------------------------- #
-
-    def requestJob(self, jobID):
-        if not jobID:
-            raise reCaptchaBadJobID("2Captcha: Error bad job id to request reCaptcha.")
-
-        def _checkRequest(response):
-            if response.ok and response.json().get('status') == 1:
-                return response
-
-            self.checkErrorStatus(response, 'res.php')
-
-            return None
-
-        response = polling.poll(
-            lambda: self.session.get(
-                '{}/res.php'.format(self.host),
-                params={
-                    'key': self.api_key,
-                    'action': 'get',
-                    'id': jobID,
-                    'json': '1'
-                }
-            ),
-            check_success=_checkRequest,
-            step=5,
-            timeout=180
-        )
-
-        if response:
-            return response.json().get('request')
-        else:
-            raise reCaptchaTimeout(
-                "2Captcha: Error failed to solve reCaptcha."
-            )
-
-    # ------------------------------------------------------------------------------- #
-
-    def requestSolve(self, site_url, site_key):
-        def _checkRequest(response):
-            if response.ok and response.json().get("status") == 1 and response.json().get('request'):
-                return response
-
-            self.checkErrorStatus(response, 'in.php')
-
-            return None
-
-        response = polling.poll(
-            lambda: self.session.post(
-                '{}/in.php'.format(self.host),
-                data={
-                    'key': self.api_key,
-                    'method': 'userrecaptcha',
-                    'googlekey': site_key,
-                    'pageurl': site_url,
-                    'json': '1',
-                    'soft_id': '5507698'
-                },
-                allow_redirects=False
-            ),
-            check_success=_checkRequest,
-            step=5,
-            timeout=180
-        )
-
-        if response:
-            return response.json().get('request')
-        else:
-            raise reCaptchaBadJobID(
-                '2Captcha: Error no job id was returned.'
-            )
-
-    # ------------------------------------------------------------------------------- #
-
-    def getCaptchaAnswer(self, site_url, site_key, reCaptchaParams):
-        jobID = None
-
-        if not reCaptchaParams.get('api_key'):
-            raise reCaptchaParameter(
-                "2Captcha: Missing api_key parameter."
-            )
-
-        self.api_key = reCaptchaParams.get('api_key')
-
-        if reCaptchaParams.get('proxy'):
-            self.session.proxies = reCaptchaParams.get('proxies')
-
-        try:
-            jobID = self.requestSolve(site_url, site_key)
-            return self.requestJob(jobID)
-        except polling.TimeoutException:
-            try:
-                if jobID:
-                    self.reportJob(jobID)
-            except polling.TimeoutException:
-                raise reCaptchaTimeout(
-                    "2Captcha: reCaptcha solve took to long and also failed reporting the job the job id {}.".format(jobID)
-                )
-
-            raise reCaptchaTimeout(
-                "2Captcha: reCaptcha solve took to long to execute job id {}, aborting.".format(jobID)
-            )
-
-
-# ------------------------------------------------------------------------------- #
-
-captchaSolver()
@@ -1,207 +0,0 @@
-from __future__ import absolute_import
-
-import re
-import requests
-
-try:
-    import polling
-except ImportError:
-    raise ImportError(
-        "Please install the python module 'polling' via pip or download it from "
-        "https://github.com/justiniso/polling/"
-    )
-
-from ..exceptions import (
-    reCaptchaServiceUnavailable,
-    reCaptchaAPIError,
-    reCaptchaTimeout,
-    reCaptchaParameter,
-    reCaptchaBadJobID
-)
-
-from . import reCaptcha
-
-
-class captchaSolver(reCaptcha):
-
-    def __init__(self):
-        super(captchaSolver, self).__init__('9kw')
-        self.host = 'https://www.9kw.eu/index.cgi'
-        self.maxtimeout = 180
-        self.session = requests.Session()
-
-    # ------------------------------------------------------------------------------- #
-
-    @staticmethod
-    def checkErrorStatus(response):
-        if response.status_code in [500, 502]:
-            raise reCaptchaServiceUnavailable(
-                '9kw: Server Side Error {}'.format(response.status_code)
-            )
-
-        error_codes = {
-            1: 'No API Key available.',
-            2: 'No API key found.',
-            3: 'No active API key found.',
-            4: 'API Key has been disabled by the operator. ',
-            5: 'No user found.',
-            6: 'No data found.',
-            7: 'Found No ID.',
-            8: 'found No captcha.',
-            9: 'No image found.',
-            10: 'Image size not allowed.',
-            11: 'credit is not sufficient.',
-            12: 'what was done.',
-            13: 'No answer contain.',
-            14: 'Captcha already been answered.',
-            15: 'Captcha to quickly filed.',
-            16: 'JD check active.',
-            17: 'Unknown problem.',
-            18: 'Found No ID.',
-            19: 'Incorrect answer.',
-            20: 'Do not timely filed (Incorrect UserID).',
-            21: 'Link not allowed.',
-            22: 'Prohibited submit.',
-            23: 'Entering prohibited.',
-            24: 'Too little credit.',
-            25: 'No entry found.',
-            26: 'No Conditions accepted.',
-            27: 'No coupon code found in the database.',
-            28: 'Already unused voucher code.',
-            29: 'maxTimeout under 60 seconds.',
-            30: 'User not found.',
-            31: 'An account is not yet 24 hours in system.',
-            32: 'An account does not have the full rights.',
-            33: 'Plugin needed a update.',
-            34: 'No HTTPS allowed.',
-            35: 'No HTTP allowed.',
-            36: 'Source not allowed.',
-            37: 'Transfer denied.',
-            38: 'Incorrect answer without space',
-            39: 'Incorrect answer with space',
-            40: 'Incorrect answer with not only numbers',
-            41: 'Incorrect answer with not only A-Z, a-z',
-            42: 'Incorrect answer with not only 0-9, A-Z, a-z',
-            43: 'Incorrect answer with not only [0-9,- ]',
-            44: 'Incorrect answer with not only [0-9A-Za-z,- ]',
-            45: 'Incorrect answer with not only coordinates',
-            46: 'Incorrect answer with not only multiple coordinates',
-            47: 'Incorrect answer with not only data',
-            48: 'Incorrect answer with not only rotate number',
-            49: 'Incorrect answer with not only text',
-            50: 'Incorrect answer with not only text and too short',
-            51: 'Incorrect answer with not enough chars',
-            52: 'Incorrect answer with too many chars',
-            53: 'Incorrect answer without no or yes',
-            54: 'Assignment was not found.'
-        }
-
-        if response.text.startswith('{'):
-            if response.json().get('error'):
-                raise reCaptchaAPIError(error_codes.get(int(response.json().get('error'))))
-        else:
-            error_code = int(re.search(r'^00(?P<error_code>\d+)', response.text).groupdict().get('error_code', 0))
-            if error_code:
-                raise reCaptchaAPIError(error_codes.get(error_code))
-
-    # ------------------------------------------------------------------------------- #
-
-    def requestJob(self, jobID):
-        if not jobID:
-            raise reCaptchaBadJobID(
-                "9kw: Error bad job id to request reCaptcha against."
-            )
-
-        def _checkRequest(response):
-            if response.ok and response.json().get('answer') != 'NO DATA':
-                return response
-
-            self.checkErrorStatus(response)
-
-            return None
-
-        response = polling.poll(
-            lambda: self.session.get(
-                self.host,
-                params={
-                    'apikey': self.api_key,
-                    'action': 'usercaptchacorrectdata',
-                    'id': jobID,
-                    'info': 1,
-                    'json': 1
-                }
-            ),
-            check_success=_checkRequest,
-            step=10,
-            timeout=(self.maxtimeout + 10)
-        )
-
-        if response:
-            return response.json().get('answer')
-        else:
-            raise reCaptchaTimeout("9kw: Error failed to solve reCaptcha.")
-
-    # ------------------------------------------------------------------------------- #
-
-    def requestSolve(self, site_url, site_key):
-        def _checkRequest(response):
-            if response.ok and response.text.startswith('{') and response.json().get('captchaid'):
-                return response
-
-            self.checkErrorStatus(response)
-
-            return None
-
-        response = polling.poll(
-            lambda: self.session.post(
-                self.host,
-                data={
-                    'apikey': self.api_key,
-                    'action': 'usercaptchaupload',
-                    'interactive': 1,
-                    'file-upload-01': site_key,
-                    'oldsource': 'recaptchav2',
-                    'pageurl': site_url,
-                    'maxtimeout': self.maxtimeout,
-                    'json': 1
-                },
-                allow_redirects=False
-            ),
-            check_success=_checkRequest,
-            step=5,
-            timeout=(self.maxtimeout + 10)
-        )
-
-        if response:
-            return response.json().get('captchaid')
-        else:
-            raise reCaptchaBadJobID('9kw: Error no valid job id was returned.')
-
-    # ------------------------------------------------------------------------------- #
-
-    def getCaptchaAnswer(self, site_url, site_key, reCaptchaParams):
-        jobID = None
-
-        if not reCaptchaParams.get('api_key'):
-            raise reCaptchaParameter("9kw: Missing api_key parameter.")
-
-        self.api_key = reCaptchaParams.get('api_key')
-
-        if reCaptchaParams.get('maxtimeout'):
-            self.maxtimeout = reCaptchaParams.get('maxtimeout')
-
-        if reCaptchaParams.get('proxy'):
-            self.session.proxies = reCaptchaParams.get('proxies')
-
-        try:
-            jobID = self.requestSolve(site_url, site_key)
-            return self.requestJob(jobID)
-        except polling.TimeoutException:
-            raise reCaptchaTimeout(
-                "9kw: reCaptcha solve took to long to execute 'captchaid' {}, aborting.".format(jobID)
-            )
-
-# ------------------------------------------------------------------------------- #
-
-
-captchaSolver()
@@ -1,46 +0,0 @@
-import abc
-import logging
-import sys
-
-if sys.version_info >= (3, 4):
-    ABC = abc.ABC  # noqa
-else:
-    ABC = abc.ABCMeta('ABC', (), {})
-
-# ------------------------------------------------------------------------------- #
-
-captchaSolvers = {}
-
-# ------------------------------------------------------------------------------- #
-
-
-class reCaptcha(ABC):
-    @abc.abstractmethod
-    def __init__(self, name):
-        captchaSolvers[name] = self
-
-    # ------------------------------------------------------------------------------- #
-
-    @classmethod
-    def dynamicImport(cls, name):
-        if name not in captchaSolvers:
-            try:
-                __import__('{}.{}'.format(cls.__module__, name))
-                if not isinstance(captchaSolvers.get(name), reCaptcha):
-                    raise ImportError('The anti reCaptcha provider was not initialized.')
-            except ImportError:
-                logging.error("Unable to load {} anti reCaptcha provider".format(name))
-                raise
-
-        return captchaSolvers[name]
-
-    # ------------------------------------------------------------------------------- #
-
-    @abc.abstractmethod
-    def getCaptchaAnswer(self, site_url, site_key, reCaptchaParams):
-        pass
-
-    # ------------------------------------------------------------------------------- #
-
-    def solveCaptcha(self, site_url, site_key, reCaptchaParams):
-        return self.getCaptchaAnswer(site_url, site_key, reCaptchaParams)
@@ -1,49 +0,0 @@
-from __future__ import absolute_import
-
-from ..exceptions import reCaptchaParameter
-
-try:
-    from python_anticaptcha import (
-        AnticaptchaClient,
-        NoCaptchaTaskProxylessTask
-    )
-except ImportError:
-    raise ImportError(
-        "Please install the python module 'python_anticaptcha' via pip or download it from "
-        "https://github.com/ad-m/python-anticaptcha"
-    )
-
-from . import reCaptcha
-
-
-class captchaSolver(reCaptcha):
-
-    def __init__(self):
-        super(captchaSolver, self).__init__('anticaptcha')
-
-    # ------------------------------------------------------------------------------- #
-
-    def getCaptchaAnswer(self, site_url, site_key, reCaptchaParams):
-        if not reCaptchaParams.get('api_key'):
-            raise reCaptchaParameter("anticaptcha: Missing api_key parameter.")
-
-        client = AnticaptchaClient(reCaptchaParams.get('api_key'))
-
-        if reCaptchaParams.get('proxy'):
-            client.session.proxies = reCaptchaParams.get('proxies')
-
-        task = NoCaptchaTaskProxylessTask(site_url, site_key)
-
-        if not hasattr(client, 'createTaskSmee'):
-            raise NotImplementedError(
-                "Please upgrade 'python_anticaptcha' via pip or download it from "
-                "https://github.com/ad-m/python-anticaptcha"
-            )
-
-        job = client.createTaskSmee(task)
-        return job.get_solution_response()
-
-
-# ------------------------------------------------------------------------------- #
-
-captchaSolver()
@@ -1,227 +0,0 @@
-from __future__ import absolute_import
-
-import json
-import requests
-
-try:
-    import polling
-except ImportError:
-    raise ImportError(
-        "Please install the python module 'polling' via pip or download it from "
-        "https://github.com/justiniso/polling/"
-    )
-
-from ..exceptions import (
-    reCaptchaServiceUnavailable,
-    reCaptchaAccountError,
-    reCaptchaTimeout,
-    reCaptchaParameter,
-    reCaptchaBadJobID,
-    reCaptchaReportError
-)
-
-from . import reCaptcha
-
-
-class captchaSolver(reCaptcha):
-
-    def __init__(self):
-        super(captchaSolver, self).__init__('deathbycaptcha')
-        self.host = 'http://api.dbcapi.me/api'
-        self.session = requests.Session()
-
-    # ------------------------------------------------------------------------------- #
-
-    @staticmethod
-    def checkErrorStatus(response):
-        errors = dict(
-            [
-                (400, "DeathByCaptcha: 400 Bad Request"),
-                (403, "DeathByCaptcha: 403 Forbidden - Invalid credentails or insufficient credits."),
-                # (500, "DeathByCaptcha: 500 Internal Server Error."),
-                (503, "DeathByCaptcha: 503 Service Temporarily Unavailable.")
-            ]
-        )
-
-        if response.status_code in errors:
-            raise reCaptchaServiceUnavailable(errors.get(response.status_code))
-
-    # ------------------------------------------------------------------------------- #
-
-    def login(self, username, password):
-        self.username = username
-        self.password = password
-
-        def _checkRequest(response):
-            if response.ok:
-                if response.json().get('is_banned'):
-                    raise reCaptchaAccountError('DeathByCaptcha: Your account is banned.')
-
-                if response.json().get('balanace') == 0:
-                    raise reCaptchaAccountError('DeathByCaptcha: insufficient credits.')
-
-                return response
-
-            self.checkErrorStatus(response)
-
-            return None
-
-        response = polling.poll(
-            lambda: self.session.post(
-                '{}/user'.format(self.host),
-                headers={'Accept': 'application/json'},
-                data={
-                    'username': self.username,
-                    'password': self.password
-                }
-            ),
-            check_success=_checkRequest,
-            step=10,
-            timeout=120
-        )
-
-        self.debugRequest(response)
-
-    # ------------------------------------------------------------------------------- #
-
-    def reportJob(self, jobID):
-        if not jobID:
-            raise reCaptchaBadJobID(
-                "DeathByCaptcha: Error bad job id to report failed reCaptcha."
-            )
-
-        def _checkRequest(response):
-            if response.status_code == 200:
-                return response
-
-            self.checkErrorStatus(response)
-
-            return None
-
-        response = polling.poll(
-            lambda: self.session.post(
-                '{}/captcha/{}/report'.format(self.host, jobID),
-                headers={'Accept': 'application/json'},
-                data={
-                    'username': self.username,
-                    'password': self.password
-                }
-            ),
-            check_success=_checkRequest,
-            step=10,
-            timeout=180
-        )
-
-        if response:
-            return True
-        else:
-            raise reCaptchaReportError(
-                "DeathByCaptcha: Error report failed reCaptcha."
-            )
-
-    # ------------------------------------------------------------------------------- #
-
-    def requestJob(self, jobID):
-        if not jobID:
-            raise reCaptchaBadJobID(
-                "DeathByCaptcha: Error bad job id to request reCaptcha."
-            )
-
-        def _checkRequest(response):
-            if response.ok and response.json().get('text'):
-                return response
-
-            self.checkErrorStatus(response)
-
-            return None
-
-        response = polling.poll(
-            lambda: self.session.get(
-                '{}/captcha/{}'.format(self.host, jobID),
-                headers={'Accept': 'application/json'}
-            ),
-            check_success=_checkRequest,
-            step=10,
-            timeout=180
-        )
-
-        if response:
-            return response.json().get('text')
-        else:
-            raise reCaptchaTimeout(
-                "DeathByCaptcha: Error failed to solve reCaptcha."
-            )
-
-    # ------------------------------------------------------------------------------- #
-
-    def requestSolve(self, site_url, site_key):
-        def _checkRequest(response):
-            if response.ok and response.json().get("is_correct") and response.json().get('captcha'):
-                return response
-
-            self.checkErrorStatus(response)
-
-            return None
-
-        response = polling.poll(
-            lambda: self.session.post(
-                '{}/captcha'.format(self.host),
-                headers={'Accept': 'application/json'},
-                data={
-                    'username': self.username,
-                    'password': self.password,
-                    'type': '4',
-                    'token_params': json.dumps({
-                        'googlekey': site_key,
-                        'pageurl': site_url
-                    })
-                },
-                allow_redirects=False
-            ),
-            check_success=_checkRequest,
-            step=10,
-            timeout=180
-        )
-
-        if response:
-            return response.json().get('captcha')
-        else:
-            raise reCaptchaBadJobID(
-                'DeathByCaptcha: Error no job id was returned.'
-            )
-
-    # ------------------------------------------------------------------------------- #
-
-    def getCaptchaAnswer(self, site_url, site_key, reCaptchaParams):
-        jobID = None
-
-        for param in ['username', 'password']:
-            if not reCaptchaParams.get(param):
-                raise reCaptchaParameter(
-                    "DeathByCaptcha: Missing '{}' parameter.".format(param)
-                )
-            setattr(self, param, reCaptchaParams.get(param))
-
-        if reCaptchaParams.get('proxy'):
-            self.session.proxies = reCaptchaParams.get('proxies')
-
-        try:
-            jobID = self.requestSolve(site_url, site_key)
-            return self.requestJob(jobID)
-        except polling.TimeoutException:
-            try:
-                if jobID:
-                    self.reportJob(jobID)
-            except polling.TimeoutException:
-                raise reCaptchaTimeout(
-                    "DeathByCaptcha: reCaptcha solve took to long and also failed reporting the job id {}.".format(jobID)
-                )
-
-            raise reCaptchaTimeout(
-                "DeathByCaptcha: reCaptcha solve took to long to execute job id {}, aborting.".format(jobID)
-            )
-
-
-# ------------------------------------------------------------------------------- #
-
-captchaSolver()
@@ -1,117 +1,40 @@
-import json
 import os
+import json
 import random
-import re
-import sys
-import ssl
+import logging

 from collections import OrderedDict

-# ------------------------------------------------------------------------------- #
+##########################################################################################################################################################


 class User_Agent():

-    # ------------------------------------------------------------------------------- #
+    ##########################################################################################################################################################

    def __init__(self, *args, **kwargs):
        self.headers = None
-        self.cipherSuite = []
        self.loadUserAgent(*args, **kwargs)

-    # ------------------------------------------------------------------------------- #
-
-    def loadHeaders(self, user_agents, user_agent_version):
-        if user_agents.get(self.browser).get('releases').get(user_agent_version).get('headers'):
-            self.headers = user_agents.get(self.browser).get('releases').get(user_agent_version).get('headers')
-        else:
-            self.headers = user_agents.get(self.browser).get('default_headers')
-
-    # ------------------------------------------------------------------------------- #
-
-    def filterAgents(self, releases):
-        filtered = {}
-
-        for release in releases:
-            if self.mobile and releases[release]['User-Agent']['mobile']:
-                filtered[release] = filtered.get(release, []) + releases[release]['User-Agent']['mobile']
-
-            if self.desktop and releases[release]['User-Agent']['desktop']:
-                filtered[release] = filtered.get(release, []) + releases[release]['User-Agent']['desktop']
-
-        return filtered
-
-    # ------------------------------------------------------------------------------- #
-
-    def tryMatchCustom(self, user_agents):
-        for browser in user_agents:
-            for release in user_agents[browser]['releases']:
-                for platform in ['mobile', 'desktop']:
-                    if re.search(re.escape(self.custom), ' '.join(user_agents[browser]['releases'][release]['User-Agent'][platform])):
-                        self.browser = browser
-                        self.loadHeaders(user_agents, release)
-                        self.headers['User-Agent'] = self.custom
-                        self.cipherSuite = user_agents[self.browser].get('cipherSuite', [])
-                        return True
-        return False
-
-    # ------------------------------------------------------------------------------- #
+    ##########################################################################################################################################################

    def loadUserAgent(self, *args, **kwargs):
-        self.browser = kwargs.pop('browser', None)
+        browser = kwargs.pop('browser', 'chrome')

-        if isinstance(self.browser, dict):
-            self.custom = self.browser.get('custom', None)
-            self.desktop = self.browser.get('desktop', True)
-            self.mobile = self.browser.get('mobile', True)
-            self.browser = self.browser.get('browser', None)
-        else:
-            self.custom = kwargs.pop('custom', None)
-            self.desktop = kwargs.pop('desktop', True)
-            self.mobile = kwargs.pop('mobile', True)
+        user_agents = json.load(
+            open(os.path.join(os.path.dirname(__file__), 'browsers.json'), 'r'),
+            object_pairs_hook=OrderedDict
+        )

-        if not self.desktop and not self.mobile:
-            sys.tracebacklimit = 0
-            raise RuntimeError("Sorry you can't have mobile and desktop disabled at the same time.")
+        if not user_agents.get(browser):
+            logging.error('Sorry "{}" browser User-Agent was not found.'.format(browser))
+            raise

-        with open(os.path.join(os.path.dirname(__file__), 'browsers.json'), 'r') as fp:
-            user_agents = json.load(
-                fp,
-                object_pairs_hook=OrderedDict
-            )
+        user_agent = random.choice(user_agents.get(browser))

-        if self.custom:
-            if not self.tryMatchCustom(user_agents):
-                self.cipherSuite = [
-                    ssl._DEFAULT_CIPHERS,
-                    '!AES128-SHA',
-                    '!ECDHE-RSA-AES256-SHA',
-                ]
-                self.headers = OrderedDict([
-                    ('User-Agent', self.custom),
-                    ('Accept', 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8'),
-                    ('Accept-Language', 'en-US,en;q=0.9'),
-                    ('Accept-Encoding', 'gzip, deflate, br')
-                ])
-        else:
-            if self.browser and not user_agents.get(self.browser):
-                sys.tracebacklimit = 0
-                raise RuntimeError('Sorry "{}" browser User-Agent was not found.'.format(self.browser))
+        self.headers = user_agent.get('headers')
+        self.headers['User-Agent'] = random.choice(user_agent.get('User-Agent'))

-            if not self.browser:
-                self.browser = random.SystemRandom().choice(list(user_agents))
-
-            self.cipherSuite = user_agents.get(self.browser).get('cipherSuite', [])
-
-            filteredAgents = self.filterAgents(user_agents.get(self.browser).get('releases'))
-
-            user_agent_version = random.SystemRandom().choice(list(filteredAgents))
-
-            self.loadHeaders(user_agents, user_agent_version)
-
-            self.headers['User-Agent'] = random.SystemRandom().choice(filteredAgents[user_agent_version])
-
-        if not kwargs.get('allow_brotli', False) and 'br' in self.headers['Accept-Encoding']:
-            self.headers['Accept-Encoding'] = ','.join([
-                encoding for encoding in self.headers['Accept-Encoding'].split(',') if encoding.strip() != 'br'
-            ]).strip()
+        if not kwargs.get('allow_brotli', False):
+            if 'br' in self.headers['Accept-Encoding']:
+                self.headers['Accept-Encoding'] = ','.join([encoding for encoding in self.headers['Accept-Encoding'].split(',') if encoding.strip() != 'br']).strip()
@@ -108,10 +108,12 @@ class SZProviderPool(ProviderPool):
        try:
            logger.info('Terminating provider %s', name)
            self.initialized_providers[name].terminate()
-        except (requests.Timeout, socket.timeout):
+        except (requests.Timeout, socket.timeout) as e:
            logger.error('Provider %r timed out, improperly terminated', name)
-        except:
+            self.throttle_callback(name, e)
+        except Exception as e:
            logger.exception('Provider %r terminated unexpectedly', name)
+            self.throttle_callback(name, e)

        del self.initialized_providers[name]

@@ -183,8 +185,9 @@ class SZProviderPool(ProviderPool):

            return out

-        except (requests.Timeout, socket.timeout):
-            logger.error('Provider %r timed out', provider)
+        except (requests.Timeout, socket.timeout) as e:
+            logger.exception('Provider %r timed out', provider)
+            self.throttle_callback(provider, e)

        except Exception as e:
            logger.exception('Unexpected error in provider %r: %s', provider, traceback.format_exc())
@@ -263,10 +266,11 @@ class SZProviderPool(ProviderPool):
                    requests.exceptions.ProxyError,
                    requests.exceptions.SSLError,
                    requests.Timeout,
-                    socket.timeout):
+                    socket.timeout) as e:
                logger.exception('Provider %r connection error', subtitle.provider_name)
+                self.throttle_callback(subtitle.provider_name, e)

-            except ResponseNotReady:
+            except ResponseNotReady as e:
                logger.error('Provider %r response error, reinitializing', subtitle.provider_name)
                try:
                    self[subtitle.provider_name].terminate()
@@ -274,6 +278,7 @@ class SZProviderPool(ProviderPool):
                except:
                    logger.error('Provider %r reinitialization error: %s', subtitle.provider_name,
                                 traceback.format_exc())
+                    self.throttle_callback(subtitle.provider_name, e)

            except rarfile.BadRarFile:
                logger.error('Malformed RAR file from provider %r, skipping subtitle.', subtitle.provider_name)
@@ -20,7 +20,7 @@ from exceptions import APIThrottled
 from dogpile.cache.api import NO_VALUE
 from subliminal.cache import region
 from subliminal_patch.pitcher import pitchers
-from cloudscraper import CloudScraper, User_Agent
+from cloudscraper import CloudScraper

 try:
    import brotli
@@ -35,12 +35,8 @@ except ImportError:
 from subzero.lib.io import get_viable_encoding

 logger = logging.getLogger(__name__)
-pem_file = os.path.normpath(os.path.join(os.path.dirname(os.path.realpath(unicode(__file__, get_viable_encoding()))), "..", certifi.where()))
-try:
-    default_ssl_context = ssl.create_default_context(cafile=pem_file)
-except AttributeError:
-    # < Python 2.7.9
-    default_ssl_context = None
+pem_file = os.path.normpath(os.path.join(os.path.dirname(os.path.realpath(unicode(__file__, get_viable_encoding()))),
+                                         "..", certifi.where()))


 class TimeoutSession(requests.Session):
@@ -58,9 +54,9 @@ class TimeoutSession(requests.Session):


 class CertifiSession(TimeoutSession):
-    def __init__(self):
+    def __init__(self, verify=None):
        super(CertifiSession, self).__init__()
-        self.verify = pem_file
+        self.verify = verify or pem_file


 class NeedsCaptchaException(Exception):
@@ -89,9 +85,7 @@ class CFSession(CloudScraper):

        # Check if Cloudflare anti-bot is on
        try:
-            print repr(resp)
-            if self.is_IUAM_Challenge(resp):
-                print "TRYYYYYYYYYY"
+            if self.isChallengeRequest(resp):
                if resp.request.method != 'GET':
                    # Work around if the initial request is not a GET,
                    # Supersede with a GET then re-request the original METHOD.
@@ -99,10 +93,9 @@ class CFSession(CloudScraper):
                    resp = ourSuper.request(method, url, *args, **kwargs)
                else:
                    # Solve Challenge
-                    resp = self.Challenge_Response(resp, **kwargs)
+                    resp = self.sendChallengeResponse(resp, **kwargs)

        except ValueError, e:
-            print "YEEEEEEEEEEEEEE"
            if e.message == "Captcha":
                parsed_url = urlparse(url)
                domain = parsed_url.netloc
@@ -19,11 +19,11 @@ class DroneAPIClient(object):
    _fill_attrs = None

    def __init__(self, version=1, session=None, headers=None, timeout=10, base_url=None, api_key=None,
-                 ssl_no_verify=False):
+                 ssl_no_verify=False, pem_file=None):
        headers = dict(headers or {}, **{"X-Api-Key": api_key})

        #: Session for the requests
-        self.session = session or CertifiSession()
+        self.session = session or CertifiSession(verify=pem_file)
        if ssl_no_verify:
            self.session.verify = False

@@ -21,7 +21,7 @@ if debug:
    logging.basicConfig(level=logging.DEBUG)

 #sub = Subtitle(Language.fromietf("eng:forced"), mods=["common", "remove_HI", "OCR_fixes", "fix_uppercase", "shift_offset(ms=-500)", "shift_offset(ms=500)", "shift_offset(s=2,ms=800)"])
-sub = Subtitle(Language.fromietf("eng"), mods=["common", "remove_HI", "OCR_fixes", "fix_uppercase", "shift_offset(ms=0,s=1)"])
+sub = Subtitle(Language.fromietf("eng"), mods=["common", "remove_HI", "OCR_fixes", "fix_uppercase", "shift_offset(ms=0,s=1)", "fix_incremental", "fix_short"])
 sub.content = open(fn).read()
 sub.normalize()
 sub.is_valid()
@@ -1,6 +1,8 @@
 # coding=utf-8

 import re
+import logging
+from collections import OrderedDict

 from subzero.language import Language
 from subzero.modification.mods import SubtitleTextModification, empty_line_post_processors, SubtitleModification
@@ -9,7 +11,7 @@ from subzero.modification.processors.re_processor import NReProcessor
 from subzero.modification import registry
 from tld import get_tld

-
+logger = logging.getLogger(__name__)
 ENGLISH = Language("eng")


@@ -181,7 +183,104 @@ class FixUppercase(SubtitleModification):
            entry.plaintext = self.capitalize(entry.plaintext)


+class FixIncremental(SubtitleModification):
+    identifier = "fix_incremental"
+    description = "Fixes inremental-repeating subtitles"
+    modifies_whole_file = True
+    exclusive = True
+
+    long_description = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+
+    def modify(self, content, debug=False, parent=None, **kwargs):
+        prev_entry = None
+        for entry in parent.f:
+            subs = []
+            for sub in entry.text.split("\N"):
+                if prev_entry and prev_entry.text and prev_entry.text.lower().endswith(sub.lower()):
+                    if debug:
+                        logger.debug(u"Skipping incremental/dup: %s" % sub)
+                    continue
+                subs.append(sub)
+
+            if subs:
+                entry.text = "\N".join(subs)
+
+            prev_entry = entry
+
+
+
+class FixShort(SubtitleModification):
+    identifier = "fix_short"
+    description = "ASDasdasdasdasdd"
+    modifies_whole_file = True
+    exclusive = True
+
+    long_description = "adsadsdasdsadsa"
+
+    def modify(self, content, debug=False, parent=None, **kwargs):
+        prev_entry = None
+        prev_entry_dur = None
+        max_duration = 500
+        max_line_len = 200
+        max_lines = 3
+        entries = []
+        last_lines = []
+        for index, entry in enumerate(parent.f):
+            current_new_lines = []
+            if not last_lines and parent.f[index-1]:
+                print "YOO"
+                # find last lines
+                last_lines = parent.f[index-1].text.split("\N")
+            has_space = len(last_lines) < max_lines
+            last_line = ""
+            # go through each line and pack them
+            for line in entry.text.split("\N"):
+                new_line = ""
+                if line:
+                    if last_line != line and last_line and len(last_line + line) <= max_line_len:
+                        # new line plus line fits
+                        if re.match(".+\W$", line):
+                            if last_line.endswith(" "):
+                                new_line = last_line + line
+                            else:
+                                new_line = last_line + " " + line
+                            logger.debug("MERGING '%s' with '%s' to '%s'", last_line, line, new_line)
+                    else:
+                        new_line = line
+                last_line = new_line
+                current_new_lines.append(new_line)
+
+            # merge entries
+            if prev_entry:
+                #print prev_entry.duration, max_duration, len(new_lines), max_lines
+                if prev_entry.duration < max_duration and len(current_new_lines) < max_lines:
+                    #len(prev_entry.text) < max_len
+                    print "HIT", prev_entry.text, " + ", entry.text
+                    entry_text = prev_entry.text + "\N" + "\N".join(current_new_lines)
+
+                else:
+                    entry_text = "\N".join(current_new_lines)
+            else:
+                entry_text = "\N".join(current_new_lines)
+
+            #prev_entry = entry.copy()
+            if not prev_entry:
+                prev_entry = entry.copy()
+                continue
+            new_entry = prev_entry.copy()
+            new_entry.text = entry_text
+            prev_entry = new_entry.copy()
+            entries.append(new_entry)
+            #new_entries.append(entry.copy())
+
+        parent.f.entries = entries
+
+
+
+
 registry.register(CommonFixes)
 registry.register(RemoveTags)
 registry.register(ReverseRTL)
 registry.register(FixUppercase)
+registry.register(FixIncremental)
+registry.register(FixShort)
@@ -22,7 +22,7 @@ Don't expect support if you mess this up.
    // when the find better subtitles task finds a subtitle for an item that has an active extracted embedded subtitle
    // set, what should be the minimum score that subtitle has to have in order to be considered better?
    "find_better_as_extracted_tv_score": 352,
-    "find_better_as_extracted_movie_score": 82,
+    "find_better_as_extracted_movie_score": 112,

    // SZ can use mediainfo if present to detect titles/forced state of MP4 MOV_TEXT, because the PMS currently doesn't
    // set the title attribute
@@ -85,9 +85,12 @@ Don't expect support if you mess this up.
        "sonarr": {
            // don't verify HTTPS certificates? Set to True for self-signed certificates
            "ssl_no_verify": false,
+            // custom path to certificate pem file
+            "pem_file": None,
        },
        "radarr": {
            "ssl_no_verify": false,
+            "pem_file": None,
        },
    }
 }
@@ -94,6 +94,34 @@ the.vbm, mmgoodnow, Vertig0ne, thliu78, tattoomees, ostman, count_confucius, ehe

 ## Changelog

+2.6.5.3247
+
+subscene, addic7ed
+- either of those providers might impose a reCAPTCHA verification. In order to use those providers, please create an account at an AntiCaptcha service ([anti-captcha.com](http://getcaptchasolution.com/kkvviom7nh) or [deathbycaptcha.com](http://deathbycaptcha.com)), add funds, then supply your credentials/apikey in the configuration
+
+Changelog
+core: fix for tv.plex.agents.movie not populating its media types
+core: tasks: findBetterSubtitles: increase minimum score for better subtitles for movies with extracted embedded subs from 82 to 112
+
+
+2.6.5.3241
+
+subscene, addic7ed
+- either of those providers might impose a reCAPTCHA verification. In order to use those providers, please create an account at an AntiCaptcha service ([anti-captcha.com](http://getcaptchasolution.com/kkvviom7nh) or [deathbycaptcha.com](http://deathbycaptcha.com)), add funds, then supply your credentials/apikey in the configuration
+
+Changelog
+- core: add support for new Plex Movie agent
+- core: remove py3 compat breaking unnecessary change
+- core: skip drawing tags for SRT
+- core: advanced_settings: refiners: drone: add custom pem_file support; fixes #735
+- providers: core: set DownloadLimitPerDayExceeded timeout to 4 hours (was one day);
+- providers: addic7ed: limit downloads per day; add vip setting
+- providers: addic7ed: properly compare last_dl, add last_reset tracking info to log #723
+- providers: addic7ed: properly implement limits
+- submod: HI: remove more music tags
+- submod: common CM_punctuation_space2: detect AND don't try changing domain/url/host when fixing punctuation
+
+
 2.6.5.3223

 subscene, addic7ed
@@ -104,23 +132,6 @@ Changelog
 - providers: bsplayer: verify hash; clean up


-2.6.5.3217
-
-subscene, addic7ed
- either of those providers might impose a reCAPTCHA verification. In order to use those providers, please create an account at an AntiCaptcha service ([anti-captcha.com](http://getcaptchasolution.com/kkvviom7nh) or [deathbycaptcha.com](http://deathbycaptcha.com)), add funds, then supply your credentials/apikey in the configuration
-
-Changelog
- core: also extract (missing) embedded subtitles when SearchAllRecentlyAddedMissing is running
- core: core: clarify detecting streams (in logs)
- core: UnRAR: set binary to executable, even if not checked out from git; might fix #693
- core: bazarr-backport: morpheus65535/bazarr#703: use proper language code detection instead of a wild guess; should fix bad existing subtitle detection
- core: bazarr-backport: morpheus65535/bazarr#660: fix BOM encoding stuff
- core: bazarr-backport: morpheus65535/bazarr#656 further generalize formats; skip release group match if format match failed
- core: fix stream detection when using mediainfo (#711)
- config/core: make periodic SZ-internal subtitle maintenance interval configurable
- providers: add BSPlayer Subtitles
- providers: add ScrewZira (Hebrew)
-
 [older changes](CHANGELOG.md)
Author	SHA1	Message	Date
panni	cd9028354b	incremental tmp	2021-03-09 03:09:52 +01:00
panni	c77489a5be	the heat	2020-08-12 17:02:54 +02:00
panni	25f204b330	whoops, missed dev flag	2020-08-12 17:01:06 +02:00
panni	89dded387d	core: properly handle ReadTimeout	2020-08-12 16:09:53 +02:00
panni	a9b677f0ce	core: catch more exceptions	2020-08-08 03:46:57 +02:00
panni	6b918be799	release 2.6.5.3247	2020-07-26 03:12:35 +02:00
panni	f259682391	core: findBetterSubtitles: increase minimum score for better subtitles for movies with extracted embedded subs from 82 to 112	2020-07-26 03:08:46 +02:00
panni	8a059c988e	core: findBetterSubtitles: increase minimum score for better subtitles for movies with extracted embedded subs from 82 to 112	2020-07-26 03:07:04 +02:00
panni	8512940ccf	core: fix for tv.plex.agents.movie not populating its media types	2020-07-26 02:54:28 +02:00
panni	de2b11f69a	back to dev	2020-07-25 05:56:40 +02:00
panni	df1fba83a8	release 2.6.5.3241	2020-07-25 05:53:12 +02:00
panni	d98ae74c8a	2.6.5.3241	2020-07-25 05:51:09 +02:00
panni	6484646122	advanced_settings: refiners: drone: add custom pem_file support; fixes #735	2020-07-25 05:22:57 +02:00
panni	52bac14a2e	core: remove old remnants; core: update certifi to 2020.6.20	2020-07-25 05:08:51 +02:00
panni	0be589bc5f	add support for new Plex Movie agent	2020-07-25 05:01:12 +02:00