facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

url: replace uses of hasattr with safehasattr or getattr

Browse Source
This commit is contained in:
Augie Fackler 2011-07-25 15:55:51 -05:00
parent 9350462549
commit 35b86083cf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mercurial/url.py
View File

@ -129,7 +129,7 @@ def _gen_sendfile(orgsend):
orgsend(self, data)
return _sendfile
has_https = hasattr(urllib2, 'HTTPSHandler')
has_https = util.safehasattr(urllib2, 'HTTPSHandler')
if has_https:
try:
_create_connection = socket.create_connection
@ -186,8 +186,8 @@ class httpconnection(keepalive.HTTPConnection):
# general transaction handler to support different ways to handle
# HTTPS proxying before and after Python 2.6.3.
def _generic_start_transaction(handler, h, req):
if hasattr(req, '_tunnel_host') and req._tunnel_host:
tunnel_host = req._tunnel_host
tunnel_host = getattr(req, '_tunnel_host', None)
if tunnel_host:
if tunnel_host[:7] not in ['http://', 'https:/']:
tunnel_host = 'https://' + tunnel_host
new_tunnel = True