Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cfscrape to version 1.9.7 #6391

Merged
merged 3 commits into from
Mar 20, 2019
Merged

Update cfscrape to version 1.9.7 #6391

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
478b08f
Update cfscrape to version 1.9.7
medariox Mar 20, 2019
c4bde39
Update requirements.txt
medariox Mar 20, 2019
222bb44
Update readme.md
medariox Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ext/cfscrape/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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<s_value>[^"]+)', body).group('s_value')

# Extract the arithmetic operation
js = self.extract_js(body, domain)
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down