Logged In: YES 
user_id=38388

The patch looks OK, accept for some minor glitches such as
this mess :-) ...

+    if not isinstance(entry, codecs.CodecInfo):
+        if not 4 <= len(entry) <= 7:
+             raise CodecRegistryError,\
+                  'module "%s" (%s) failed to register' % \
+                   (mod.__name__, mod.__file__)
+        if not callable(entry[0]) or \
+           not callable(entry[1]) or \
+           (entry[2] is not None and not
callable(entry[2])) or \
+           (entry[3] is not None and not
callable(entry[3])) or \
+           (len(entry) > 4 and entry[4] is not None and not
callable(entry[4])) or \
+           (len(entry) > 5 and entry[5] is not None and not
callable(entry[5])):
             raise CodecRegistryError,\
-                  'incompatible codecs in module "%s" (%s)' % \
-                  (mod.__name__, mod.__file__)
+                'incompatible codecs in module "%s" (%s)' % \
+                (mod.__name__, mod.__file__)
+        if len(entry)<7 or entry[6] is None:
+            entry += (None,)*(6-len(entry)) +
(mod.__name__.split(".", 1)[1],)
+        entry = codecs.CodecInfo(*entry)

Nevertheless, it can be cleaned up after checkin, so please
go ahead with it.

Regarding the idna.py patch, I think you should create a new
patch item for it and assign it to Martin.

Thanks.

Neal, I don't have time to review the two CJK patches.