Merge pull request #317 from sn6uv/py3

Python3 support

.pep8

@@ -1,3 +1,3 @@
 [pep8]
 ignore = E501,W291
-exclude = parsetab.py,magic.py
+exclude = parsetab.py,magic.py,build/,.tox/

.travis.yml

@@ -2,31 +2,44 @@ language: python
 python:
   - 2.7
   - pypy
+  - 3.5
+  - 3.4
+  - 3.3
+  - 3.2
+  - pypy3
 env:
-  - SYMPY_SRC=sympy-0.7.5
-  - SYMPY_SRC=sympy-0.7.6
-  - SYMPY_SRC=master
+  global:
+    - SYMPY_SRC=sympy-0.7.6
+    - DOC="false"
+  matrix:
+    - CYTHON="false"
+    - CYTHON="true"
 matrix:
-    fast_finish: true
-    include:
-      - python: 2.7
-        env:
-          - SYMPY_SRC=sympy-0.7.6
-          - TEST_DOC="true"
-      - python: 2.7
-        env:
-          - SYMPY_SRC=sympy-0.7.6
-          - CYTHON="true"
-    allow_failures:
-      - env: SYMPY_SRC=sympy-0.7.5
-      - env: SYMPY_SRC=master
-      - env:
-          - SYMPY_SRC=sympy-0.7.6
-          - TEST_DOC="true"
+  fast_finish: true
+  include:
+    - python: 2.7
+      env: DOC="true" CYTHON="false"
+    - python: 3.5
+      env: DOC="true" CYTHON="false"
+    - python: 2.7
+      env: SYMPY_SRC=master CYTHON="false"
+    - python: 3.5
+      env: SYMPY_SRC=master CYTHON="false"
+  exclude:
+    # PyPy is not compatible with Cython
+    - python: pypy
+      env: CYTHON="true"
+    - python: pypy3
+      env: CYTHON="true"
+  allow_failures:
+    - python: 3.2
+    - python: pypy3
+    - env: SYMPY_SRC=master CYTHON="false"
+    - env: DOC="true" CYTHON="false"
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
-  - if [[ "$TEST_DOC" == "true" ]]; then
+  - if [[ "$DOC" == "true" ]]; then
       sudo apt-get update -qq &&
       sudo apt-get install -qq asymptote imagemagick texlive-latex-extra texlive-latex3 texlive-fonts-recommended latexmk;
     fi
@@ -38,10 +51,10 @@ before_install:
   - pip install git+https://github.com/sympy/sympy.git@$SYMPY_SRC
 install:
   - sed -i "s/'sympy==[0-9]\.[0-9]\.[0-9]', //" setup.py
-  - if [[ "$TEST_DOC" == "true" ]]; then python setup.py develop; else python setup.py install; fi
+  - if [[ "$DOC" == "true" ]]; then python setup.py develop; else python setup.py install; fi
 script:
   - python setup.py test
-  - if [[ "$TEST_DOC" == "true" ]]; then
+  - if [[ "$DOC" == "true" ]]; then
       python mathics/test.py -o &&
       python mathics/test.py -t &&
       cd mathics/doc/ &&

mathics/__init__.py

@@ -1,10 +1,16 @@
-# -*- coding: utf8 -*-
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import absolute_import
 
-# force utf8 encoding
 import sys
