Pervasively switch to unicode_literals

Resolves many inconsistent appearances of strings as
sometimes unicode and sometimes not.

Requires conversion of `__all__` entries because
["Python 2 names are strings, not unicode values"](https://stackoverflow.com/a/19913680/2019542)

Force unit to render as native string

Force .gz filenames to be native

Author: guyer

_setup/build_docs.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from distutils.core import Command
 import os
 

_setup/changelog.py

@@ -3,6 +3,7 @@
 Adapted from: https://gist.github.com/patrickfuller/e2ea8a94badc5b6967ef3ca0a9452a43
 """
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import os
 import textwrap

_setup/copy_script.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from __future__ import unicode_literals
 from builtins import input
 import os
 from distutils.core import Command
@@ -33,13 +34,13 @@ def finalize_options(self):
             ans = "junk"
 
             while (len(ans) > 0) and ("yes".find(ans.lower()) is not 0) and ("no".find(ans.lower()) is not 0):
-                ans = input("The file '%s' already exists. Overwrite? [n] "%self.To)
+                ans = eval(input("The file '%s' already exists. Overwrite? [n] "%self.To))
 
             if ans is '':
                 ans = 'no'
 
             if ("no".find(ans.lower()) is 0):
-                self.To = input("Please give a name for the ouput file: ")
+                self.To = eval(input("Please give a name for the ouput file: "))
                 self.finalize_options()
 
     def run(self):

_setup/release.py

@@ -1,4 +1,5 @@
 """setuptools command to prepare FiPy for release"""
+from __future__ import unicode_literals
 
 from distutils.core import Command
 import glob

_setup/upload_products.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from __future__ import unicode_literals
 from distutils.core import Command
 import os
 

documentation/conf.py

@@ -11,6 +11,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+from __future__ import unicode_literals
 import sys, os
 
 # If extensions (or modules to document with autodoc) are in another directory,

documentation/pyplots/threadanalyze.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from matplotlib import pyplot as plt
 import pandas as pd
 

documentation/sphinxext/docscrape.py

@@ -2,12 +2,16 @@
 
 """
 from __future__ import print_function
+from __future__ import unicode_literals
 
+from future import standard_library
+standard_library.install_aliases()
+from builtins import object
 import inspect
 import textwrap
 import re
 import pydoc
-from StringIO import StringIO
+from io import StringIO
 from warnings import warn
 4
 class Reader(object):
@@ -370,7 +374,7 @@ def _str_index(self):
         idx = self['index']
         out = []
         out += ['.. index:: %s' % idx.get('default', '')]
-        for section, references in idx.items():
+        for section, references in list(idx.items()):
             if section == 'default':
                 continue
             out += ['   :%s: %s' % (section, ', '.join(references))]

documentation/sphinxext/docscrape_sphinx.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import unicode_literals
 import re, inspect, textwrap, pydoc
 from .docscrape import NumpyDocString, FunctionDoc, ClassDoc
 
@@ -74,7 +75,7 @@ def _str_index(self):
             return out
 
         out += ['.. index:: %s' % idx.get('default', '')]
-        for section, references in idx.items():
+        for section, references in list(idx.items()):
             if section == 'default':
                 continue
             elif section == 'refguide':

documentation/sphinxext/example.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from __future__ import unicode_literals
 import os.path
 import posixpath
 

documentation/sphinxext/numpydoc.py

@@ -17,6 +17,7 @@
 """
 from __future__ import absolute_import
 from __future__ import print_function
+from __future__ import unicode_literals
 
 from builtins import str
 import os, re, pydoc

documentation/sphinxext/redirecting_html.py

@@ -1,5 +1,8 @@
+from __future__ import unicode_literals
+from future import standard_library
+standard_library.install_aliases()
 from docutils import nodes
-import urlparse
+import urllib.parse
 
 from sphinx.builders.html import StandaloneHTMLBuilder
 
@@ -14,7 +17,7 @@ def write_doc(self, docname, doctree):
         for node in doctree.traverse(nodes.reference):
             try:
                 uri = node['refuri']
-                uri = urlparse.urlparse(uri)
+                uri = urllib.parse.urlparse(uri)
                 if uri.scheme in ["http", "https"]:
                     if not uri.netloc.endswith("nist.gov"):
                         node['refuri'] = "/cgi-bin/redirect.py?url=" + uri.geturl()

documentation/tutorial/package/__init__.py

@@ -7,5 +7,6 @@
 their own chapters; rather, their contents will be described in the chapter
 for their containing package.
 """
+from __future__ import unicode_literals
 
 __docformat__ = 'restructuredtext'

documentation/tutorial/package/subpackage/__init__.py

@@ -7,5 +7,6 @@
 their own chapters; rather, their contents will be described in the chapter
 for their containing package.
 """
+from __future__ import unicode_literals
 
 __docformat__ = 'restructuredtext'

documentation/tutorial/package/subpackage/base.py

@@ -11,9 +11,11 @@
 
 in which case you can refer simply to :mod:`~package.subpackage.base`.
 """
+from __future__ import unicode_literals
+from builtins import object
 __docformat__ = 'restructuredtext'
 
-class Base:
+class Base(object):
     """
     With very few exceptions, the name of a class will be the capitalized
     form of the module it resides in.  Depending on how you imported the

documentation/tutorial/package/subpackage/object.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 
 __docformat__ = 'restructuredtext'
 

examples/benchmarking/benchmarker.py

@@ -1,5 +1,6 @@
 from __future__ import print_function
 from __future__ import division
+from __future__ import unicode_literals
 from builtins import str
 from past.utils import old_div
 import os

examples/benchmarking/size.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from __future__ import unicode_literals
 import os
 import sys
 import re

examples/benchmarking/steps.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from __future__ import unicode_literals
 from builtins import range
 import os
 import sys

examples/benchmarking/utils.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import re
 
 import numpy

examples/benchmarking/versions.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+from __future__ import unicode_literals
 import os
 import re
 import shutil

examples/cahnHilliard/mesh2D.py

@@ -108,12 +108,13 @@
    :alt: evolution of Cahn-Hilliard phase separation at t = 30, 100 and 1000
 
 """
+from __future__ import unicode_literals
 from builtins import input
 __docformat__ = 'restructuredtext'
 
 if __name__ == '__main__':
     import fipy.tests.doctestPlus
     exec(fipy.tests.doctestPlus._getScript())
 
-    input('finished')
+    eval(input('finished'))
 

examples/cahnHilliard/mesh2DCoupled.py

@@ -169,13 +169,14 @@
 True
 
 """
+from __future__ import unicode_literals
 from builtins import input
 __docformat__ = 'restructuredtext'
 
 if __name__ == '__main__':
     import fipy.tests.doctestPlus
     exec(fipy.tests.doctestPlus._getScript())
 
-    input('finished')
+    eval(input('finished'))
 
 

examples/cahnHilliard/mesh3D.py

@@ -74,11 +74,12 @@
    :align: center
    :alt: snapshot of Cahn-Hilliard phase separation in 3D with cutaway
 """
+from __future__ import unicode_literals
 from builtins import input
 __docformat__ = 'restructuredtext'
 
 if __name__ == '__main__':
     import fipy.tests.doctestPlus
     exec(fipy.tests.doctestPlus._getScript())
 
-    input('finished')
+    eval(input('finished'))

examples/cahnHilliard/sphere.py

@@ -109,12 +109,13 @@
    :alt: Cahn-Hilliard phase separation on the surface of a sphere with a rendering of the mesh
 
 """
+from __future__ import unicode_literals
 from builtins import input
 __docformat__ = 'restructuredtext'
 
 if __name__ == '__main__':
     import fipy.tests.doctestPlus
     exec(fipy.tests.doctestPlus._getScript())
 
-    input('finished')
+    eval(input('finished'))
 

examples/cahnHilliard/sphereDaemon.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import sys
 
 try:

examples/cahnHilliard/tanh1D.py

@@ -151,14 +151,15 @@
 1
 
 """
+from __future__ import unicode_literals
 from builtins import input
 __docformat__ = 'restructuredtext'
 
 if __name__ == '__main__':
     import fipy.tests.doctestPlus
     exec(fipy.tests.doctestPlus._getScript())
 
-    input('finished')
+    eval(input('finished'))
 
 
 

examples/cahnHilliard/test.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from fipy.tests.doctestPlus import _LateImportDocTestSuite
 import fipy.tests.testProgram
 

examples/chemotaxis/input.py

@@ -26,6 +26,7 @@
 
 """
 from __future__ import division
+from __future__ import unicode_literals
 
 from builtins import input
 from builtins import range
@@ -112,5 +113,5 @@
 
     KMViewer.plot()
 
-    input("finished")
+    eval(input("finished"))
 

examples/chemotaxis/input2D.py

@@ -26,6 +26,7 @@
 
 """
 from __future__ import division
+from __future__ import unicode_literals
 
 from builtins import input
 from builtins import range
@@ -116,5 +117,5 @@
         KMViewer.plot()
         TMViewer.plot()
 
-    input("finished")
+    eval(input("finished"))
 

examples/chemotaxis/parameters.py

@@ -3,6 +3,7 @@
 Input file for parameters
 
 """
+from __future__ import unicode_literals
 
 parameters = { 'case 1' : { 'P3'             : 0.21967,
                             'P2'             : 0.47202,

examples/chemotaxis/test.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 from fipy.tests.doctestPlus import _LateImportDocTestSuite
 import fipy.tests.testProgram
 

examples/convection/advection/explicitUpwind.py

@@ -3,6 +3,7 @@
 order explicit upwind scheme.
 """
 from __future__ import division
+from __future__ import unicode_literals
 
 from builtins import input
 from builtins import range
@@ -44,4 +45,4 @@
                  solver = LinearLUSolver(tolerance=1.e-15, iterations=2000))
         viewer.plot()
     viewer.plot()
