summaryrefslogtreecommitdiffstats
path: root/Lib/shelve.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-05-18 00:51:22 (GMT)
committerGuido van Rossum <guido@python.org>2007-05-18 00:51:22 (GMT)
commit68937b4cbcc3e88d4207e6391a311f9b7d067b71 (patch)
treeb5fffb2ee6c7f523ced6f49f9ab35bc22413cbcf /Lib/shelve.py
parent7ac9d4020100b99b17eeddf65bafa8e87f9f293a (diff)
downloadcpython-68937b4cbcc3e88d4207e6391a311f9b7d067b71.zip
cpython-68937b4cbcc3e88d4207e6391a311f9b7d067b71.tar.gz
cpython-68937b4cbcc3e88d4207e6391a311f9b7d067b71.tar.bz2
Change some uses of cStringIO.StringIO to io.StringIO.
This is undoubtedly insufficient and in some cases just as broken as before.
Diffstat (limited to 'Lib/shelve.py')
-rw-r--r--Lib/shelve.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/Lib/shelve.py b/Lib/shelve.py
index 697ae4f..5aa8263 100644
--- a/Lib/shelve.py
+++ b/Lib/shelve.py
@@ -56,17 +56,8 @@ entries in the cache, and empty the cache (d.sync() also synchronizes
the persistent dictionary on disk, if feasible).
"""
-# Try using cPickle and cStringIO if available.
-
-try:
- from cPickle import Pickler, Unpickler
-except ImportError:
- from pickle import Pickler, Unpickler
-
-try:
- from cStringIO import StringIO
-except ImportError:
- from StringIO import StringIO
+from pickle import Pickler, Unpickler
+from io import StringIO
import UserDict
import warnings