Hello community,
here is the log from the commit of package python-cfscrape for openSUSE:Factory
checked in at 2019-06-14 20:42:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-cfscrape (Old)
and /work/SRC/openSUSE:Factory/.python-cfscrape.new.4811 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cfscrape"
Fri Jun 14 20:42:31 2019 rev:6 rq:709817 version:2.0.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-cfscrape/python-cfscrape.changes
2019-05-16 22:08:03.046391087 +0200
+++
/work/SRC/openSUSE:Factory/.python-cfscrape.new.4811/python-cfscrape.changes
2019-06-14 20:42:33.074377504 +0200
@@ -1,0 +2,6 @@
+Mon Jun 3 14:10:41 UTC 2019 - Martin Herkt <[email protected]>
+
+- Update to 2.0.7
+ * Enable HTTPS adapter by default
+
+-------------------------------------------------------------------
Old:
----
cloudflare-scrape-2.0.4.tar.gz
New:
----
cloudflare-scrape-2.0.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cfscrape.spec ++++++
--- /var/tmp/diff_new_pack.VuwL1K/_old 2019-06-14 20:42:33.546376703 +0200
+++ /var/tmp/diff_new_pack.VuwL1K/_new 2019-06-14 20:42:33.546376703 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-cfscrape
-Version: 2.0.4
+Version: 2.0.7
Release: 0
Summary: Python module to bypass Cloudflare's anti-bot page
License: MIT
++++++ cloudflare-scrape-2.0.4.tar.gz -> cloudflare-scrape-2.0.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/.coveragerc
new/cloudflare-scrape-2.0.7/.coveragerc
--- old/cloudflare-scrape-2.0.4/.coveragerc 1970-01-01 01:00:00.000000000
+0100
+++ new/cloudflare-scrape-2.0.7/.coveragerc 2019-06-03 13:25:13.000000000
+0200
@@ -0,0 +1,4 @@
+[run]
+source = cfscrape
+omit =
+ *test*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/.gitignore
new/cloudflare-scrape-2.0.7/.gitignore
--- old/cloudflare-scrape-2.0.4/.gitignore 2019-05-15 07:27:00.000000000
+0200
+++ new/cloudflare-scrape-2.0.7/.gitignore 2019-06-03 13:25:13.000000000
+0200
@@ -22,3 +22,19 @@
*.egg-info/
.installed.cfg
*.egg
+
+# Tests / Coverage
+report.xml
+coverage.xml
+.coverage
+.tox/
+.testmondata
+
+# IDE
+.idea/
+
+# Prevent unintended commits
+.env
+
+# Temp files
+*.swp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/.travis.yml
new/cloudflare-scrape-2.0.7/.travis.yml
--- old/cloudflare-scrape-2.0.4/.travis.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/cloudflare-scrape-2.0.7/.travis.yml 2019-06-03 13:25:13.000000000
+0200
@@ -0,0 +1,24 @@
+language: python
+
+dist: trusty
+sudo: false
+
+matrix:
+ include:
+ - python: '2.7'
+ - python: '3.4'
+ - python: '3.5'
+ - python: '3.6'
+ - python: '3.7'
+ dist: xenial
+ sudo: true
+
+cache: pip
+
+install:
+ - node -e "console.log(process.versions);"
+ - make
+
+script: make ci
+
+after_success: make coverage
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/MANIFEST.in
new/cloudflare-scrape-2.0.7/MANIFEST.in
--- old/cloudflare-scrape-2.0.4/MANIFEST.in 2019-05-15 07:27:00.000000000
+0200
+++ new/cloudflare-scrape-2.0.7/MANIFEST.in 2019-06-03 13:25:13.000000000
+0200
@@ -1 +1 @@
-include LICENSE README.md cfscrape/user_agents.json
+include LICENSE README.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/Makefile
new/cloudflare-scrape-2.0.7/Makefile
--- old/cloudflare-scrape-2.0.4/Makefile 1970-01-01 01:00:00.000000000
+0100
+++ new/cloudflare-scrape-2.0.7/Makefile 2019-06-03 13:25:13.000000000
+0200
@@ -0,0 +1,37 @@
+pep8-rules := E501,W503,W504
+
+init:
+ pip install pipenv -U
+ pipenv install --dev
+
+test:
+ # This runs all of the tests, on both Python 2 and Python 3.
+ pipenv run tox --parallel auto
+
+watch:
+ # This automatically selects and re-executes only tests affected by
recent changes.
+ pipenv run ptw -- --testmon
+
+retry:
+ # This will retry failed tests on every file change.
+ pipenv run py.test -n auto --forked --looponfail
+
+ci:
+ pipenv run py.test tests
+
+lint:
+ pipenv run flake8 --ignore $(pep8-rules) cfscrape tests setup.py
+
+format:
+ # Automatic reformatting
+ pipenv run autopep8 -aaa --ignore $(pep8-rules) --in-place --recursive
cfscrape tests setup.py
+
+coverage:
+ pipenv run py.test --cov-config .coveragerc --verbose --cov-report term
--cov-report xml --cov=cfscrape tests
+ pipenv run coveralls
+
+publish:
+ pip install 'twine>=1.5.0'
+ python setup.py sdist bdist_wheel
+ twine upload dist/*
+ rm -fr build dist .egg cfscrape.egg-info
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/Pipfile
new/cloudflare-scrape-2.0.7/Pipfile
--- old/cloudflare-scrape-2.0.4/Pipfile 1970-01-01 01:00:00.000000000 +0100
+++ new/cloudflare-scrape-2.0.7/Pipfile 2019-06-03 13:25:13.000000000 +0200
@@ -0,0 +1,25 @@
+[[source]]
+url = "https://pypi.org/simple/";
+verify_ssl = true
+name = "pypi"
+
+[packages]
+requests = "*"
+
+[dev-packages]
+pytest = "*"
+# more_itertools is added to resolve a CI related issue with Pipenv + pytest
+more_itertools = { version = ">=4.0.0", markers = "python_version >= '2.7'" }
+pytest-cov = "*"
+pytest-xdist = "*"
+pytest-forked = "*"
+pytest-testmon = "*"
+pytest-watch = "*"
+pytest-timeout = "*"
+responses = "*"
+sure = "*"
+"flake8" = "*"
+"autopep8" = "*"
+tox = "*"
+coverage = "*"
+coveralls = "*"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/Pipfile.lock
new/cloudflare-scrape-2.0.7/Pipfile.lock
--- old/cloudflare-scrape-2.0.4/Pipfile.lock 1970-01-01 01:00:00.000000000
+0100
+++ new/cloudflare-scrape-2.0.7/Pipfile.lock 2019-06-03 13:25:13.000000000
+0200
@@ -0,0 +1,560 @@
+{
+ "_meta": {
+ "hash": {
+ "sha256":
"a998a4d3507e5aa42cff1a7d37b30bb937d36690dbb22a27cc50ba1b25166e80"
+ },
+ "pipfile-spec": 6,
+ "requires": {},
+ "sources": [
+ {
+ "name": "pypi",
+ "url": "https://pypi.org/simple/";,
+ "verify_ssl": true
+ }
+ ]
+ },
+ "default": {
+ "certifi": {
+ "hashes": [
+
"sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5",
+
"sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae"
+ ],
+ "version": "==2019.3.9"
+ },
+ "chardet": {
+ "hashes": [
+
"sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
+
"sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
+ ],
+ "version": "==3.0.4"
+ },
+ "idna": {
+ "hashes": [
+
"sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
+
"sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
+ ],
+ "version": "==2.8"
+ },
+ "requests": {
+ "hashes": [
+
"sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e",
+
"sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"
+ ],
+ "index": "pypi",
+ "version": "==2.21.0"
+ },
+ "urllib3": {
+ "hashes": [
+
"sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4",
+
"sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb"
+ ],
+ "version": "==1.24.3"
+ }
+ },
+ "develop": {
+ "apipkg": {
+ "hashes": [
+
"sha256:37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6",
+
"sha256:58587dd4dc3daefad0487f6d9ae32b4542b185e1c36db6993290e7c41ca2b47c"
+ ],
+ "version": "==1.5"
+ },
+ "argh": {
+ "hashes": [
+
"sha256:a9b3aaa1904eeb78e32394cd46c6f37ac0fb4af6dc488daa58971bdc7d7fcaf3",
+
"sha256:e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65"
+ ],
+ "version": "==0.26.2"
+ },
+ "asn1crypto": {
+ "hashes": [
+
"sha256:2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87",
+
"sha256:9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49"
+ ],
+ "version": "==0.24.0"
+ },
+ "atomicwrites": {
+ "hashes": [
+
"sha256:03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4",
+
"sha256:75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6"
+ ],
+ "version": "==1.3.0"
+ },
+ "attrs": {
+ "hashes": [
+
"sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79",
+
"sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399"
+ ],
+ "version": "==19.1.0"
+ },
+ "autopep8": {
+ "hashes": [
+
"sha256:4d8eec30cc81bc5617dbf1218201d770dc35629363547f17577c61683ccfb3ee"
+ ],
+ "index": "pypi",
+ "version": "==1.4.4"
+ },
+ "certifi": {
+ "hashes": [
+
"sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5",
+
"sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae"
+ ],
+ "version": "==2019.3.9"
+ },
+ "cffi": {
+ "hashes": [
+
"sha256:041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774",
+
"sha256:046ef9a22f5d3eed06334d01b1e836977eeef500d9b78e9ef693f9380ad0b83d",
+
"sha256:066bc4c7895c91812eff46f4b1c285220947d4aa46fa0a2651ff85f2afae9c90",
+
"sha256:066c7ff148ae33040c01058662d6752fd73fbc8e64787229ea8498c7d7f4041b",
+
"sha256:2444d0c61f03dcd26dbf7600cf64354376ee579acad77aef459e34efcb438c63",
+
"sha256:300832850b8f7967e278870c5d51e3819b9aad8f0a2c8dbe39ab11f119237f45",
+
"sha256:34c77afe85b6b9e967bd8154e3855e847b70ca42043db6ad17f26899a3df1b25",
+
"sha256:46de5fa00f7ac09f020729148ff632819649b3e05a007d286242c4882f7b1dc3",
+
"sha256:4aa8ee7ba27c472d429b980c51e714a24f47ca296d53f4d7868075b175866f4b",
+
"sha256:4d0004eb4351e35ed950c14c11e734182591465a33e960a4ab5e8d4f04d72647",
+
"sha256:4e3d3f31a1e202b0f5a35ba3bc4eb41e2fc2b11c1eff38b362de710bcffb5016",
+
"sha256:50bec6d35e6b1aaeb17f7c4e2b9374ebf95a8975d57863546fa83e8d31bdb8c4",
+
"sha256:55cad9a6df1e2a1d62063f79d0881a414a906a6962bc160ac968cc03ed3efcfb",
+
"sha256:5662ad4e4e84f1eaa8efce5da695c5d2e229c563f9d5ce5b0113f71321bcf753",
+
"sha256:59b4dc008f98fc6ee2bb4fd7fc786a8d70000d058c2bbe2698275bc53a8d3fa7",
+
"sha256:73e1ffefe05e4ccd7bcea61af76f36077b914f92b76f95ccf00b0c1b9186f3f9",
+
"sha256:a1f0fd46eba2d71ce1589f7e50a9e2ffaeb739fb2c11e8192aa2b45d5f6cc41f",
+
"sha256:a2e85dc204556657661051ff4bab75a84e968669765c8a2cd425918699c3d0e8",
+
"sha256:a5457d47dfff24882a21492e5815f891c0ca35fefae8aa742c6c263dac16ef1f",
+
"sha256:a8dccd61d52a8dae4a825cdbb7735da530179fea472903eb871a5513b5abbfdc",
+
"sha256:ae61af521ed676cf16ae94f30fe202781a38d7178b6b4ab622e4eec8cefaff42",
+
"sha256:b012a5edb48288f77a63dba0840c92d0504aa215612da4541b7b42d849bc83a3",
+
"sha256:d2c5cfa536227f57f97c92ac30c8109688ace8fa4ac086d19d0af47d134e2909",
+
"sha256:d42b5796e20aacc9d15e66befb7a345454eef794fdb0737d1af593447c6c8f45",
+
"sha256:dee54f5d30d775f525894d67b1495625dd9322945e7fee00731952e0368ff42d",
+
"sha256:e070535507bd6aa07124258171be2ee8dfc19119c28ca94c9dfb7efd23564512",
+
"sha256:e1ff2748c84d97b065cc95429814cdba39bcbd77c9c85c89344b317dc0d9cbff",
+
"sha256:ed851c75d1e0e043cbf5ca9a8e1b13c4c90f3fbd863dacb01c0808e2b5204201"
+ ],
+ "version": "==1.12.3"
+ },
+ "chardet": {
+ "hashes": [
+
"sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae",
+
"sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"
+ ],
+ "version": "==3.0.4"
+ },
+ "colorama": {
+ "hashes": [
+
"sha256:05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d",
+
"sha256:f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48"
+ ],
+ "version": "==0.4.1"
+ },
+ "configparser": {
+ "hashes": [
+
"sha256:8be81d89d6e7b4c0d4e44bcc525845f6da25821de80cb5e06e7e0238a2899e32",
+
"sha256:da60d0014fd8c55eb48c1c5354352e363e2d30bbf7057e5e171a468390184c75"
+ ],
+ "markers": "python_version == '2.7'",
+ "version": "==3.7.4"
+ },
+ "cookies": {
+ "hashes": [
+
"sha256:15bee753002dff684987b8df8c235288eb8d45f8191ae056254812dfd42c81d3",
+
"sha256:d6b698788cae4cfa4e62ef8643a9ca332b79bd96cb314294b864ae8d7eb3ee8e"
+ ],
+ "markers": "python_version < '3.4'",
+ "version": "==2.2.1"
+ },
+ "coverage": {
+ "hashes": [
+
"sha256:3684fabf6b87a369017756b551cef29e505cb155ddb892a7a29277b978da88b9",
+
"sha256:39e088da9b284f1bd17c750ac672103779f7954ce6125fd4382134ac8d152d74",
+
"sha256:3c205bc11cc4fcc57b761c2da73b9b72a59f8d5ca89979afb0c1c6f9e53c7390",
+
"sha256:465ce53a8c0f3a7950dfb836438442f833cf6663d407f37d8c52fe7b6e56d7e8",
+
"sha256:48020e343fc40f72a442c8a1334284620f81295256a6b6ca6d8aa1350c763bbe",
+
"sha256:5296fc86ab612ec12394565c500b412a43b328b3907c0d14358950d06fd83baf",
+
"sha256:5f61bed2f7d9b6a9ab935150a6b23d7f84b8055524e7be7715b6513f3328138e",
+
"sha256:68a43a9f9f83693ce0414d17e019daee7ab3f7113a70c79a3dd4c2f704e4d741",
+
"sha256:6b8033d47fe22506856fe450470ccb1d8ba1ffb8463494a15cfc96392a288c09",
+
"sha256:7ad7536066b28863e5835e8cfeaa794b7fe352d99a8cded9f43d1161be8e9fbd",
+
"sha256:7bacb89ccf4bedb30b277e96e4cc68cd1369ca6841bde7b005191b54d3dd1034",
+
"sha256:839dc7c36501254e14331bcb98b27002aa415e4af7ea039d9009409b9d2d5420",
+
"sha256:8f9a95b66969cdea53ec992ecea5406c5bd99c9221f539bca1e8406b200ae98c",
+
"sha256:932c03d2d565f75961ba1d3cec41ddde00e162c5b46d03f7423edcb807734eab",
+
"sha256:988529edadc49039d205e0aa6ce049c5ccda4acb2d6c3c5c550c17e8c02c05ba",
+
"sha256:998d7e73548fe395eeb294495a04d38942edb66d1fa61eb70418871bc621227e",
+
"sha256:9de60893fb447d1e797f6bf08fdf0dbcda0c1e34c1b06c92bd3a363c0ea8c609",
+
"sha256:9e80d45d0c7fcee54e22771db7f1b0b126fb4a6c0a2e5afa72f66827207ff2f2",
+
"sha256:a545a3dfe5082dc8e8c3eb7f8a2cf4f2870902ff1860bd99b6198cfd1f9d1f49",
+
"sha256:a5d8f29e5ec661143621a8f4de51adfb300d7a476224156a39a392254f70687b",
+
"sha256:aca06bfba4759bbdb09bf52ebb15ae20268ee1f6747417837926fae990ebc41d",
+
"sha256:bb23b7a6fd666e551a3094ab896a57809e010059540ad20acbeec03a154224ce",
+
"sha256:bfd1d0ae7e292105f29d7deaa9d8f2916ed8553ab9d5f39ec65bcf5deadff3f9",
+
"sha256:c62ca0a38958f541a73cf86acdab020c2091631c137bd359c4f5bddde7b75fd4",
+
"sha256:c709d8bda72cf4cd348ccec2a4881f2c5848fd72903c185f363d361b2737f773",
+
"sha256:c968a6aa7e0b56ecbd28531ddf439c2ec103610d3e2bf3b75b813304f8cb7723",
+
"sha256:df785d8cb80539d0b55fd47183264b7002077859028dfe3070cf6359bf8b2d9c",
+
"sha256:f406628ca51e0ae90ae76ea8398677a921b36f0bd71aab2099dfed08abd0322f",
+
"sha256:f46087bbd95ebae244a0eda01a618aff11ec7a069b15a3ef8f6b520db523dcf1",
+
"sha256:f8019c5279eb32360ca03e9fac40a12667715546eed5c5eb59eb381f2f501260",
+
"sha256:fc5f4d209733750afd2714e9109816a29500718b32dd9a5db01c0cb3a019b96a"
+ ],
+ "index": "pypi",
+ "version": "==4.5.3"
+ },
+ "coveralls": {
+ "hashes": [
+
"sha256:baa26648430d5c2225ab12d7e2067f75597a4b967034bba7e3d5ab7501d207a1",
+
"sha256:ff9b7823b15070f26f654837bb02a201d006baaf2083e0514ffd3b34a3ffed81"
+ ],
+ "index": "pypi",
+ "version": "==1.7.0"
+ },
+ "cryptography": {
+ "hashes": [
+
"sha256:066f815f1fe46020877c5983a7e747ae140f517f1b09030ec098503575265ce1",
+
"sha256:210210d9df0afba9e000636e97810117dc55b7157c903a55716bb73e3ae07705",
+
"sha256:26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6",
+
"sha256:2afb83308dc5c5255149ff7d3fb9964f7c9ee3d59b603ec18ccf5b0a8852e2b1",
+
"sha256:2db34e5c45988f36f7a08a7ab2b69638994a8923853dec2d4af121f689c66dc8",
+
"sha256:409c4653e0f719fa78febcb71ac417076ae5e20160aec7270c91d009837b9151",
+
"sha256:45a4f4cf4f4e6a55c8128f8b76b4c057027b27d4c67e3fe157fa02f27e37830d",
+
"sha256:48eab46ef38faf1031e58dfcc9c3e71756a1108f4c9c966150b605d4a1a7f659",
+
"sha256:6b9e0ae298ab20d371fc26e2129fd683cfc0cfde4d157c6341722de645146537",
+
"sha256:6c4778afe50f413707f604828c1ad1ff81fadf6c110cb669579dea7e2e98a75e",
+
"sha256:8c33fb99025d353c9520141f8bc989c2134a1f76bac6369cea060812f5b5c2bb",
+
"sha256:9873a1760a274b620a135054b756f9f218fa61ca030e42df31b409f0fb738b6c",
+
"sha256:9b069768c627f3f5623b1cbd3248c5e7e92aec62f4c98827059eed7053138cc9",
+
"sha256:9e4ce27a507e4886efbd3c32d120db5089b906979a4debf1d5939ec01b9dd6c5",
+
"sha256:acb424eaca214cb08735f1a744eceb97d014de6530c1ea23beb86d9c6f13c2ad",
+
"sha256:c8181c7d77388fe26ab8418bb088b1a1ef5fde058c6926790c8a0a3d94075a4a",
+
"sha256:d4afbb0840f489b60f5a580a41a1b9c3622e08ecb5eec8614d4fb4cd914c4460",
+
"sha256:d9ed28030797c00f4bc43c86bf819266c76a5ea61d006cd4078a93ebf7da6bfd",
+
"sha256:e603aa7bb52e4e8ed4119a58a03b60323918467ef209e6ff9db3ac382e5cf2c6"
+ ],
+ "version": "==2.6.1"
+ },
+ "docopt": {
+ "hashes": [
+
"sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"
+ ],
+ "version": "==0.6.2"
+ },
+ "entrypoints": {
+ "hashes": [
+
"sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19",
+
"sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451"
+ ],
+ "version": "==0.3"
+ },
+ "enum34": {
+ "hashes": [
+
"sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850",
+
"sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a",
+
"sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79",
+
"sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"
+ ],
+ "markers": "python_version < '3.4'",
+ "version": "==1.1.6"
+ },
+ "execnet": {
+ "hashes": [
+
"sha256:027ee5d961afa01e97b90d6ccc34b4ed976702bc58e7f092b3c513ea288cb6d2",
+
"sha256:752a3786f17416d491f833a29217dda3ea4a471fc5269c492eebcee8cc4772d3"
+ ],
+ "version": "==1.6.0"
+ },
+ "filelock": {
+ "hashes": [
+
"sha256:b8d5ca5ca1c815e1574aee746650ea7301de63d87935b3463d26368b76e31633",
+
"sha256:d610c1bb404daf85976d7a82eb2ada120f04671007266b708606565dd03b5be6"
+ ],
+ "version": "==3.0.10"
+ },
+ "flake8": {
+ "hashes": [
+
"sha256:859996073f341f2670741b51ec1e67a01da142831aa1fdc6242dbf88dffbe661",
+
"sha256:a796a115208f5c03b18f332f7c11729812c8c3ded6c46319c59b53efd3819da8"
+ ],
+ "index": "pypi",
+ "version": "==3.7.7"
+ },
+ "funcsigs": {
+ "hashes": [
+
"sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca",
+
"sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"
+ ],
+ "markers": "python_version < '3.3'",
+ "version": "==1.0.2"
+ },
+ "functools32": {
+ "hashes": [
+
"sha256:89d824aa6c358c421a234d7f9ee0bd75933a67c29588ce50aaa3acdf4d403fa0",
+
"sha256:f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d"
+ ],
+ "markers": "python_version < '3.2'",
+ "version": "==3.2.3.post2"
+ },
+ "idna": {
+ "hashes": [
+
"sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407",
+
"sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c"
+ ],
+ "version": "==2.8"
+ },
+ "ipaddress": {
+ "hashes": [
+
"sha256:64b28eec5e78e7510698f6d4da08800a5c575caa4a286c93d651c5d3ff7b6794",
+
"sha256:b146c751ea45cad6188dd6cf2d9b757f6f4f8d6ffb96a023e6f2e26eea02a72c"
+ ],
+ "version": "==1.0.22"
+ },
+ "mccabe": {
+ "hashes": [
+
"sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42",
+
"sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"
+ ],
+ "version": "==0.6.1"
+ },
+ "mock": {
+ "hashes": [
+
"sha256:83657d894c90d5681d62155c82bda9c1187827525880eda8ff5df4ec813437c3",
+
"sha256:d157e52d4e5b938c550f39eb2fd15610db062441a9c2747d3dbfa9298211d0f8"
+ ],
+ "markers": "python_version < '3.3'",
+ "version": "==3.0.5"
+ },
+ "more-itertools": {
+ "hashes": [
+
"sha256:38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4",
+
"sha256:c0a5785b1109a6bd7fac76d6837fd1feca158e54e521ccd2ae8bfe393cc9d4fc",
+
"sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"
+ ],
+ "index": "pypi",
+ "markers": "python_version >= '2.7'",
+ "version": "==5.0.0"
+ },
+ "pathlib2": {
+ "hashes": [
+
"sha256:25199318e8cc3c25dcb45cbe084cc061051336d5a9ea2a12448d3d8cb748f742",
+
"sha256:5887121d7f7df3603bca2f710e7219f3eca0eb69e0b7cc6e0a022e155ac931a7"
+ ],
+ "markers": "python_version < '3.6'",
+ "version": "==2.3.3"
+ },
+ "pathtools": {
+ "hashes": [
+
"sha256:7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0"
+ ],
+ "version": "==0.1.2"
+ },
+ "pluggy": {
+ "hashes": [
+
"sha256:25a1bc1d148c9a640211872b4ff859878d422bccb59c9965e04eed468a0aa180",
+
"sha256:964cedd2b27c492fbf0b7f58b3284a09cf7f99b0f715941fb24a439b3af1bd1a"
+ ],
+ "version": "==0.11.0"
+ },
+ "py": {
+ "hashes": [
+
"sha256:64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa",
+
"sha256:dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53"
+ ],
+ "version": "==1.8.0"
+ },
+ "pycodestyle": {
+ "hashes": [
+
"sha256:95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56",
+
"sha256:e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"
+ ],
+ "version": "==2.5.0"
+ },
+ "pycparser": {
+ "hashes": [
+
"sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3"
+ ],
+ "version": "==2.19"
+ },
+ "pyflakes": {
+ "hashes": [
+
"sha256:17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0",
+
"sha256:d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2"
+ ],
+ "version": "==2.1.1"
+ },
+ "pyopenssl": {
+ "hashes": [
+
"sha256:aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200",
+
"sha256:c727930ad54b10fc157015014b666f2d8b41f70c0d03e83ab67624fd3dd5d1e6"
+ ],
+ "version": "==19.0.0"
+ },
+ "pytest": {
+ "hashes": [
+
"sha256:1a8aa4fa958f8f451ac5441f3ac130d9fc86ea38780dd2715e6d5c5882700b24",
+
"sha256:b8bf138592384bd4e87338cb0f256bf5f615398a649d4bd83915f0e4047a5ca6"
+ ],
+ "index": "pypi",
+ "version": "==4.5.0"
+ },
+ "pytest-cov": {
+ "hashes": [
+
"sha256:2b097cde81a302e1047331b48cadacf23577e431b61e9c6f49a1170bbe3d3da6",
+
"sha256:e00ea4fdde970725482f1f35630d12f074e121a23801aabf2ae154ec6bdd343a"
+ ],
+ "index": "pypi",
+ "version": "==2.7.1"
+ },
+ "pytest-forked": {
+ "hashes": [
+
"sha256:5fe33fbd07d7b1302c95310803a5e5726a4ff7f19d5a542b7ce57c76fed8135f",
+
"sha256:d352aaced2ebd54d42a65825722cb433004b4446ab5d2044851d9cc7a00c9e38"
+ ],
+ "index": "pypi",
+ "version": "==1.0.2"
+ },
+ "pytest-testmon": {
+ "hashes": [
+
"sha256:df00594e55f8f8f826e0e345dc23863ebac066eb749f8229c515a0373669c5bb"
+ ],
+ "index": "pypi",
+ "version": "==0.9.16"
+ },
+ "pytest-timeout": {
+ "hashes": [
+
"sha256:4a30ba76837a32c7b7cd5c84ee9933fde4b9022b0cd20ea7d4a577c2a1649fb1",
+
"sha256:d49f618c6448c14168773b6cdda022764c63ea80d42274e3156787e8088d04c6"
+ ],
+ "index": "pypi",
+ "version": "==1.3.3"
+ },
+ "pytest-watch": {
+ "hashes": [
+
"sha256:06136f03d5b361718b8d0d234042f7b2f203910d8568f63df2f866b547b3d4b9"
+ ],
+ "index": "pypi",
+ "version": "==4.2.0"
+ },
+ "pytest-xdist": {
+ "hashes": [
+
"sha256:b0bb4b0293ee8657b9eb3ff334a3b6aac4db74fd4a86b81e1982c879237a47eb",
+
"sha256:f83a485293e81fd57c8a5a85a3f12473a532c5ca7dec518857cbb72766bb526c"
+ ],
+ "index": "pypi",
+ "version": "==1.28.0"
+ },
+ "pyyaml": {
+ "hashes": [
+
"sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c",
+
"sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95",
+
"sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2",
+
"sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4",
+
"sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad",
+
"sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba",
+
"sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1",
+
"sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e",
+
"sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673",
+
"sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13",
+
"sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19"
+ ],
+ "version": "==5.1"
+ },
+ "requests": {
+ "hashes": [
+
"sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e",
+
"sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b"
+ ],
+ "index": "pypi",
+ "version": "==2.21.0"
+ },
+ "responses": {
+ "hashes": [
+
"sha256:502d9c0c8008439cfcdef7e251f507fcfdd503b56e8c0c87c3c3e3393953f790",
+
"sha256:97193c0183d63fba8cd3a041c75464e4b09ea0aff6328800d1546598567dde0b"
+ ],
+ "index": "pypi",
+ "version": "==0.10.6"
+ },
+ "scandir": {
+ "hashes": [
+
"sha256:2586c94e907d99617887daed6c1d102b5ca28f1085f90446554abf1faf73123e",
+
"sha256:2ae41f43797ca0c11591c0c35f2f5875fa99f8797cb1a1fd440497ec0ae4b022",
+
"sha256:2b8e3888b11abb2217a32af0766bc06b65cc4a928d8727828ee68af5a967fa6f",
+
"sha256:2c712840c2e2ee8dfaf36034080108d30060d759c7b73a01a52251cc8989f11f",
+
"sha256:4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae",
+
"sha256:67f15b6f83e6507fdc6fca22fedf6ef8b334b399ca27c6b568cbfaa82a364173",
+
"sha256:7d2d7a06a252764061a020407b997dd036f7bd6a175a5ba2b345f0a357f0b3f4",
+
"sha256:8c5922863e44ffc00c5c693190648daa6d15e7c1207ed02d6f46a8dcc2869d32",
+
"sha256:92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188",
+
"sha256:b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d",
+
"sha256:cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac"
+ ],
+ "markers": "python_version < '3.5'",
+ "version": "==1.10.0"
+ },
+ "six": {
+ "hashes": [
+
"sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c",
+
"sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"
+ ],
+ "version": "==1.12.0"
+ },
+ "sure": {
+ "hashes": [
+
"sha256:3c8d5271fb18e2c69e2613af1ad400d8df090f1456081635bd3171847303cdaa"
+ ],
+ "index": "pypi",
+ "version": "==1.4.11"
+ },
+ "toml": {
+ "hashes": [
+
"sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c",
+
"sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e"
+ ],
+ "version": "==0.10.0"
+ },
+ "tox": {
+ "hashes": [
+
"sha256:5358eae59e3bdba5d9bd0794331854e36250e62fa3cf7d4059ae730bfe5ca432",
+
"sha256:b7f8eb013c1c5fd758b272d4af97eeba168e6ea3fb604004582fce5aef0771c2"
+ ],
+ "index": "pypi",
+ "version": "==3.11.0"
+ },
+ "typing": {
+ "hashes": [
+
"sha256:4027c5f6127a6267a435201981ba156de91ad0d1d98e9ddc2aa173453453492d",
+
"sha256:57dcf675a99b74d64dacf6fba08fb17cf7e3d5fdff53d4a30ea2a5e7e52543d4",
+
"sha256:a4c8473ce11a65999c8f59cb093e70686b6c84c98df58c1dae9b3b196089858a"
+ ],
+ "markers": "python_version < '3.5'",
+ "version": "==3.6.6"
+ },
+ "urllib3": {
+ "hashes": [
+
"sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4",
+
"sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb"
+ ],
+ "version": "==1.24.3"
+ },
+ "virtualenv": {
+ "hashes": [
+
"sha256:99acaf1e35c7ccf9763db9ba2accbca2f4254d61d1912c5ee364f9cc4a8942a0",
+
"sha256:fe51cdbf04e5d8152af06c075404745a7419de27495a83f0d72518ad50be3ce8"
+ ],
+ "version": "==16.6.0"
+ },
+ "watchdog": {
+ "hashes": [
+
"sha256:965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d"
+ ],
+ "version": "==0.9.0"
+ },
+ "wcwidth": {
+ "hashes": [
+
"sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e",
+
"sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"
+ ],
+ "version": "==0.1.7"
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/appveyor.yml
new/cloudflare-scrape-2.0.7/appveyor.yml
--- old/cloudflare-scrape-2.0.4/appveyor.yml 1970-01-01 01:00:00.000000000
+0100
+++ new/cloudflare-scrape-2.0.7/appveyor.yml 2019-06-03 13:25:13.000000000
+0200
@@ -0,0 +1,29 @@
+os: Visual Studio 2015
+
+cache:
+ - '%LOCALAPPDATA%\pip\Cache'
+
+environment:
+ matrix:
+ - PYTHON: 'C:/Python27'
+ - PYTHON: 'C:/Python27-x64'
+ - PYTHON: 'C:/Python34'
+ - PYTHON: 'C:/Python34-x64'
+ - PYTHON: 'C:/Python35'
+ - PYTHON: 'C:/Python35-x64'
+ - PYTHON: 'C:/Python36'
+ - PYTHON: 'C:/Python36-x64'
+ - PYTHON: 'C:/Python37'
+ - PYTHON: 'C:/Python37-x64'
+
+install:
+ - 'python --version'
+ - 'node -e "console.log(process.versions);"'
+ - 'pip -V'
+ - 'pip install pipenv'
+ - 'pipenv install --dev'
+
+# Not a C# project, build stuff at the install step instead.
+build: false
+
+test_script: 'pipenv run pytest tests'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/cfscrape/__init__.py
new/cloudflare-scrape-2.0.7/cfscrape/__init__.py
--- old/cloudflare-scrape-2.0.4/cfscrape/__init__.py 2019-05-15
07:27:00.000000000 +0200
+++ new/cloudflare-scrape-2.0.7/cfscrape/__init__.py 2019-06-03
13:25:13.000000000 +0200
@@ -1,4 +1,5 @@
-import json
+# -*- coding: utf-8 -*-
+
import logging
import random
import re
@@ -17,14 +18,11 @@
from urllib3.util.ssl_ import create_urllib3_context, DEFAULT_CIPHERS
-__version__ = "2.0.4"
-
-USER_AGENTS_PATH = os.path.join(os.path.dirname(__file__), "user_agents.json")
+from .user_agents import USER_AGENTS
-with open(USER_AGENTS_PATH) as f:
- user_agents = json.load(f)
+__version__ = "2.0.7"
-DEFAULT_USER_AGENT = random.choice(user_agents)
+DEFAULT_USER_AGENT = random.choice(USER_AGENTS)
DEFAULT_HEADERS = OrderedDict(
(
@@ -58,23 +56,25 @@
https://github.com/Anorov/cloudflare-scrape/issues\
"""
-class ExcludeCaptchaProvokingCiphersAdapter(HTTPAdapter):
- url = "https://";
+# Remove a few problematic TLSv1.0 ciphers from the defaults
+DEFAULT_CIPHERS += ":!ECDHE+SHA:!AES128-SHA"
- def enable(self):
- setattr(self, "is_enabled", True)
- def disable(self):
- setattr(self, "is_enabled", False)
+class CloudflareAdapter(HTTPAdapter):
+ """ HTTPS adapter that creates a SSL context with custom ciphers """
- def get_connection(self, url, proxies=None):
- conn = super(ExcludeCaptchaProvokingCiphersAdapter,
self).get_connection(url, proxies)
- # Only if enable() has been explicitly invoked, the ciphers are
updated.
- if getattr(self, "is_enabled", False):
- conn.conn_kw['ssl_context'] =
create_urllib3_context(ciphers=DEFAULT_CIPHERS + ":!ECDHE+SHA:!AES128-SHA")
+ def get_connection(self, *args, **kwargs):
+ conn = super(CloudflareAdapter, self).get_connection(*args, **kwargs)
+
+ if conn.conn_kw.get("ssl_context"):
+ conn.conn_kw["ssl_context"].set_ciphers(DEFAULT_CIPHERS)
+ else:
+ context = create_urllib3_context(ciphers=DEFAULT_CIPHERS)
+ conn.conn_kw["ssl_context"] = context
return conn
+
class CloudflareError(RequestException):
pass
@@ -97,9 +97,7 @@
# Define headers to force using an OrderedDict and preserve header
order
self.headers = headers
- # Install the captcha adapter. Only if explicitly enabled it modifies
- # the ssl context.
- self.mount(ExcludeCaptchaProvokingCiphersAdapter.url,
ExcludeCaptchaProvokingCiphersAdapter())
+ self.mount("https://";, CloudflareAdapter())
@staticmethod
def is_cloudflare_iuam_challenge(resp):
@@ -119,11 +117,6 @@
)
def request(self, method, url, *args, **kwargs):
- # Mount the adapter responsible for removing ciphers which might
provoke
- # a captcha, but only if it's a https request.
- if self.should_enable_adapter(url):
- self.enable_adapter()
-
resp = super(CloudflareScraper, self).request(method, url, *args,
**kwargs)
# Check if Cloudflare captcha challenge is presented
@@ -134,18 +127,13 @@
if self.is_cloudflare_iuam_challenge(resp):
resp = self.solve_cf_challenge(resp, **kwargs)
- # Unmount the adapter if Cloudflare has accepted the challenge solution
- # and has sent the cf_clearance cookie.
- if self.cloudflare_is_bypassed(url, resp):
- self.disable_adapter()
-
return resp
def cloudflare_is_bypassed(self, url, resp=None):
cookie_domain = ".{}".format(urlparse(url).netloc)
return (
self.cookies.get("cf_clearance", None, domain=cookie_domain) or
- (resp and resp.cookies.get("cf_clearance", None,
domain=cookie_domain))
+ (resp and resp.cookies.get("cf_clearance", None,
domain=cookie_domain))
)
def handle_captcha_challenge(self, resp, url):
@@ -311,27 +299,6 @@
return result, delay
- def should_enable_adapter(self, url=None):
- if self.cloudflare_is_bypassed(url):
- return False
-
- if url and urlparse(url).scheme != "https":
- return False
-
- return True
-
- def enable_adapter(self):
- adapter = self.get_adapter(ExcludeCaptchaProvokingCiphersAdapter.url)
-
- if isinstance(adapter, ExcludeCaptchaProvokingCiphersAdapter):
- adapter.enable()
-
- def disable_adapter(self):
- adapter = self.get_adapter(ExcludeCaptchaProvokingCiphersAdapter.url)
-
- if isinstance(adapter, ExcludeCaptchaProvokingCiphersAdapter):
- adapter.disable()
-
@classmethod
def create_scraper(cls, sess=None, **kwargs):
"""
@@ -357,7 +324,7 @@
return scraper
- ## Functions for integrating cloudflare-scrape with other applications and
scripts
+ # Functions for integrating cloudflare-scrape with other applications and
scripts
@classmethod
def get_tokens(cls, url, user_agent=None, **kwargs):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/cfscrape/user_agents.json
new/cloudflare-scrape-2.0.7/cfscrape/user_agents.json
--- old/cloudflare-scrape-2.0.4/cfscrape/user_agents.json 2019-05-15
07:27:00.000000000 +0200
+++ new/cloudflare-scrape-2.0.7/cfscrape/user_agents.json 1970-01-01
01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-[
- "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/59.0.3071.86 Safari/537.36",
- "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/59.0.3071.86 Safari/537.36",
- "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/59.0.3071.86 Safari/537.36",
- "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/59.0.3071.86 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML,
like Gecko) Chrome/59.0.3071.86 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36",
- "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/60.0.3112.78 Safari/537.36",
- "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/60.0.3112.78 Safari/537.36",
- "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/60.0.3112.78 Safari/537.36",
- "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/60.0.3112.78 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML,
like Gecko) Chrome/60.0.3112.78 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36",
- "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/61.0.3163.79 Safari/537.36",
- "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/61.0.3163.79 Safari/537.36",
- "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/61.0.3163.79 Safari/537.36",
- "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/61.0.3163.79 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML,
like Gecko) Chrome/61.0.3163.79 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36",
- "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36"
-]
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/cfscrape/user_agents.py
new/cloudflare-scrape-2.0.7/cfscrape/user_agents.py
--- old/cloudflare-scrape-2.0.4/cfscrape/user_agents.py 1970-01-01
01:00:00.000000000 +0100
+++ new/cloudflare-scrape-2.0.7/cfscrape/user_agents.py 2019-06-03
13:25:13.000000000 +0200
@@ -0,0 +1,32 @@
+USER_AGENTS = [
+ "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/59.0.3071.86 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/59.0.3071.86 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/59.0.3071.86 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/59.0.3071.86 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML,
like Gecko) Chrome/59.0.3071.86 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/59.0.3071.86 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/60.0.3112.78 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/60.0.3112.78 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/60.0.3112.78 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/60.0.3112.78 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML,
like Gecko) Chrome/60.0.3112.78 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/60.0.3112.78 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/61.0.3163.79 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 6.2; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/61.0.3163.79 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/61.0.3163.79 Safari/537.36",
+ "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like
Gecko) Chrome/61.0.3163.79 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML,
like Gecko) Chrome/61.0.3163.79 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36",
+ "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/61.0.3163.79 Safari/537.36"
+]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/tests/__init__.py
new/cloudflare-scrape-2.0.7/tests/__init__.py
--- old/cloudflare-scrape-2.0.4/tests/__init__.py 2019-05-15
07:27:00.000000000 +0200
+++ new/cloudflare-scrape-2.0.7/tests/__init__.py 2019-06-03
13:25:13.000000000 +0200
@@ -1,7 +1,6 @@
# -*- coding: utf-8 -*-
import responses
-import pytest
import re
from requests.compat import urlencode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/tests/test_adapters.py
new/cloudflare-scrape-2.0.7/tests/test_adapters.py
--- old/cloudflare-scrape-2.0.4/tests/test_adapters.py 1970-01-01
01:00:00.000000000 +0100
+++ new/cloudflare-scrape-2.0.7/tests/test_adapters.py 2019-06-03
13:25:13.000000000 +0200
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+
+import ssl
+import sure # noqa
+import urllib3
+
+from cfscrape import CloudflareAdapter
+
+
+class TestCloudflareAdapter:
+
+ def test_create_adapter(self):
+ adapter = CloudflareAdapter()
+ adapter.should.be.a("requests.adapters.HTTPAdapter")
+ adapter.close()
+
+ def test_get_connection(self):
+ adapter = CloudflareAdapter()
+
+ conn = adapter.get_connection("https://127.0.0.1";, None)
+
+ conn.conn_kw.should.be.a("dict")
+ conn.conn_kw.should.have.key("ssl_context")
+ ssl_context = conn.conn_kw["ssl_context"]
+
+ # This should be ssl.SSLContext unless pyOpenSSL is installed.
+ # If pyOpenSSL is injected into urllib3, this should still work.
+ try:
+ assert isinstance(ssl_context,
urllib3.contrib.pyopenssl.PyOpenSSLContext)
+ except:
+ assert isinstance(ssl_context, ssl.SSLContext)
+
+ adapter.close()
+
+ def test_set_ciphers(self):
+ adapter = CloudflareAdapter()
+
+ # Reinitialize the pool manager with a different context
+ ctx = ssl.create_default_context()
+ adapter.init_poolmanager(1, 1, ssl_context=ctx)
+ # Check to see if the context remains the same without error
+ conn = adapter.get_connection('https://127.0.0.1', None)
+ conn.conn_kw.should.be.a("dict")
+ assert conn.conn_kw["ssl_context"] is ctx
+
+ adapter.close()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cloudflare-scrape-2.0.4/tox.ini
new/cloudflare-scrape-2.0.7/tox.ini
--- old/cloudflare-scrape-2.0.4/tox.ini 1970-01-01 01:00:00.000000000 +0100
+++ new/cloudflare-scrape-2.0.7/tox.ini 2019-06-03 13:25:13.000000000 +0200
@@ -0,0 +1,9 @@
+[tox]
+envlist = py27, py33, py34, py35, py36, py37, pypy
+skip_missing_interpreters = true
+
+[testenv]
+deps = pipenv
+commands=
+ pipenv install --dev
+ pipenv run py.test tests
