diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-03-28 17:13:53 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-04-02 11:23:58 -0600 |
| commit | 09a52ed47bb26498c97a579ce1147861df696d84 (patch) | |
| tree | 39bbddec620188f8cf09a5eb51370b0db1236219 /doc/sphinxext | |
| parent | a939f2aa83e7d37d5e35e7c2a8c539c59f682598 (diff) | |
| download | numpy-09a52ed47bb26498c97a579ce1147861df696d84.tar.gz | |
2to3: Apply `imports` fixer.
The `imports` fixer deals with the standard packages that have been
renamed, removed, or methods that have moved.
cPickle -- removed, use pickle
commands -- removed, getoutput, getstatusoutput moved to subprocess
urlparse -- removed, urlparse moved to urllib.parse
cStringIO -- removed, use StringIO or io.StringIO
copy_reg -- renamed copyreg
_winreg -- renamed winreg
ConfigParser -- renamed configparser
__builtin__ -- renamed builtins
In the case of `cPickle`, it is imported as `pickle` when python < 3 and
performance may be a consideration, but otherwise plain old `pickle` is
used.
Dealing with `StringIO` is a bit tricky. There is an `io.StringIO`
function in the `io` module, available since Python 2.6, but it expects
unicode whereas `StringIO.StringIO` expects ascii. The Python 3
equivalent is then `io.BytesIO`. What I have done here is used BytesIO
for anything that is emulating a file for testing purposes. That is more
explicit than using a redefined StringIO as was done before we dropped
support for Python 2.4 and 2.5.
Closes #3180.
Diffstat (limited to 'doc/sphinxext')
| -rw-r--r-- | doc/sphinxext/numpydoc/comment_eater.py | 2 | ||||
| -rw-r--r-- | doc/sphinxext/numpydoc/compiler_unparse.py | 2 | ||||
| -rw-r--r-- | doc/sphinxext/numpydoc/docscrape.py | 2 | ||||
| -rw-r--r-- | doc/sphinxext/numpydoc/plot_directive.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/sphinxext/numpydoc/comment_eater.py b/doc/sphinxext/numpydoc/comment_eater.py index 74d0d4768..2c7f4da31 100644 --- a/doc/sphinxext/numpydoc/comment_eater.py +++ b/doc/sphinxext/numpydoc/comment_eater.py @@ -4,7 +4,7 @@ import sys if sys.version_info[0] >= 3: from io import StringIO else: - from cStringIO import StringIO + from io import StringIO import compiler import inspect diff --git a/doc/sphinxext/numpydoc/compiler_unparse.py b/doc/sphinxext/numpydoc/compiler_unparse.py index bb76f7ea3..c36389d13 100644 --- a/doc/sphinxext/numpydoc/compiler_unparse.py +++ b/doc/sphinxext/numpydoc/compiler_unparse.py @@ -18,7 +18,7 @@ from compiler.ast import Const, Name, Tuple, Div, Mul, Sub, Add if sys.version_info[0] >= 3: from io import StringIO else: - from cStringIO import StringIO + from io import StringIO def unparse(ast, single_line_functions=False): s = StringIO() diff --git a/doc/sphinxext/numpydoc/docscrape.py b/doc/sphinxext/numpydoc/docscrape.py index af76b86e5..59d3f9734 100644 --- a/doc/sphinxext/numpydoc/docscrape.py +++ b/doc/sphinxext/numpydoc/docscrape.py @@ -14,7 +14,7 @@ import collections if sys.version_info[0] >= 3: from io import StringIO else: - from cStringIO import StringIO + from io import StringIO class Reader(object): """A line-based string reader. diff --git a/doc/sphinxext/numpydoc/plot_directive.py b/doc/sphinxext/numpydoc/plot_directive.py index 9e92acabb..a7f4655ce 100644 --- a/doc/sphinxext/numpydoc/plot_directive.py +++ b/doc/sphinxext/numpydoc/plot_directive.py @@ -82,7 +82,7 @@ import sphinx if sys.version_info[0] >= 3: from io import StringIO else: - from cStringIO import StringIO + from io import StringIO import warnings warnings.warn("A plot_directive module is also available under " |