Index: Lib/string.py
===================================================================
--- Lib/string.py	(revision 65106)
+++ Lib/string.py	(working copy)
@@ -68,7 +68,7 @@
         raise ValueError, "maketrans arguments must have same length"
     global _idmapL
     if not _idmapL:
-        _idmapL = map(None, _idmap)
+        _idmapL = list(_idmap)
     L = _idmapL[:]
     fromstr = map(ord, fromstr)
     for i in range(len(fromstr)):
Index: Lib/unittest.py
===================================================================
--- Lib/unittest.py	(revision 65106)
+++ Lib/unittest.py	(working copy)
@@ -160,7 +160,7 @@
         return ''.join(traceback.format_exception(exctype, value, tb))
 
     def _is_relevant_tb_level(self, tb):
-        return tb.tb_frame.f_globals.has_key('__unittest')
+        return '__unittest' in tb.tb_frame.f_globals
 
     def _count_relevant_tb_levels(self, tb):
         length = 0