[Python-checkins] cpython (merge 3.2 -> default): urllib.request - syntax changes enhancing readability. By Éric Araujo

[senthil.kumaran]

http://hg.python.org/cpython/rev/b083d1039376
changeset:   72999:b083d1039376
parent:      72997:554048b22e07
parent:      72998:99a9f0251924
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Thu Oct 20 02:50:13 2011 +0800
summary:
  urllib.request - syntax changes enhancing readability. By Éric Araujo

files:
  Lib/urllib/request.py |  25 ++++++++++++-------------
  1 files changed, 12 insertions(+), 13 deletions(-)


diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -557,12 +557,11 @@
         # For security reasons we don't allow redirection to anything other
         # than http, https or ftp.
 
-        if not urlparts.scheme in ('http', 'https', 'ftp'):
-            raise HTTPError(newurl, code,
-                            msg +
-                            " - Redirection to url '%s' is not allowed" %
-                            newurl,
-                            headers, fp)
+        if urlparts.scheme not in ('http', 'https', 'ftp'):
+            raise HTTPError(
+                newurl, code,
+                "%s - Redirection to url '%s' is not allowed" % (msg, newurl),
+                headers, fp)
 
         if not urlparts.path:
             urlparts = list(urlparts)
@@ -727,7 +726,7 @@
         # uri could be a single URI or a sequence
         if isinstance(uri, str):
             uri = [uri]
-        if not realm in self.passwd:
+        if realm not in self.passwd:
             self.passwd[realm] = {}
         for default_port in True, False:
             reduced_uri = tuple(
@@ -831,7 +830,7 @@
 
         if authreq:
             scheme = authreq.split()[0]
-            if not scheme.lower() == 'basic':
+            if scheme.lower() != 'basic':
                 raise ValueError("AbstractBasicAuthHandler does not"
                                  " support the following scheme: '%s'" %
                                  scheme)
@@ -929,7 +928,7 @@
             scheme = authreq.split()[0]
             if scheme.lower() == 'digest':
                 return self.retry_http_digest_auth(req, authreq)
-            elif not scheme.lower() == 'basic':
+            elif scheme.lower() != 'basic':
                 raise ValueError("AbstractDigestAuthHandler does not support"
                                  " the following scheme: '%s'" % scheme)
 
@@ -1839,7 +1838,7 @@
                     del self.ftpcache[k]
                     v.close()
         try:
-            if not key in self.ftpcache:
+            if key not in self.ftpcache:
                 self.ftpcache[key] = \
                     ftpwrapper(user, passwd, host, port, dirs)
             if not file: type = 'D'
@@ -1954,7 +1953,7 @@
         # We are using newer HTTPError with older redirect_internal method
         # This older method will get deprecated in 3.3
 
-        if not urlparts.scheme in ('http', 'https', 'ftp'):
+        if urlparts.scheme not in ('http', 'https', 'ftp'):
             raise HTTPError(newurl, errcode,
                             errmsg +
                             " Redirection to url '%s' is not allowed." % newurl,
@@ -1981,7 +1980,7 @@
             retry=False):
         """Error 401 -- authentication required.
         This function supports Basic authentication only."""
-        if not 'www-authenticate' in headers:
+        if 'www-authenticate' not in headers:
             URLopener.http_error_default(self, url, fp,
                                          errcode, errmsg, headers)
         stuff = headers['www-authenticate']
@@ -2007,7 +2006,7 @@
             retry=False):
         """Error 407 -- proxy authentication required.
         This function supports Basic authentication only."""
-        if not 'proxy-authenticate' in headers:
+        if 'proxy-authenticate' not in headers:
             URLopener.http_error_default(self, url, fp,
                                          errcode, errmsg, headers)
         stuff = headers['proxy-authenticate']

-- 
Repository URL: http://hg.python.org/cpython