Merge f3d2eb2f22c6f134d563e7a2cfc72439f20fc36e into 95e152d6cb8f58f9efdd5de436a0fe50b171a6bd

This reverts commit ca02d12fc6eb201f05a1346612a3adfa0b83fb26.

.github/workflows/main.yml

@@ -2,13 +2,72 @@ name: Run all tests
 
 on: [push, pull_request]
 
+env:
+  PIP: "env PIP_DISABLE_PIP_VERSION_CHECK=1
+            PYTHONWARNINGS=ignore:DEPRECATION
+            pip --no-cache-dir"
+
 jobs:
-  build:
+  tests_py27:
+    runs-on: ubuntu-20.04
+    container: python:2.7
+    strategy:
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Show Python version
+      run: python -V
+
+    - name: Install dependencies
+      run: $PIP install setuptools
+
+    - name: Run the tests
+      run: python setup.py test -q
+
+  build_py34:
+    runs-on: ubuntu-20.04
+    container: python:3.4
+    strategy:
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Show Python version
+      run: python -V
+
+    - name: Install dependencies
+      run: $PIP install setuptools
+
+    - name: Run the tests
+      run: python setup.py test -q
+
+  build_py35:
+    runs-on: ubuntu-20.04
+    container: python:3.5
+    strategy:
+      fail-fast: false
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Show Python version
+      run: python -V
+
+    - name: Install dependencies
+      run: $PIP install setuptools
+
+    - name: Run the tests
+      run: python setup.py test -q
+
+  build_py3x:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", 3.11]
-        os: [ubuntu-20.04, windows-2019]
+        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", 3.11, 3.12]
+        os: [ubuntu-20.04]
 
     runs-on: ${{ matrix.os }}
 
@@ -23,5 +82,8 @@ jobs:
     - name: Show Python version
       run: python -V
 
+    - name: Install dependencies
+      run: $PIP install setuptools
+
     - name: Run the tests
       run: python setup.py test -q

CHANGES.rst

@@ -1,9 +1,6 @@
-2.0.0.dev0 (Next Release)
+1.2.0.dev0 (Next Release)
 -------------------------
 
-- Support for some older Python versions has been dropped.  Py65
-  now requires Python 3.6 or later.
-
 - Fixed a bug with character input that would cause characters to be
   dropped when pasting in larger amounts of text.  This makes it possible
   to paste programs into EhBASIC and Taliforth.  Patch by SamCoVT.
@@ -22,6 +19,8 @@
 - Fixed assembly and disassembly of 65C02 instruction $64 (``STZ $12``).
   Patch by Patrick Surry.
 
+- Removed use of the ``asyncore`` module deprecated in Python 3.10.
+
 1.1.0 (2018-07-01)
 ------------------
 

README.rst

@@ -20,9 +20,9 @@ Installation
 
 Py65 packages are `available <http://pypi.python.org/pypi/py65>`_ on the
 Python Package Index (PyPI).  You download them from there or you can
-use ``pip3`` to automatically install or upgrade Py65::
+use ``pip`` to install Py65::
 
-    $ pip3 install -U py65
+    $ pip install setuptools py65
 
 Devices
 -------

py65/monitor.py

@@ -22,8 +22,6 @@ import shlex
 import sys
 import traceback
 
-from urllib.request import urlopen
-
 from py65.devices.mpu6502 import MPU as NMOS6502
 from py65.devices.mpu65c02 import MPU as CMOS65C02
 from py65.devices.mpu65org16 import MPU as V65Org16
@@ -34,6 +32,11 @@ from py65.utils import console
 from py65.utils.conversions import itoa
 from py65.memory import ObservableMemory
 
+try:
+    from urllib2 import urlopen
+except ImportError: # Python 3
+    from urllib.request import urlopen
+
 class Monitor(cmd.Cmd):
 
     Microprocessors = {'6502': NMOS6502, '65C02': CMOS65C02,
@@ -153,6 +156,7 @@ class Monitor(cmd.Cmd):
         self._output(usage)
 
     def onecmd(self, line):
+        if line:
             line = self._preprocess_line(line)
 
         result = None
@@ -164,7 +168,7 @@ class Monitor(cmd.Cmd):
             error = ''.join(traceback.format_exception(e))
             self._output(error)
 
-        if not line.startswith("quit"):
+        if line and not line.startswith("quit"):
             self._output_mpu_status()
 
         # Switch back to the previous input mode.

py65/tests/test_monitor.py

@@ -2,11 +2,13 @@ import unittest
 import sys
 import os
 import tempfile
-
-from io import StringIO
-
 from py65.monitor import Monitor
 
+try:
+    from StringIO import StringIO
+except ImportError: # Python 3
+    from io import StringIO
+
 
 class MonitorTests(unittest.TestCase):
 

setup.py

@@ -3,9 +3,14 @@ __version__ = '2.0.0.dev0'
 import sys
 
 py_version = sys.version_info[:2]
+PY3 = py_version[0] == 3
 
-if py_version < (3, 6):
-    raise RuntimeError('On Python 3, Py65 requires Python 3.6 or later')
+if PY3:
+    if py_version < (3, 4):
+        raise RuntimeError('On Python 3, Py65 requires Python 3.4 or later')
+else:
+    if py_version < (2, 7):
+        raise RuntimeError('On Python 2, Py65 requires Python 2.7 or later')
 
 from setuptools import setup, find_packages
 
@@ -19,13 +24,18 @@ CLASSIFIERS = [
     'Natural Language :: English',
     'Operating System :: POSIX',
     'Programming Language :: Python',
+    'Programming Language :: Python :: 2',
+    'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.4',
+    'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
     'Programming Language :: Assembly',
     'Topic :: Software Development :: Assemblers',
     'Topic :: Software Development :: Disassemblers',