[Python-checkins] r76157 - in python/branches/release31-maint: Tools/scripts/db2pickle.py Tools/scripts/pickle2db.py Tools/scripts/redemo.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Nov  9 01:45:40 2009
New Revision: 76157

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Tools/scripts/db2pickle.py
   python/branches/release31-maint/Tools/scripts/pickle2db.py
   python/branches/release31-maint/Tools/scripts/redemo.py

Modified: python/branches/release31-maint/Tools/scripts/db2pickle.py
==============================================================================
--- python/branches/release31-maint/Tools/scripts/db2pickle.py	(original)
+++ python/branches/release31-maint/Tools/scripts/db2pickle.py	Mon Nov  9 01:45:40 2009
@@ -33,12 +33,12 @@
 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
 

Modified: python/branches/release31-maint/Tools/scripts/pickle2db.py
==============================================================================
--- python/branches/release31-maint/Tools/scripts/pickle2db.py	(original)
+++ python/branches/release31-maint/Tools/scripts/pickle2db.py	Mon Nov  9 01:45:40 2009
@@ -38,12 +38,12 @@
 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
 

Modified: python/branches/release31-maint/Tools/scripts/redemo.py
==============================================================================
--- python/branches/release31-maint/Tools/scripts/redemo.py	(original)
+++ python/branches/release31-maint/Tools/scripts/redemo.py	Mon Nov  9 01:45:40 2009
@@ -1,6 +1,6 @@
 """Basic regular expression demostration facility (Perl style syntax)."""
 
-from Tkinter import *
+from tkinter import *
 import re
 
 class ReDemo: