RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid name clashing in deploy.py, fixes #1143

This commit is contained in:
Julia Medina 2015-04-09 21:36:24 -03:00
parent 39fd2e62ef
commit 543d02bc64
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scrapy/commands/deploy.py
View File

@ -194,21 +194,21 @@ def _upload_egg(target, eggpath, project, version):
_log('Deploying to project "%s" in %s' % (project, url))
return _http_post(req)
def _add_auth_header(request, target):
def _add_auth_header(req, target):
if 'username' in target:
u, p = target.get('username'), target.get('password', '')
request.add_header('Authorization', basic_auth_header(u, p))
req.add_header('Authorization', basic_auth_header(u, p))
else: # try netrc
try:
host = urlparse(target['url']).hostname
a = netrc.netrc().authenticators(host)
request.add_header('Authorization', basic_auth_header(a[0], a[2]))
req.add_header('Authorization', basic_auth_header(a[0], a[2]))
except (netrc.NetrcParseError, IOError, TypeError):
pass
def _http_post(request):
def _http_post(req):
try:
f = request.urlopen(request)
f = request.urlopen(req)
_log("Server response (%s):" % f.code)
print(f.read())
return True