summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-11-09 00:45:40 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-11-09 00:45:40 (GMT)
commit3ad104bcf94863fa0f4d16d306cdfed75ada0ea7 (patch)
treee5c35a535499ea9a2ded64506d5df694acba96a8 /Tools
parentdebfafd4e208c98af035371069b4835c1f91f784 (diff)
downloadcpython-3ad104bcf94863fa0f4d16d306cdfed75ada0ea7.zip
cpython-3ad104bcf94863fa0f4d16d306cdfed75ada0ea7.tar.gz
cpython-3ad104bcf94863fa0f4d16d306cdfed75ada0ea7.tar.bz2
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 ........
Diffstat (limited to 'Tools')
-rw-r--r--Tools/scripts/db2pickle.py4
-rw-r--r--Tools/scripts/pickle2db.py4
-rw-r--r--Tools/scripts/redemo.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/Tools/scripts/db2pickle.py b/Tools/scripts/db2pickle.py
index 0c9b6bf..9dd8bd3 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 357e628..a43ffae 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 b9bfb96..5286332 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: