summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-04-01 20:27:35 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-04-01 20:27:35 (GMT)
commit80f6759c09cf446c90313b99dd04eeb04dd7f115 (patch)
treeb6b4e7bcc4e68685138caf53c761cbe277907fa7 /Lib
parentf63ea3d148e50fa6d0d6eac7fa2af15415618103 (diff)
parent78c85384614dd7dc8fc3f9316874ac8ee9310c13 (diff)
downloadcpython-80f6759c09cf446c90313b99dd04eeb04dd7f115.zip
cpython-80f6759c09cf446c90313b99dd04eeb04dd7f115.tar.gz
cpython-80f6759c09cf446c90313b99dd04eeb04dd7f115.tar.bz2
merge 3.4
Diffstat (limited to 'Lib')
-rw-r--r--Lib/urllib/request.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 65a3aeb..8a7d048 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -521,7 +521,7 @@ def build_opener(*handlers):
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):