-    input('finished')
+    eval(input('finished'))

examples/convection/advection/implicitUpwind.py

@@ -3,6 +3,7 @@
 order implicit upwind scheme.
 """
 from __future__ import division
+from __future__ import unicode_literals
 
 from builtins import range
 from builtins import input
@@ -39,11 +40,11 @@
 
     viewer = Viewer(vars=(var,))
     viewer.plot()
-    input("press key to continue")
+    eval(input("press key to continue"))
     for step in range(steps):
         eq.solve(var,
                  dt = timeStepDuration,
                  solver = LinearLUSolver(tolerance = 1.e-15))
         viewer.plot()
     viewer.plot()
-    input('finished')
+    eval(input('finished'))

examples/convection/advection/vanLeerUpwind.py

@@ -29,6 +29,7 @@
 """
 from __future__ import print_function
 from __future__ import division
+from __future__ import unicode_literals
 
 from builtins import input
 from builtins import range
@@ -87,5 +88,5 @@
 
     print('maximum absolute difference between periodic and non-periodic grids:', abs(var1[old_div(nx, 4):old_div(3 * nx, 4)] - newVar2).max())
 
-    input('finished')
+    eval(input('finished'))
 

examples/convection/exponential1D/cylindricalMesh1D.py

@@ -94,12 +94,13 @@
 ...     viewer = Viewer(vars=var)
 ...     viewer.plot()
 """
+from __future__ import unicode_literals
 from builtins import input
 __docformat__ = 'restructuredtext'
 
 if __name__ == '__main__':
     import fipy.tests.doctestPlus
     exec(fipy.tests.doctestPlus._getScript())
 
-    input('finished')
+    eval(input('finished'))