File python3-fixes.patch of Package dolfin

Overview Repositories Revisions Requests Users Attributes Meta

File python3-fixes.patch of Package dolfin (Revision 0351d7e72640b00d12e32fecda0e58b5)

Currently displaying revision 0351d7e72640b00d12e32fecda0e58b5 , Show latest

---
 cmake/scripts/generate-swig-interface.py                         |    2 
 doc-old/generate_api_doc.py                                      |    4 
 dolfin/swig/modules/fem/module.i                                 |   72 +++++-----
 dolfin/swig/modules/function/module.i                            |   32 ++--
 dolfin/swig/modules/io/module.i                                  |   62 ++++----
 dolfin/swig/modules/la/module.i                                  |   16 +-
 dolfin/swig/modules/mesh/module.i                                |   10 -
 scripts/dolfin-convert/dolfin-convert                            |    6 
 scripts/dolfin-order/dolfin-order                                |    6 
 scripts/dolfin-plot/dolfin-plot                                  |   20 +-
 site-packages/dolfin_utils/documentation/extractdocumentation.py |    2 
 site-packages/dolfin_utils/documentation/generatepythonrst.py    |    4 
 site-packages/dolfin_utils/meshconvert/meshconvert.py            |   56 ++++---
 13 files changed, 150 insertions(+), 142 deletions(-)

