Mercurial > hg
changeset 14964:376c32a5ccdc
url: replace uses of hasattr with safehasattr or getattr
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Mon, 25 Jul 2011 15:55:51 -0500 |
| parents | c035f1c53e39 |
| children | 194b043dfa51 |
| files | mercurial/url.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/url.py Mon Jul 25 15:53:22 2011 -0500 +++ b/mercurial/url.py Mon Jul 25 15:55:51 2011 -0500 @@ -129,7 +129,7 @@ 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 @@ # 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