Skip to content

Commit 506e76e

Browse files
committed
Применил PR brandicted#15 + Адаптировал к 3-ке
1 parent 2e550c1 commit 506e76e

File tree

6 files changed

+13
-9
lines changed

6 files changed

+13
-9
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ pip-log.txt
2727
## Unit test / coverage reports
2828
.coverage
2929
.tox
30+
/.cache/
31+
/venv/
32+
/.python-version
33+
3034

3135
## Translations
32-
*.mo
36+
*.mo

scrapy_webdriver/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
""":mod:`scrapy_webdriver` -- A module with webdriver helpers for scrapy"""
22

3-
import metadata
3+
import scrapy_webdriver.metadata
44
__version__ = metadata.version
55
__author__ = metadata.authors[0]
66
__license__ = metadata.license

scrapy_webdriver/download.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
from .http import WebdriverActionRequest, WebdriverRequest, WebdriverResponse
88

9-
if map(int, version_info) < [0, 18]:
9+
if tuple(map(int, version_info)) < (0, 18):
1010
FALLBACK_HANDLER = 'http.HttpDownloadHandler'
11-
elif map(int, version_info) >= [0, 24, 4]:
11+
elif tuple(map(int, version_info)) >= (0, 24, 4):
1212
FALLBACK_HANDLER = 'http.HTTPDownloadHandler'
1313
else:
1414
FALLBACK_HANDLER = 'http10.HTTP10DownloadHandler'

scrapy_webdriver/manager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def __init__(self, crawler):
2020
self._user_agent = crawler.settings.get('USER_AGENT', None)
2121
self._options = crawler.settings.get('WEBDRIVER_OPTIONS', dict())
2222
self._webdriver = None
23-
if isinstance(self._browser, basestring):
23+
if isinstance(self._browser, str):
2424
if '.' in self._browser:
2525
module, browser = self._browser.rsplit('.', 2)
2626
else:

scrapy_webdriver/tests/test_request_queue.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ def test_priorization(self):
5959

6060
class Spider(BaseSpider):
6161
def start_requests(self):
62-
for i in xrange(2):
62+
for i in range(2):
6363
yield WebdriverRequest('http://testdomain/path?wr=%d' % i)
6464
yield Request('http://testdomain/path?r=%d' % i)
6565

6666
def parse(self, response):
6767
def get(url):
6868
response.webdriver.get(url)
6969

70-
for i in xrange(2):
70+
for i in range(2):
7171
fake_url = '%s&wa=%d' % (response.url, i)
7272
request = response.action_request(url=fake_url,
7373
callback=self.parse_action)

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
from scrapy_webdriver import metadata
99

1010
# Auto-install and download distribute.
11-
import distribute_setup
12-
distribute_setup.use_setuptools()
11+
# import distribute_setup
12+
# distribute_setup.use_setuptools()
1313

1414
from setuptools import setup, find_packages
1515
from setuptools.command.test import test as TestCommand

0 commit comments

Comments
 (0)