From 3975aaceb20746303e3b684efa05021b54aaed68 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Sun, 16 Dec 2018 13:33:56 -0500 Subject: [PATCH] Move Python 2 libs to `libs/py2` --- core/__init__.py | 4 ++++ libs/{ => py2}/backports/__init__.py | 0 libs/{ => py2}/backports/functools_lru_cache.py | 0 libs/{ => py2}/concurrent/__init__.py | 0 libs/{ => py2}/concurrent/futures/__init__.py | 0 libs/{ => py2}/concurrent/futures/_base.py | 0 libs/{ => py2}/concurrent/futures/process.py | 0 libs/{ => py2}/concurrent/futures/thread.py | 0 libs/{ => py2}/enum/LICENSE | 0 libs/{ => py2}/enum/README | 0 libs/{ => py2}/enum/__init__.py | 0 requirements-py2.txt => libs/requirements-py2.txt | 0 12 files changed, 4 insertions(+) rename libs/{ => py2}/backports/__init__.py (100%) rename libs/{ => py2}/backports/functools_lru_cache.py (100%) rename libs/{ => py2}/concurrent/__init__.py (100%) rename libs/{ => py2}/concurrent/futures/__init__.py (100%) rename libs/{ => py2}/concurrent/futures/_base.py (100%) rename libs/{ => py2}/concurrent/futures/process.py (100%) rename libs/{ => py2}/concurrent/futures/thread.py (100%) rename libs/{ => py2}/enum/LICENSE (100%) rename libs/{ => py2}/enum/README (100%) rename libs/{ => py2}/enum/__init__.py (100%) rename requirements-py2.txt => libs/requirements-py2.txt (100%) diff --git a/core/__init__.py b/core/__init__.py index 07f7260b..fe9ffc53 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -24,6 +24,10 @@ sys.path.insert(0, LIBS_DIR_COMMON) LIBS_DIR_CUSTOM = os.path.join(LIBS_DIR, 'custom') sys.path.insert(0, LIBS_DIR_CUSTOM) +if sys.version_info[0] == 2: + LIBS_DIR_PY2 = os.path.join(LIBS_DIR, 'py2') + sys.path.insert(0, LIBS_DIR_PY2) + # init preliminaries SYS_ARGV = sys.argv[1:] APP_FILENAME = sys.argv[0] diff --git a/libs/backports/__init__.py b/libs/py2/backports/__init__.py similarity index 100% rename from libs/backports/__init__.py rename to libs/py2/backports/__init__.py diff --git a/libs/backports/functools_lru_cache.py b/libs/py2/backports/functools_lru_cache.py similarity index 100% rename from libs/backports/functools_lru_cache.py rename to libs/py2/backports/functools_lru_cache.py diff --git a/libs/concurrent/__init__.py b/libs/py2/concurrent/__init__.py similarity index 100% rename from libs/concurrent/__init__.py rename to libs/py2/concurrent/__init__.py diff --git a/libs/concurrent/futures/__init__.py b/libs/py2/concurrent/futures/__init__.py similarity index 100% rename from libs/concurrent/futures/__init__.py rename to libs/py2/concurrent/futures/__init__.py diff --git a/libs/concurrent/futures/_base.py b/libs/py2/concurrent/futures/_base.py similarity index 100% rename from libs/concurrent/futures/_base.py rename to libs/py2/concurrent/futures/_base.py diff --git a/libs/concurrent/futures/process.py b/libs/py2/concurrent/futures/process.py similarity index 100% rename from libs/concurrent/futures/process.py rename to libs/py2/concurrent/futures/process.py diff --git a/libs/concurrent/futures/thread.py b/libs/py2/concurrent/futures/thread.py similarity index 100% rename from libs/concurrent/futures/thread.py rename to libs/py2/concurrent/futures/thread.py diff --git a/libs/enum/LICENSE b/libs/py2/enum/LICENSE similarity index 100% rename from libs/enum/LICENSE rename to libs/py2/enum/LICENSE diff --git a/libs/enum/README b/libs/py2/enum/README similarity index 100% rename from libs/enum/README rename to libs/py2/enum/README diff --git a/libs/enum/__init__.py b/libs/py2/enum/__init__.py similarity index 100% rename from libs/enum/__init__.py rename to libs/py2/enum/__init__.py diff --git a/requirements-py2.txt b/libs/requirements-py2.txt similarity index 100% rename from requirements-py2.txt rename to libs/requirements-py2.txt