merge 3.4

This commit is contained in:
Benjamin Peterson 2014-04-01 16:27:35 -04:00
commit 80f6759c09
1 changed files with 1 additions and 1 deletions

View File

@ -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):