From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 9 Nov 2009 00:45:40 +0000 (+0000)
Subject: Merged revisions 76156 via svnmerge from
X-Git-Tag: v3.1.2rc1~360
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ad104bcf94863fa0f4d16d306cdfed75ada0ea7;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Tools/scripts/db2pickle.py b/Tools/scripts/db2pickle.py
index 0c9b6bf38b60..9dd8bd3b72c0 100644
--- a/Tools/scripts/db2pickle.py
+++ b/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
 
diff --git a/Tools/scripts/pickle2db.py b/Tools/scripts/pickle2db.py
index 357e62810966..a43ffae448ef 100644
--- a/Tools/scripts/pickle2db.py
+++ b/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
 
diff --git a/Tools/scripts/redemo.py b/Tools/scripts/redemo.py
index b9bfb9668bf3..52863324c2d0 100644
--- a/Tools/scripts/redemo.py
+++ b/Tools/scripts/redemo.py
@@ -1,6 +1,6 @@
 """Basic regular expression demostration facility (Perl style syntax)."""
 
-from Tkinter import *
+from tkinter import *
 import re
 
 class ReDemo: