Python: remove ddsix and shims

AIDASoft · Apr 19, 2024 · 6144a4e · 6144a4e
1 parent e250727
commit 6144a4e
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 973 deletions.
diff --git a/.github/scripts/runPythonChecks.sh b/.github/scripts/runPythonChecks.sh
@@ -4,4 +4,4 @@ source /cvmfs/sft.cern.ch/lcg/views/${VIEW}/setup.sh
 cd /Package
 
 echo "RUNNING FLAKE8 CHECK" && \
-find . -name "*.py" -and -not -name 'ddsix.py' -exec flake8 {} +
+find . -name "*.py" -exec flake8 {} +
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -16,4 +16,4 @@ jobs:
         release-platform: ${{ matrix.LCG }}
         run: |
           echo "RUNNING FLAKE8 CHECK"
-          find . -name "*.py" -and -not -name 'ddsix.py' -exec flake8 {} +
+          find . -name "*.py" -exec flake8 {} +
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -71,7 +71,7 @@ Python:
   script:
     - source /cvmfs/sft.cern.ch/lcg/views/LCG_102/x86_64-centos7-gcc11-opt/setup.sh
     - echo "RUNNING FLAKE8 CHECK"
-    - find . -name "*.py" -and -not -name 'ddsix.py' -exec flake8 {} +
+    - find . -name "*.py" -exec flake8 {} +
 
 
 

diff --git a/DDCore/python/dd4hepFactories.py b/DDCore/python/dd4hepFactories.py
@@ -16,7 +16,6 @@
 import optparse
 import logging
 import errno
-from ddsix.moves import input
 from io import open
 
 logger = logging.getLogger(__name__)

diff --git a/DDCore/python/dd4hep_base.py b/DDCore/python/dd4hep_base.py
@@ -113,10 +113,9 @@ def unicode_2_string(value):
 
   :return: always a str
   """
-  import ddsix as six
-  if isinstance(value, (bool, float, six.integer_types)):
+  if isinstance(value, (bool, float, int)):
     value = value
-  elif isinstance(value, six.string_types):
+  elif isinstance(value, str):
     value = str(value)
   elif isinstance(value, bytes):
     value = value.decode()