Little cleanup

diff --git a/Lib/cookielib.py b/Lib/cookielib.py
index 808eca67d545776ea6d2cf2a84ab17b38cd626f7..e8fee0ee6b4671298fcf180ce615f6671b1d052d 100644 (file)
--- a/Lib/cookielib.py
+++ b/Lib/cookielib.py
@@ -36,13 +36,13 @@ except ImportError:
 import httplib  # only for the default HTTP port
 from calendar import timegm
 
-debug = 0   # set to true to enable debugging via the logging module
+debug = False   # set to True to enable debugging via the logging module
 logger = None
 
 def _debug(*args):
-    global logger
     if not debug:
         return
+    global logger
     if not logger:
         import logging
         logger = logging.getLogger("cookielib")

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 990955a379ab1d81bfe872db7c6ad0d2ca2b7f1e..cdb3a22b3799de5b70fe454f955bcd7dd6a5191a 100644 (file)
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -165,7 +165,7 @@ class GopherError(URLError):
     pass
 
 # copied from cookielib.py
-cut_port_re = re.compile(r":\d+$")
+_cut_port_re = re.compile(r":\d+$")
 def request_host(request):
     """Return request-host, as defined by RFC 2965.
 
@@ -179,7 +179,7 @@ def request_host(request):
         host = request.get_header("Host", "")
 
     # remove port, if present
-    host = cut_port_re.sub("", host, 1)
+    host = _cut_port_re.sub("", host, 1)
     return host.lower()
 
 class Request: