From 67d2ae740cec65ef7e3c784106e13c22a6ca5eaa Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 17 Jul 2018 23:51:14 +0000 Subject: [PATCH] Drop Python 3.3 support Since wheel 0.30 and later no longer works with Python 3.3, it's increasingly hard to test. Very few old platforms are likely to lack Python 3.4 or later so this is a relatively safe move. Also clean up some 3.3 workarounds as they're no longer needed if we don't support running on it. --- README | 2 +- mudpy/__init__.py | 8 +------- mudpy/daemon.py | 7 +------ setup.cfg | 1 - 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/README b/README index 1e61636..6375283 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ The mudpy project aims to create a simple, generic, cross-platform, freely-redistributable MUD core engine which can be easily understood and extended. It is written in pure Python (currently compatible with -3.3 and later versions) and has only pure Python dependencies. All +3.4 and later versions) and has only pure Python dependencies. All configuration and data are stored in consistently-formatted plain text (YAML 1.1) files for ease of administration. The core engine is unicode-clean internally and supports UTF-8 encoding for input and diff --git a/mudpy/__init__.py b/mudpy/__init__.py index 8c12ee2..c148bda 100644 --- a/mudpy/__init__.py +++ b/mudpy/__init__.py @@ -4,16 +4,10 @@ # to use, copy, modify, and distribute this software is granted under # terms provided in the LICENSE file distributed with this software. -import sys +import importlib # noqa (referenced via exec of string literal below) import mudpy # noqa (referenced via exec of string literal below) -if sys.version_info >= (3, 4): - import importlib # noqa (referenced via exec of string literal below) -else: - # Python 3.3 lacks importlib.reload() - import imp as importlib # noqa (referenced via exec of string literal) - def load(): """Import/reload some modules (be careful, as this can result in loops).""" diff --git a/mudpy/daemon.py b/mudpy/daemon.py index 952831f..436a5ef 100644 --- a/mudpy/daemon.py +++ b/mudpy/daemon.py @@ -3,16 +3,11 @@ # terms provided in the LICENSE file distributed with this software. # core objects for the mudpy engine +import importlib import sys import mudpy -if sys.version_info >= (3, 4): - import importlib -else: - # Python 3.3 lacks importlib.reload() - import imp as importlib - def main(): diff --git a/setup.cfg b/setup.cfg index 87801ab..1e50cc8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,7 +28,6 @@ classifier = Operating System :: Unix Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.3 Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 -- 2.11.0