Use Python 3 by default

skoolkid · Jan 12, 2017 · 8fa5002 · 8fa5002
1 parent b5f0989
commit 8fa5002
Show file tree

Hide file tree

Showing 19 changed files with 48 additions and 61 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,8 @@ python:
   - 3.5
   - 3.6
 install:
-  - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then pip install codecov; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.4* ]]; then pip install codecov; fi
 script:
-  - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then make test-cover; else make test; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.4* ]]; then make test-cover; else make test; fi
 after_success:
-  - if [[ $TRAVIS_PYTHON_VERSION == 2* ]]; then codecov; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.4* ]]; then codecov; fi
diff --git a/Makefile b/Makefile
@@ -1,3 +1,4 @@
+NOSETESTS ?= nosetests3
 NOSETESTS27 ?= nosetests-2.7
 NOSETESTS34 ?= python3.4 /usr/bin/nosetests
 NOSETESTS35 ?= $(HOME)/Python/Python3.5/bin/nosetests
@@ -15,7 +16,7 @@ usage:
 	@echo "  man           build the man pages"
 	@echo "  clean         clean the documentation and man pages"
 	@echo "  hh            build the Hungry Horace disassembly"
-	@echo "  test[-all]    run core/all tests with current Python interpreter"
+	@echo "  test[-all]    run core/all tests with default Python 3 interpreter"
 	@echo "  test27[-all]  run core/all tests with Python 2.7"
 	@echo "  test3X[-all]  run core/all tests with Python 3.X (4<=X<=6)"
 	@echo "  test-cover    run core tests with coverage info"
@@ -58,11 +59,11 @@ remove-disassembly-tests:
 
 .PHONY: test
 test: remove-disassembly-tests
-	nosetests -w tests
+	$(NOSETESTS) -w tests
 
 .PHONY: test-all
 test-all: write-disassembly-tests
-	nosetests -w tests
+	$(NOSETESTS) -w tests
 
 .PHONY: test%
 test%: remove-disassembly-tests
@@ -74,7 +75,7 @@ test%-all: write-disassembly-tests
 
 .PHONY: test-cover
 test-cover: remove-disassembly-tests
-	nosetests -w tests --with-coverage --cover-package=skoolkit --cover-erase
+	$(NOSETESTS) -w tests --with-coverage --cover-package=skoolkit --cover-erase
 
 .PHONY: release
 release:

diff --git a/bin2sna.py b/bin2sna.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2016 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2016-2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/bin2tap.py b/bin2tap.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2012-2013 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2012-2013, 2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/setup.py b/setup.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 from distutils.core import setup
 
 from skoolkit import VERSION

diff --git a/skool2asm.py b/skool2asm.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2012-2013 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2012-2013, 2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/skool2bin.py b/skool2bin.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2015 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2015, 2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/skool2ctl.py b/skool2ctl.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2012-2013 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2012-2013, 2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/skool2html.py b/skool2html.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2012-2013 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2012-2013, 2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/skool2sft.py b/skool2sft.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2011-2013 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2011-2013, 2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/skoolkit/__init__.py b/skoolkit/__init__.py
@@ -101,8 +101,8 @@ def open_file(fname, mode='r'):
     if fname == '-':
         if 'w' in mode:
             if PY3 and 'b' in mode:
-                return sys.stdout.buffer # pragma: no cover
-            return sys.stdout
+                return sys.stdout.buffer
+            return sys.stdout # pragma: no cover
         return sys.stdin
     try:
         return open(fname, mode)
@@ -117,13 +117,13 @@ def open_file(fname, mode='r'):
 def read_bin_file(fname, size=-1):
     if fname == '-':
         if PY3:
-            return sys.stdin.buffer.read(size) # pragma: no cover
-        return bytearray(sys.stdin.read(size))
+            return sys.stdin.buffer.read(size)
+        return bytearray(sys.stdin.read(size)) # pragma: no cover
     try:
         with open(fname, 'rb') as f:
             if PY3:
-                return f.read(size) # pragma: no cover
-            return bytearray(f.read(size))
+                return f.read(size)
+            return bytearray(f.read(size)) # pragma: no cover
     except IOError as e:
         if e.errno == 2:
             raise SkoolKitError('{0}: file not found'.format(fname))

diff --git a/skoolkit/tap2sna.py b/skoolkit/tap2sna.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright 2013, 2015, 2016 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2013, 2015-2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #
@@ -24,10 +24,10 @@
 import zipfile
 try:
     from urllib2 import urlopen
-    from urlparse import urlparse
-except ImportError:                    # pragma: no cover
-    from urllib.request import urlopen # pragma: no cover
-    from urllib.parse import urlparse  # pragma: no cover
+    from urlparse import urlparse # pragma: no cover
+except ImportError:
+    from urllib.request import urlopen
+    from urllib.parse import urlparse
 
 from skoolkit import SkoolKitError, get_int_param, get_word, get_word3, get_dword, open_file, write_line, VERSION
 from skoolkit.snapshot import set_z80_registers, set_z80_state, make_z80_ram_block, Z80_REGISTERS

diff --git a/sna2img.py b/sna2img.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2016 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2016-2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/sna2skool.py b/sna2skool.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2012-2013 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2012-2013, 2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/snapinfo.py b/snapinfo.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2016 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2016-2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/snapmod.py b/snapmod.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2016 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2016-2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/tap2sna.py b/tap2sna.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2013 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2013, 2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/tapinfo.py b/tapinfo.py
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
-# Copyright 2015 Richard Dymond (rjdymond@gmail.com)
+# Copyright 2015, 2017 Richard Dymond (rjdymond@gmail.com)
 #
 # This file is part of SkoolKit.
 #

diff --git a/tools/disassembly.mk b/tools/disassembly.mk
@@ -15,7 +15,7 @@ usage:
 	@echo "  usage     show this help"
 	@echo "  html      build the HTML disassembly"
 	@echo "  asm       build the ASM disassembly"
-	@echo "  test      run tests with current Python interpreter"
+	@echo "  test      run tests with default Python 3 interpreter"
 	@echo "  test27    run tests with Python 2.7"
 	@echo "  test3X    run tests with Python 3.X (4<=X<=6)"
 	@$(MAKE) -s _targets
@@ -46,7 +46,7 @@ write-tests:
 
 .PHONY: test
 test: write-tests
-	nosetests -w tests
+	nosetests3 -w tests
 
 .PHONY: test%
 test%: write-tests