From: Neal Norwitz <nnorwitz@gmail.com>
Date: Fri, 25 Aug 2006 01:52:49 +0000 (+0000)
Subject: importing types is not necessary if we use isinstance
X-Git-Tag: v2.6a1~2745
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=391e5f4c9f9d7d037c1ae13ee968ed91a370a9ac;p=thirdparty%2FPython%2Fcpython.git

importing types is not necessary if we use isinstance
---

diff --git a/Lib/encodings/__init__.py b/Lib/encodings/__init__.py
index ff05fb75f987..82e517a774c9 100644
--- a/Lib/encodings/__init__.py
+++ b/Lib/encodings/__init__.py
@@ -28,7 +28,7 @@ Written by Marc-Andre Lemburg (mal@lemburg.com).
 
 """#"
 
-import codecs, types
+import codecs
 from encodings import aliases
 
 _cache = {}
@@ -60,7 +60,7 @@ def normalize_encoding(encoding):
     """
     # Make sure we have an 8-bit string, because .translate() works
     # differently for Unicode strings.
-    if type(encoding) is types.UnicodeType:
+    if isinstance(encoding, unicode):
         # Note that .encode('latin-1') does *not* use the codec
         # registry, so this call doesn't recurse. (See unicodeobject.c
         # PyUnicode_AsEncodedString() for details)