--- a/cmake/scripts/generate-swig-interface.py
+++ b/cmake/scripts/generate-swig-interface.py
@@ -212,7 +212,7 @@ def extract_swig_modules_dependencies(mo
                     continue
 
                 # Read code
-                with open(header_file) as f:
+                with open(header_file, encoding='UTF-8') as f:
                     code = f.read()
 
                 try:
--- a/doc-old/generate_api_doc.py
+++ b/doc-old/generate_api_doc.py
@@ -54,7 +54,9 @@ def generate_dolfin_doc(input_dir, outpu
     module_name = "dolfin"
     try:
         exec("import %s" % module_name)
-        exec("module = %s" % module_name)
+        localvars = locals()
+        exec("module = %s" % module_name,globals(),localvars)
+        module = localvars['module']
     except Exception as what:
         raise ImportError(dolfin_import_error_msg % (module_name, what))
 
--- a/dolfin/swig/modules/fem/module.i
+++ b/dolfin/swig/modules/fem/module.i
@@ -140,57 +140,57 @@ import_array();
 
 // %import types from submodule common of SWIG module common
 %include "dolfin/swig/common/pre.i"
-%import(package="", module="common") "dolfin/common/types.h"
-%import(package="", module="common") "dolfin/common/constants.h"
-%import(package="", module="common") "dolfin/common/Array.h"
-%import(package="", module="common") "dolfin/common/ArrayView.h"
-%import(package="", module="common") "dolfin/common/Variable.h"
-%import(package="", module="common") "dolfin/common/Hierarchical.h"
-%import(package="", module="common") "dolfin/common/MPI.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/types.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/constants.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Array.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/ArrayView.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Variable.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Hierarchical.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/MPI.h"
 
 // %import types from submodule parameter of SWIG module common
 %include "dolfin/swig/parameter/pre.i"
-%import(package="", module="common") "dolfin/parameter/Parameter.h"
-%import(package="", module="common") "dolfin/parameter/Parameters.h"
+%import(package="dolfin.cpp", module="common") "dolfin/parameter/Parameter.h"
+%import(package="dolfin.cpp", module="common") "dolfin/parameter/Parameters.h"
 
 // %import types from submodule mesh of SWIG module mesh
 %include "dolfin/swig/mesh/pre.i"
-%import(package="", module="mesh") "dolfin/mesh/MeshGeometry.h"
-%import(package="", module="mesh") "dolfin/mesh/Mesh.h"
-%import(package="", module="mesh") "dolfin/mesh/MeshEntity.h"
-%import(package="", module="mesh") "dolfin/mesh/Face.h"
-%import(package="", module="mesh") "dolfin/mesh/Facet.h"
-%import(package="", module="mesh") "dolfin/mesh/Cell.h"
-%import(package="", module="mesh") "dolfin/mesh/MeshFunction.h"
-%import(package="", module="mesh") "dolfin/mesh/SubDomain.h"
-%import(package="", module="mesh") "dolfin/mesh/MultiMesh.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MeshGeometry.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/Mesh.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MeshEntity.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/Face.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/Facet.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/Cell.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MeshFunction.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/SubDomain.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MultiMesh.h"
 
 // %import types from submodule geometry of SWIG module mesh
 %include "dolfin/swig/geometry/pre.i"
-%import(package="", module="mesh") "dolfin/geometry/Point.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/geometry/Point.h"
 
 // %import types from submodule la of SWIG module la
 %include "dolfin/swig/la/pre.i"
-%import(package="", module="la") "dolfin/la/LinearAlgebraObject.h"
-%import(package="", module="la") "dolfin/la/GenericLinearOperator.h"
-%import(package="", module="la") "dolfin/la/GenericTensor.h"
-%import(package="", module="la") "dolfin/la/GenericMatrix.h"
-%import(package="", module="la") "dolfin/la/GenericVector.h"
-%import(package="", module="la") "dolfin/la/SparsityPattern.h"
-%import(package="", module="la") "dolfin/la/IndexMap.h"
-%import(package="", module="la") "dolfin/la/Vector.h"
-%import(package="", module="la") "dolfin/la/Matrix.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/LinearAlgebraObject.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/GenericLinearOperator.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/GenericTensor.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/GenericMatrix.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/GenericVector.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/SparsityPattern.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/IndexMap.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/Vector.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/Matrix.h"
 
 // %import types from submodule function of SWIG module function
 %include "dolfin/swig/function/pre.i"
-%import(package="", module="function") "dolfin/function/GenericFunction.h"
-%import(package="", module="function") "dolfin/function/Expression.h"
-%import(package="", module="function") "dolfin/function/Function.h"
-%import(package="", module="function") "dolfin/function/FunctionSpace.h"
-%import(package="", module="function") "dolfin/function/Constant.h"
-%import(package="", module="function") "dolfin/function/SpecialFacetFunction.h"
-%import(package="", module="function") "dolfin/function/MultiMeshFunction.h"
-%import(package="", module="function") "dolfin/function/MultiMeshFunctionSpace.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/GenericFunction.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/Expression.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/Function.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/FunctionSpace.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/Constant.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/SpecialFacetFunction.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/MultiMeshFunction.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/MultiMeshFunctionSpace.h"
 
 // Turn on SWIG generated signature documentation and include doxygen
 // generated docstrings
--- a/dolfin/swig/modules/function/module.i
+++ b/dolfin/swig/modules/function/module.i
@@ -100,31 +100,31 @@ import_array();
 
 // %import types from submodule common of SWIG module common
 %include "dolfin/swig/common/pre.i"
-%import(package="", module="common") "dolfin/common/types.h"
-%import(package="", module="common") "dolfin/common/constants.h"
-%import(package="", module="common") "dolfin/common/Array.h"
-%import(package="", module="common") "dolfin/common/Variable.h"
-%import(package="", module="common") "dolfin/common/Hierarchical.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/types.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/constants.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Array.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Variable.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Hierarchical.h"
 
 // %import types from submodule mesh of SWIG module mesh
 %include "dolfin/swig/mesh/pre.i"
-%import(package="", module="mesh") "dolfin/mesh/Mesh.h"
-%import(package="", module="mesh") "dolfin/mesh/MeshEntity.h"
-%import(package="", module="mesh") "dolfin/mesh/Cell.h"
-%import(package="", module="mesh") "dolfin/mesh/MeshFunction.h"
-%import(package="", module="mesh") "dolfin/mesh/BoundaryMesh.h"
-%import(package="", module="mesh") "dolfin/mesh/MultiMesh.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/Mesh.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MeshEntity.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/Cell.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MeshFunction.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/BoundaryMesh.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MultiMesh.h"
 
 // %import types from submodule geometry of SWIG module mesh
 %include "dolfin/swig/geometry/pre.i"
-%import(package="", module="mesh") "dolfin/geometry/Point.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/geometry/Point.h"
 
 // %import types from submodule la of SWIG module la
 %include "dolfin/swig/la/pre.i"
-%import(package="", module="la") "dolfin/la/LinearAlgebraObject.h"
-%import(package="", module="la") "dolfin/la/GenericTensor.h"
-%import(package="", module="la") "dolfin/la/GenericVector.h"
-%import(package="", module="la") "dolfin/la/Vector.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/LinearAlgebraObject.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/GenericTensor.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/GenericVector.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/Vector.h"
 
 // %import types from submodule fem of SWIG module fem
 %include "dolfin/swig/fem/pre.i"
--- a/dolfin/swig/modules/io/module.i
+++ b/dolfin/swig/modules/io/module.i
@@ -104,58 +104,58 @@ import_array();
 
 // %import types from submodule common of SWIG module common
 %include "dolfin/swig/common/pre.i"
-%import(package="", module="common") "dolfin/common/constants.h"
-%import(package="", module="common") "dolfin/common/Array.h"
-%import(package="", module="common") "dolfin/common/Variable.h"
-%import(package="", module="common") "dolfin/common/Hierarchical.h"
-%import(package="", module="common") "dolfin/common/MPI.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/constants.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Array.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Variable.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Hierarchical.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/MPI.h"
 
 // %import types from submodule parameter of SWIG module common
 %include "dolfin/swig/parameter/pre.i"
-%import(package="", module="common") "dolfin/parameter/Parameter.h"
-%import(package="", module="common") "dolfin/parameter/Parameters.h"
+%import(package="dolfin.cpp", module="common") "dolfin/parameter/Parameter.h"
+%import(package="dolfin.cpp", module="common") "dolfin/parameter/Parameters.h"
 
 // %import types from submodule log of SWIG module common
 %include "dolfin/swig/log/pre.i"
-%import(package="", module="common") "dolfin/log/Table.h"
+%import(package="dolfin.cpp", module="common") "dolfin/log/Table.h"
 
 // %import types from submodule mesh of SWIG module mesh
 %include "dolfin/swig/mesh/pre.i"
-%import(package="", module="mesh") "dolfin/mesh/CellType.h"
-%import(package="", module="mesh") "dolfin/mesh/MeshData.h"
-%import(package="", module="mesh") "dolfin/mesh/Mesh.h"
-%import(package="", module="mesh") "dolfin/mesh/MeshEntity.h"
-%import(package="", module="mesh") "dolfin/mesh/Cell.h"
-%import(package="", module="mesh") "dolfin/mesh/MeshFunction.h"
-%import(package="", module="mesh") "dolfin/mesh/MeshValueCollection.h"
-%import(package="", module="mesh") "dolfin/mesh/LocalMeshData.h"
-%import(package="", module="mesh") "dolfin/mesh/MultiMesh.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/CellType.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MeshData.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/Mesh.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MeshEntity.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/Cell.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MeshFunction.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MeshValueCollection.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/LocalMeshData.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/mesh/MultiMesh.h"
 
 // %import types from submodule geometry of SWIG module mesh
 %include "dolfin/swig/geometry/pre.i"
-%import(package="", module="mesh") "dolfin/geometry/Point.h"
+%import(package="dolfin.cpp", module="mesh") "dolfin/geometry/Point.h"
 
 // %import types from submodule la of SWIG module la
 %include "dolfin/swig/la/pre.i"
-%import(package="", module="la") "dolfin/la/LinearAlgebraObject.h"
-%import(package="", module="la") "dolfin/la/GenericLinearOperator.h"
-%import(package="", module="la") "dolfin/la/GenericTensor.h"
-%import(package="", module="la") "dolfin/la/GenericMatrix.h"
-%import(package="", module="la") "dolfin/la/GenericVector.h"
-%import(package="", module="la") "dolfin/la/Vector.h"
-%import(package="", module="la") "dolfin/la/Matrix.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/LinearAlgebraObject.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/GenericLinearOperator.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/GenericTensor.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/GenericMatrix.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/GenericVector.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/Vector.h"
+%import(package="dolfin.cpp", module="la") "dolfin/la/Matrix.h"
 
 // %import types from submodule function of SWIG module function
 %include "dolfin/swig/function/pre.i"
-%import(package="", module="function") "dolfin/function/GenericFunction.h"
-%import(package="", module="function") "dolfin/function/Expression.h"
-%import(package="", module="function") "dolfin/function/Function.h"
-%import(package="", module="function") "dolfin/function/FunctionSpace.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/GenericFunction.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/Expression.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/Function.h"
+%import(package="dolfin.cpp", module="function") "dolfin/function/FunctionSpace.h"
 
 // %import types from submodule fem of SWIG module fem
 %include "dolfin/swig/fem/pre.i"
-%import(package="", module="fem") "dolfin/fem/GenericDofMap.h"
-%import(package="", module="fem") "dolfin/fem/DofMap.h"
+%import(package="dolfin.cpp", module="fem") "dolfin/fem/GenericDofMap.h"
+%import(package="dolfin.cpp", module="fem") "dolfin/fem/DofMap.h"
 
 // Turn on SWIG generated signature documentation and include doxygen
 // generated docstrings
--- a/dolfin/swig/modules/la/module.i
+++ b/dolfin/swig/modules/la/module.i
@@ -116,17 +116,17 @@ import_array();
 
 // %import types from submodule common of SWIG module common
 %include "dolfin/swig/common/pre.i"
-%import(package="", module="common") "dolfin/common/types.h"
-%import(package="", module="common") "dolfin/common/constants.h"
-%import(package="", module="common") "dolfin/common/Array.h"
-%import(package="", module="common") "dolfin/common/ArrayView.h"
-%import(package="", module="common") "dolfin/common/Variable.h"
-%import(package="", module="common") "dolfin/common/MPI.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/types.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/constants.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Array.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/ArrayView.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Variable.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/MPI.h"
 
 // %import types from submodule parameter of SWIG module common
 %include "dolfin/swig/parameter/pre.i"
-%import(package="", module="common") "dolfin/parameter/Parameter.h"
-%import(package="", module="common") "dolfin/parameter/Parameters.h"
+%import(package="dolfin.cpp", module="common") "dolfin/parameter/Parameter.h"
+%import(package="dolfin.cpp", module="common") "dolfin/parameter/Parameters.h"
 
 // Turn on SWIG generated signature documentation and include doxygen
 // generated docstrings
--- a/dolfin/swig/modules/mesh/module.i
+++ b/dolfin/swig/modules/mesh/module.i
@@ -133,11 +133,11 @@ import_array();
 
 // %import types from submodule common of SWIG module common
 %include "dolfin/swig/common/pre.i"
-%import(package="", module="common") "dolfin/common/constants.h"
-%import(package="", module="common") "dolfin/common/Array.h"
-%import(package="", module="common") "dolfin/common/Variable.h"
-%import(package="", module="common") "dolfin/common/Hierarchical.h"
-%import(package="", module="common") "dolfin/common/MPI.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/constants.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Array.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Variable.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/Hierarchical.h"
+%import(package="dolfin.cpp", module="common") "dolfin/common/MPI.h"
 
 // %import types from submodule la of SWIG module la
 %include "dolfin/swig/la/pre.i"
--- a/site-packages/dolfin_utils/documentation/extractdocumentation.py
+++ b/site-packages/dolfin_utils/documentation/extractdocumentation.py
@@ -49,7 +49,7 @@ def extract_documentation(dolfin_dir, he
     indent = 0
 
     # Iterate over each line
-    f = open(os.path.join(dolfin_dir, "dolfin", module, header))
+    f = open(os.path.join(dolfin_dir, "dolfin", module, header), encoding='UTF-8')
     for line in f:
 
         # Check for comment
--- a/site-packages/dolfin_utils/documentation/generatepythonrst.py
+++ b/site-packages/dolfin_utils/documentation/generatepythonrst.py
@@ -79,7 +79,7 @@ def get_objects(module):
 
     # NOTE: Dirty hack for Python 2.6, in 2.7 it should be possible to use
     # importlib for submodules to test if __all__ is defined.
-    if "__all__" in open(module.file, "r").read():
+    if "__all__" in open(module.file, "r", encoding='UTF-8').read():
         define_all = True
     else:
         define_all = False
@@ -217,5 +217,5 @@ def generate_python_api_documentation(mo
 
     print("Writing files for submodules ... ")
     for submod in sorted(submods, key=lambda o: o.name):
-        # print "  Writing files for sub module: ", submod.name
+        print("  Writing files for sub module: %s" % submod.name)
         write_documentation(module.__name__, submod, output_dir, version)
--- a/scripts/dolfin-convert/dolfin-convert
+++ b/scripts/dolfin-convert/dolfin-convert
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2006 Anders Logg
 #
@@ -82,7 +82,7 @@ def main(argv):
 
 def usage():
     "Display usage"
-    print """\
+    print("""\
 Usage: dolfin-convert [OPTIONS] ... input.x output.y
 
 Options:
@@ -126,6 +126,6 @@ be deduced from the suffix:
   .exo  - Exodus II
   .ncdf - ncdump'ed Exodus II
   .vrt and .cell  - starcd
-"""
+""")
 if __name__ == "__main__":
     main(sys.argv[1:])
--- a/scripts/dolfin-order/dolfin-order
+++ b/scripts/dolfin-order/dolfin-order
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2008 Anders Logg
 #
@@ -33,7 +33,7 @@ def main(args):
 
     # Convert each mesh
     for filename in args:
-        print "Ordering %s" % filename
+        print("Ordering %s" % filename)
 
         # Read and order mesh
         mesh = Mesh(filename)
@@ -54,7 +54,7 @@ def main(args):
 
 def usage():
     "Print usage instructions"
-    print "Usage: dolfin-order mesh0.xml[.gz] [mesh1.xml[.gz] mesh2.xml[.gz] ...]"
+    print("Usage: dolfin-order mesh0.xml[.gz] [mesh1.xml[.gz] mesh2.xml[.gz] ...]")
 
 if __name__ == "__main__":
     main(sys.argv[1:])
--- a/scripts/dolfin-plot/dolfin-plot
+++ b/scripts/dolfin-plot/dolfin-plot
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 "Script for simple command-line plotting."
 
@@ -30,9 +30,9 @@ import sys
 try:
     from dolfin import *
 except:
-    print """\
+    print("""\
 Unable to import DOLFIN. The DOLFIN Python module is required
-to run this script. Check that DOLFIN is in your PYTHONPATH."""
+to run this script. Check that DOLFIN is in your PYTHONPATH.""")
     sys.exit(1)
 
 def usage():
@@ -46,7 +46,7 @@ def usage():
         else:
             element_list += ("   %s (*)\n" % e)
 
-    print """\
+    print("""\
 Usage:
 
 1. dolfin-plot <meshfile>
@@ -73,7 +73,7 @@ List of supported element families:
 %s
 A (*) indicates that the element is not supported by DOLFIN/FFC,
 but the element may still be plotted.
-""" % element_list
+""" % element_list)
 
 # Check command-line arguments
 if len(sys.argv) < 2:
@@ -93,15 +93,15 @@ options = dict([arg.split("=") for arg i
 if len(args) == 1:
 
     # Read mesh
-    print "Reading mesh from file '%s'." % args[0]
+    print("Reading mesh from file '%s'." % args[0])
     try:
         mesh = Mesh(args[0])
     except:
-        print "Unable to read mesh from file."
+        print("Unable to read mesh from file.")
         sys.exit(1)
 
     # Plot mesh
-    print "Plotting mesh."
+    print("Plotting mesh.")
     plot(mesh, title="Mesh", interactive=True)
 
     sys.exit(0)
@@ -120,7 +120,7 @@ if len(args) in (2, 3, 4):
 
 
     # Create element
-    print "Creating finite element."
+    print("Creating finite element.")
 
     if len(args) == 3 or len(args) == 2:
         element = FiniteElement(family, domain, degree)
@@ -139,7 +139,7 @@ if len(args) in (2, 3, 4):
         rotate = int(options["rotate"])
 
     # Plot element
-    print "Plotting finite element."
+    print("Plotting finite element.")
     plot(element, rotate=rotate)
 
     sys.exit(0)
--- a/site-packages/dolfin_utils/meshconvert/meshconvert.py
+++ b/site-packages/dolfin_utils/meshconvert/meshconvert.py
@@ -98,8 +98,8 @@ def mesh2xml(ifilename, ofilename):
     print("Converting from Medit format (.mesh) to DOLFIN XML format")
 
     # Open files
-    ifile = open(ifilename, "r")
-    ofile = open(ofilename, "w")
+    ifile = open(ifilename, "r", encoding='UTF-8')
+    ofile = open(ofilename, "w", encoding='UTF-8')
 
     # Scan file for cell type
     cell_type = None
@@ -254,7 +254,7 @@ def gmsh2xml(ifilename, handler):
     supported_gmsh_element_types = [1, 2, 4, 15]
 
     # Open files
-    ifile = open(ifilename, "r")
+    ifile = open(ifilename, "r", encoding='UTF-8')
 
     # Scan file for cell type
     cell_type = None
@@ -531,11 +531,11 @@ def triangle2xml(ifilename, ofilename):
     for suffix in [".node", ".ele"]:
         if suffix in ifilename and ifilename[-len(suffix):] == suffix:
             ifilename = ifilename.replace(suffix, "")
-    node_file = open(ifilename+".node", "r")
-    ele_file =  open(ifilename+".ele", "r")
-    ofile = open(ofilename, "w")
+    node_file = open(ifilename+".node", "r", encoding='UTF-8')
+    ele_file =  open(ifilename+".ele", "r", encoding='UTF-8')
+    ofile = open(ofilename, "w", encoding='UTF-8')
     try:
-        edge_file = open(ifilename+".edge", "r")
+        edge_file = open(ifilename+".edge", "r", encoding='UTF-8')
         print("Found .edge file")
     except IOError:
         edge_file = None
@@ -616,7 +616,7 @@ def triangle2xml(ifilename, ofilename):
     xml_writer.write_footer_mesh(ofile)
     for i in range(attrs):
         afilename = ofilename.replace(".xml", ".attr"+str(i)+".xml")
-        afile = open(afilename, "w")
+        afile = open(afilename, "w", encoding='UTF-8')
         xml_writer.write_header_meshfunction2(afile)
         xml_writer.write_header_meshvaluecollection(afile, \
                              "triangle attribs "+str(i), 2, num_tris, "double")
@@ -642,8 +642,8 @@ def xml_old2xml(ifilename, ofilename):
     print("Converting from old (pre DOLFIN 0.6.2) to new DOLFIN XML format...")
 
     # Open files
-    ifile = open(ifilename, "r")
-    ofile = open(ofilename, "w")
+    ifile = open(ifilename, "r", encoding='UTF-8')
+    ofile = open(ofilename, "w", encoding='UTF-8')
 
     # Scan file for cell type (assuming there is just one)
     cell_type = None
@@ -708,8 +708,8 @@ def metis_graph2graph_xml(ifilename, ofi
     print("Converting from Metis graph format to DOLFIN Graph XML.")
 
     # Open files
-    ifile = open(ifilename, "r")
-    ofile = open(ofilename, "w")
+    ifile = open(ifilename, "r", encoding='UTF-8')
+    ofile = open(ofilename, "w", encoding='UTF-8')
 
     # Read number of vertices and edges
     line = ifile.readline()
@@ -752,8 +752,8 @@ def scotch_graph2graph_xml(ifilename, of
     print("Converting from Scotch graph format to DOLFIN Graph XML.")
 
     # Open files
-    ifile = open(ifilename, "r")
-    ofile = open(ofilename, "w")
+    ifile = open(ifilename, "r", encoding='UTF-8')
+    ofile = open(ofilename, "w", encoding='UTF-8')
 
     # Skip graph file version number
     ifile.readline()
@@ -824,8 +824,8 @@ def diffpack2xml(ifilename, ofilename):
     meshfunction_footer = "  </mesh_function>\n</dolfin>"
 
     # Open files
-    ifile = open(ifilename, "r")
-    ofile = open(ofilename, "w")
+    ifile = open(ifilename, "r", encoding='UTF-8')
+    ofile = open(ofilename, "w", encoding='UTF-8')
 
     # Read and analyze header
     while 1:
@@ -871,7 +871,8 @@ def diffpack2xml(ifilename, ofilename):
     unique_vertex_markers.difference_update([0])
     for unique_marker in unique_vertex_markers:
         ofile_marker = open(ofilename.replace(".xml", "") + \
-                            "_marker_" + str(unique_marker)+".xml", "w")
+                            "_marker_" + str(unique_marker)+".xml", "w",
+                            encoding='UTF-8')
         xml_writer.write_header_meshfunction(ofile_marker, 0, num_vertices)
         for ind, markers in enumerate(vertex_markers):
             if unique_marker in markers:
@@ -1074,7 +1075,7 @@ class XmlHandler(DataHandler):
     def __init__(self, ofilename):
         DataHandler.__init__(self)
         self._ofilename = ofilename
-        self.__ofile = file(ofilename, "wb")
+        self.__ofile = open(ofilename, "w", encoding='UTF-8')
         self.__ofile_meshfunc = None
 
     def ofile(self):
@@ -1118,7 +1119,7 @@ class XmlHandler(DataHandler):
     def start_meshfunction(self, name, dim, size):
         DataHandler.start_meshfunction(self, name, dim, size)
         fname = os.path.splitext(self.__ofile.name)[0]
-        self.__ofile_meshfunc = file("%s_%s.xml" % (fname, name), "wb")
+        self.__ofile_meshfunc = open("%s_%s.xml" % (fname, name), "w", encoding='UTF-8')
         xml_writer.write_header_meshfunction(self.__ofile_meshfunc, dim, size)
 
     def add_entity_meshfunction(self, index, value):
@@ -1167,8 +1168,8 @@ def netcdf2xml(ifilename,ofilename):
     print("Converting from NetCDF format (.ncdf) to DOLFIN XML format")
 
     # Open files
-    ifile = open(ifilename, "r")
-    ofile = open(ofilename, "w")
+    ifile = open(ifilename, "r", encoding='UTF-8')
+    ofile = open(ofilename, "w", encoding='UTF-8')
 
 
     cell_type = None
@@ -1280,10 +1281,15 @@ def exodus2xml(ifilename,ofilename):
 
     name = ifilename.split(".")[0]
     netcdffilename = name +".ncdf"
-    status, output = get_status_output('ncdump '+ifilename + ' > '+netcdffilename)
+    status, output = get_status_output('ncdump '+ifilename)
+
     if status != 0:
         raise IOError("Something wrong while executing ncdump. Is ncdump "\
               "installed on the system?")
+    else:
+        outfile = open(netcdffilename,"w", encoding='UTF-8')
+        outfile.write(output)
+        outfile.close()
     netcdf2xml(netcdffilename, ofilename)
 
 
@@ -1363,10 +1369,10 @@ def starcd2xml(ifilename, ofilename):
 
 
     # open output file
-    ofile = open(ofilename, "w")
+    ofile = open(ofilename, "w", encoding='UTF-8')
 
     # Open file, the vertices are in a .vrt file
-    ifile = open(ifilename[:-3] + "vrt", "r")
+    ifile = open(ifilename[:-3] + "vrt", "r", encoding='UTF-8')
 
     write_header_mesh(ofile, "tetrahedron", 3)
 
@@ -1397,7 +1403,7 @@ def starcd2xml(ifilename, ofilename):
     xml_writer.write_footer_vertices(ofile)
 
     # Open file, the cells are in a .cel file
-    ifile = open(ifilename[:-3] + "cel", "r")
+    ifile = open(ifilename[:-3] + "cel", "r", encoding='UTF-8')
 
     # Read & write cells

Places

File python3-fixes.patch of Package dolfin (Revision 0351d7e72640b00d12e32fecda0e58b5)

Places