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

Jump to bottom

[MRG+1] PY3: Implement some attributes of WrappedRequest required in Python 3 #1771

Merged
merged 1 commit into from
Feb 8, 2016
Merged

[MRG+1] PY3: Implement some attributes of WrappedRequest required in Python 3 #1771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions scrapy/http/cookies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,29 @@ def is_unverifiable(self):
"""
return self.request.meta.get('is_unverifiable', False)

# python3 uses request.unverifiable
def get_origin_req_host(self):
return urlparse_cached(self.request).hostname

# python3 uses attributes instead of methods
@property
def full_url(self):
return self.get_full_url()

@property
def host(self):
return self.get_host()

@property
def type(self):
return self.get_type()

@property
def unverifiable(self):
return self.is_unverifiable()

def get_origin_req_host(self):
return urlparse_cached(self.request).hostname
@property
def origin_req_host(self):
return self.get_origin_req_host()

def has_header(self, name):
return name in self.request.headers
Expand Down
4 changes: 4 additions & 0 deletions tests/test_http_cookies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ def setUp(self):

def test_get_full_url(self):
self.assertEqual(self.wrapped.get_full_url(), self.request.url)
self.assertEqual(self.wrapped.full_url, self.request.url)

def test_get_host(self):
self.assertEqual(self.wrapped.get_host(), urlparse(self.request.url).netloc)
self.assertEqual(self.wrapped.host, urlparse(self.request.url).netloc)

def test_get_type(self):
self.assertEqual(self.wrapped.get_type(), urlparse(self.request.url).scheme)
self.assertEqual(self.wrapped.type, urlparse(self.request.url).scheme)

def test_is_unverifiable(self):
self.assertFalse(self.wrapped.is_unverifiable())
Expand All @@ -32,6 +35,7 @@ def test_is_unverifiable2(self):

def test_get_origin_req_host(self):
self.assertEqual(self.wrapped.get_origin_req_host(), 'www.example.com')
self.assertEqual(self.wrapped.origin_req_host, 'www.example.com')

def test_has_header(self):
self.assertTrue(self.wrapped.has_header('content-type'))
Expand Down