[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

benjamin.peterson python-checkins at python.org
Tue Apr 1 22:27:43 CEST 2014


http://hg.python.org/cpython/rev/ab34f1425c1d
changeset:   90093:ab34f1425c1d
parent:      90091:72da7e4af99e
parent:      90092:1039d4ebc4bb
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Apr 01 16:27:35 2014 -0400
summary:
  merge 3.4

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


diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -521,7 +521,7 @@
     skip = set()
     for klass in default_classes:
         for check in handlers:
-            if instance(check, type):
+            if isinstance(check, type):
                 if issubclass(check, klass):
                     skip.add(klass)
             elif isinstance(check, klass):

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


More information about the Python-checkins mailing list