From 478b08f0355eac669127ef5b4435553fa6e300bb Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 20 Mar 2019 23:28:28 +0100 Subject: [PATCH 1/3] Update cfscrape to version 1.9.7 --- ext/cfscrape/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/cfscrape/__init__.py b/ext/cfscrape/__init__.py index df41149040..7d6866bfc3 100644 --- a/ext/cfscrape/__init__.py +++ b/ext/cfscrape/__init__.py @@ -16,7 +16,7 @@ # Disallow parsing of the unsafe 'pyimport' statement in Js2Py. js2py.disable_pyimport() -__version__ = "1.9.6-Custom" +__version__ = "1.9.7-Custom" DEFAULT_USER_AGENTS = [ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36", @@ -88,6 +88,7 @@ def solve_cf_challenge(self, resp, **original_kwargs): try: params["jschl_vc"] = re.search(r'name="jschl_vc" value="(\w+)"', body).group(1) params["pass"] = re.search(r'name="pass" value="(.+?)"', body).group(1) + params["s"] = re.search(r'name="s"\svalue="(?P[^"]+)', body).group('s_value') # Extract the arithmetic operation js = self.extract_js(body, domain) From c4bde392a9a471008a61ccb5411e42e63e2b2223 Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 20 Mar 2019 23:31:23 +0100 Subject: [PATCH 2/3] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3d2950ff06..f2379c9493 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ bencode.py==2.0.0 CacheControl==0.12.5 certifi==2019.3.9 chardet==3.0.4 -git+https://github.com/pymedusa/cloudflare-scrape.git@2a5af1d4928b70f0cf1640564d618be51cf22332#egg=cfscrape +git+https://github.com/pymedusa/cloudflare-scrape.git@1354751d5efd9353ad837d83941ed6b3f4488c77#egg=cfscrape configobj==5.0.6 configparser==3.7.3 contextlib2==0.5.5 ; python_version < '3.5' From 222bb44ccc5efa8e8f1b882fde805f192f460a70 Mon Sep 17 00:00:00 2001 From: Dario Date: Wed, 20 Mar 2019 23:34:28 +0100 Subject: [PATCH 3/3] Update readme.md --- ext/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/readme.md b/ext/readme.md index 323cdc3fa3..e0810cd7cf 100644 --- a/ext/readme.md +++ b/ext/readme.md @@ -13,7 +13,7 @@ :: | `CacheControl` | [0.12.5](https://pypi.org/project/CacheControl/0.12.5/) | **`medusa`** | ext | Module: `cachecontrol` :: | `certifi` | [2019.3.9](https://pypi.org/project/certifi/2019.3.9/) | **`medusa`**, `traktor`, `requests` | ext | - :: | `chardet` | [3.0.4](https://pypi.org/project/chardet/3.0.4/) | **`medusa`**, `beautifulsoup4`, `feedparser`, `html5lib`, `pysrt`, `requests`, `subliminal` | ext | - -:: | `cloudflare-scrape` | pymedusa/[2a5af1d](https://github.com/pymedusa/cloudflare-scrape/tree/2a5af1d4928b70f0cf1640564d618be51cf22332) | **`medusa`** | ext | Module: `cfscrape` +:: | `cloudflare-scrape` | pymedusa/[1354751](https://github.com/pymedusa/cloudflare-scrape/tree/1354751d5efd9353ad837d83941ed6b3f4488c77) | **`medusa`** | ext | Module: `cfscrape` :: | configobj.py
`validate.py`
`_version.py` | [5.0.6](https://pypi.org/project/configobj/5.0.6/) | **`medusa`** | ext | - :: | configparser.py
`backports.configparser` | [3.7.3](https://pypi.org/project/configparser/3.7.3/) | `adba` | **ext2** | - :: | contextlib2.py | [0.5.5](https://pypi.org/project/contextlib2/0.5.5/) | **`medusa`**, `tvdbapiv2` | ext | Markers: `python_version < '3.5'`