-import codecs
-writer = codecs.getwriter("utf-8")
-sys.stdout = writer(sys.stdout)
+import platform
+import sympy
+import mpmath
+import django
+import six
 
 from mathics.version import __version__
 from mathics.core.expression import (
@@ -13,51 +19,36 @@
 from mathics.core.convert import from_sympy
 
 
-def get_version():
-    version = {}
-
-    import sympy
-    import mpmath
+if six.PY2:
+    import codecs
+    writer = codecs.getwriter("utf-8")
+    sys.stdout = writer(sys.stdout)
 
-    from django.core.exceptions import ImproperlyConfigured
 
-    try:
-        import django
-        from django.conf import settings
-        version['django'] = django.get_version()
-    except (ImportError, ImproperlyConfigured):
-        pass
-    version['mathics'] = __version__
-    version['sympy'] = sympy.__version__
-    version['mpmath'] = mpmath.__version__
-    version['python'] = sys.subversion[0] + " " + sys.version.split('\n')[0]
-    return version
+version_info = {
+    'mathics': __version__,
+    'sympy': sympy.__version__,
+    'mpmath': mpmath.__version__,
+    'python': platform.python_implementation() + " " + sys.version.split('\n')[0],
+    'django': django.__version__,
+}
 
 
-def get_version_string(is_server, newlines=False):
-    version = get_version()
-    result = []
-    result.append(u"Mathics %s" % version['mathics'])
-    result.append(u"on %s" % version['python'])
-    libs = []
-    if 'django' in version and is_server:
-        libs.append("Django %s" % version['django'])
-    libs += ["SymPy %s" % version['sympy'], "mpmath %s" % version['mpmath']]
-    result.append(u"using %s" % ", ".join(libs))
-    return ("\n" if newlines else " ").join(result)
+version_string = '''Mathics {mathics}
+on {python}
+using SymPy {sympy}, mpmath {mpmath}'''.format(**version_info)
 
 
-def print_version(is_server):
-    print "\n" + get_version_string(is_server, newlines=True)
+server_version_string = version_string + ', django {django}'.format(**version_info)
 
 
-def print_license():
-    print u"""
-Copyright (C) 2011-2013 The Mathics Team.
+license_string = '''\
+Copyright (C) 2011-2016 The Mathics Team.
 This program comes with ABSOLUTELY NO WARRANTY.
 This is free software, and you are welcome to redistribute it
 under certain conditions.
-See the documentation for the full license.
-"""
+See the documentation for the full license.'''
+
 
-from mathics.core.parser import parse, ScanError, ParseError
+# this import is last to handle a circlular dependency on version_string
+from mathics.core.parser import parse, ScanError, ParseError    # nopep8

mathics/benchmark.py

@@ -1,22 +1,22 @@
-# -*- coding: utf8 -*-
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
-u"""
-    Mathics: a general-purpose computer algebra system
-    Copyright (C) 2011-2013 The Mathics Team
+from __future__ import unicode_literals
+from __future__ import print_function
+from __future__ import absolute_import
 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+import sys
+import time
+from argparse import ArgumentParser
 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+import mathics
+from mathics.core.parser import parse
+from mathics.core.definitions import Definitions
+from mathics.core.evaluation import Evaluation
+
+from six.moves import map
+from six.moves import range
 
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
 
 # Default number of times to repeat each benchmark. None -> Automatic
 TESTS_PER_BENCHMARK = None
@@ -64,15 +64,6 @@
     "Sin[" * 1000 + '0.5' + "]" * 1000,
 ]
 
-import sys
-import time
-from argparse import ArgumentParser
-
-import mathics
-from mathics.core.parser import parse
-from mathics.core.definitions import Definitions
-from mathics.core.evaluation import Evaluation
-
 definitions = Definitions(add_builtin=True)
 evaluation = None
 
@@ -96,13 +87,13 @@ def timeit(func, repeats=None):
     times = []
     if repeats is not None:
         # Fixed number of repeats
-        for i in xrange(repeats):
+        for i in range(repeats):
             times.append(time.clock())
             func()
     else:
         # Automatic number of repeats
         repeats = 10000
-        for i in xrange(repeats):
+        for i in range(repeats):
             times.append(time.clock())
             func()
             if any(i == j for j in (5, 10, 100, 1000, 5000)):
@@ -115,8 +106,8 @@ def timeit(func, repeats=None):
     average_time = format_time_units((times[-1] - times[0]) / repeats)
     best_time = format_time_units(
         min([times[i + 1] - times[i] for i in range(repeats)]))
-    print "    {0:5n} loops, avg: {1} per loop, best: {2} per loop".format(
-        repeats, average_time, best_time)
+    print("    {0:5n} loops, avg: {1} per loop, best: {2} per loop".format(
+        repeats, average_time, best_time))
 
 
 def truncate_line(string):
@@ -126,34 +117,34 @@ def truncate_line(string):
 
 
 def benchmark_parse(expression_string):
-    print "  '{0}'".format(truncate_line(expression_string))
+    print("  '{0}'".format(truncate_line(expression_string)))
     timeit(lambda: parse(expression_string, definitions))
 
 
 def benchmark_format(expression_string):
-    print "  '{0}'".format(expression_string)
+    print("  '{0}'".format(expression_string))
     expr = parse(expression_string, definitions)
     timeit(lambda: expr.default_format(evaluation, "FullForm"))
 
 
 def benchmark_expression(expression_string):
-    print "  '{0}'".format(expression_string)
+    print("  '{0}'".format(expression_string))
     expr = parse(expression_string, definitions)
     timeit(lambda: expr.evaluate(evaluation))
 
 
 def benchmark_section(section_name):
-    print section_name
+    print(section_name)
     for benchmark in BENCHMARKS.get(section_name):
         benchmark_expression(benchmark)
-    print ""
+    print()
 
 
 def benchmark_all():
-    print "EVALUATION BENCHMARKS:"
+    print("EVALUATION BENCHMARKS:")
     for section_name in sorted(BENCHMARKS.keys()):
         benchmark_section(section_name)
-    print "PARSING BENCHMARKS:"
+    print("PARSING BENCHMARKS:")
     for expression_string in PARSING_BENCHMARKS:
         benchmark_parse(expression_string)
 
@@ -186,8 +177,8 @@ def main():
 
     try:
         evaluation = Evaluation("", definitions, catch_interrupt=False)
-    except Exception, exc:
-        print "Exception {0}".format(exc)
+    except Exception as exc:
+        print("Exception {0}".format(exc))
         info = sys.exc_info()
         sys.excepthook(*info)
         sys.exit(-1)

mathics/builtin/__init__.py

@@ -1,22 +1,8 @@
-# -*- coding: utf8 -*-
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
-u"""
-    Mathics: a general-purpose computer algebra system
-    Copyright (C) 2011-2013 The Mathics Team
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""
+from __future__ import unicode_literals
+from __future__ import absolute_import
 
 from mathics.builtin import (
     algebra, arithmetic, assignment, attributes, calculus, combinatorial,
@@ -57,11 +43,11 @@ def is_builtin(var):
     vars = dir(module)
     for name in vars:
         var = getattr(module, name)
-        if (hasattr(var, '__module__')
-                and var.__module__.startswith('mathics.builtin.')
-                and var.__module__ != 'mathics.builtin.base'
-                and is_builtin(var) and not name.startswith('_')
-                and var.__module__ == module.__name__):
+        if (hasattr(var, '__module__') and
+            var.__module__.startswith('mathics.builtin.') and
+            var.__module__ != 'mathics.builtin.base' and
+            is_builtin(var) and not name.startswith('_') and
+            var.__module__ == module.__name__):     # nopep8
 
             instance = var(expression=False)
 

mathics/builtin/algebra.py

@@ -1,11 +1,16 @@
-# -*- coding: utf8 -*-
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+from __future__ import absolute_import
 
 from mathics.builtin.base import Builtin
 from mathics.core.expression import Expression, Integer
 from mathics.core.convert import from_sympy
 
 import sympy
 import mpmath
+from six.moves import range
 
 
 def sympy_factor(expr_sympy):