Merged revisions 76156 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r76156 | benjamin.peterson | 2009-11-08 18:42:58 -0600 (Sun, 08 Nov 2009) | 1 line

  fix some imports
........

Tools/scripts/db2pickle.py

@@ -33,12 +33,12 @@ try:
 except ImportError:
     gdbm = None
 try:
-    import dbm as anydbm
+    import dbm.ndbm as anydbm
 except ImportError:
     anydbm = None
 import sys
 try:
-    import cPickle as pickle
+    import pickle as pickle
 except ImportError:
     import pickle
 

Tools/scripts/pickle2db.py

@@ -38,12 +38,12 @@ try:
 except ImportError:
     gdbm = None
 try:
-    import dbm as anydbm
+    import dbm.ndbm as anydbm
 except ImportError:
     anydbm = None
 import sys
 try:
-    import cPickle as pickle
+    import pickle as pickle
 except ImportError:
     import pickle
 

Tools/scripts/redemo.py

 """Basic regular expression demostration facility (Perl style syntax)."""
 
-from Tkinter import *
+from tkinter import *
 import re
 
 class ReDemo: