Merge pull request #79 from Tieqiong/six

Remove six usage

Author: sbillinge

README.rst

@@ -66,7 +66,7 @@ by citing the following paper in your publication:
 Requirements
 ------------------------------------------------------------------------
 
-The diffpy.structure package requires Python 3.7 or later or 2.7 and
+The diffpy.structure package requires Python 3.7 or later and
 the following software:
 
 * ``setuptools`` - software distribution tools for Python

requirements/run.txt

@@ -1,3 +1,2 @@
 numpy < 2.0.0  # Need to fix deprecations before 2.0.0 compat
 pycifrw
-six

src/diffpy/structure/_legacy_importer.py

@@ -25,24 +25,10 @@
 """
 
 
+import importlib.abc
 import sys
 from warnings import warn
 
-import six
-
-if six.PY2:
-    import importlib
-
-    class mock_importlib_abc(object):
-        MetaPathFinder = object
-        Loader = object
-
-    importlib.abc = mock_importlib_abc
-    sys.modules.setdefault("importlib.abc", mock_importlib_abc)
-    del mock_importlib_abc
-
-import importlib.abc
-
 WMSG = "Module {!r} is deprecated.  Use {!r} instead."
 
 # ----------------------------------------------------------------------------
@@ -63,15 +49,6 @@ def find_spec(self, fullname, path=None, target=None):
             spec.loader = MapRenamedStructureModule()
         return spec
 
-    if six.PY2:
-
-        def find_module(self, fullname, path):
-            # only handle submodules of diffpy.Structure
-            loader = None
-            if fullname.startswith(self.prefix):
-                loader = MapRenamedStructureModule()
-            return loader
-
 
 # end of class FindRenamedStructureModule
 
@@ -95,15 +72,6 @@ def create_module(self, spec):
     def exec_module(self, module):
         return
 
-    if six.PY2:
-        from collections import namedtuple
-
-        ModuleSpec = namedtuple("ModuleSpec", "name")
-
-        def load_module(self, fullname):
-            spec = self.ModuleSpec(fullname)
-            return self.create_module(spec)
-
 
 # end of class MapRenamedStructureModule
 

src/diffpy/structure/atom.py

@@ -18,7 +18,6 @@
 """
 
 import numpy
-import six
 
 from diffpy.structure.lattice import cartesian as cartesian_lattice
 
@@ -558,15 +557,5 @@ def __array_wrap__(self, out_arr, context=None):
         """
         return out_arr.view(numpy.ndarray)
 
-    # Python 2 Compatibility -------------------------------------------------
-
-    if six.PY2:
-
-        def __setslice__(self, lo, hi, sequence):
-            self.__setitem__(slice(lo, hi), sequence)
-            return
-
-    # ------------------------------------------------------------------------
-
 
 # End of _AtomCartesianCoordinates

src/diffpy/structure/parsers/p_cif.py

@@ -18,12 +18,12 @@
 https://www.iucr.org/resources/cif
 """
 
+import io
 import re
 import sys
 from contextlib import contextmanager
 
 import numpy
-import six
 
 from diffpy.structure import Atom, Lattice, Structure
 from diffpy.structure.parsers import StructureParser
@@ -297,7 +297,7 @@ def parse(self, s):
         """
         self.ciffile = None
         self.filename = ""
-        fp = six.StringIO(s)
+        fp = io.StringIO(s)
         rv = self._parseCifDataSource(fp)
         return rv
 
@@ -363,7 +363,7 @@ def _parseCifDataSource(self, datasource):
             exc_type, exc_value, exc_traceback = sys.exc_info()
             emsg = str(err).strip()
             e = StructureFormatError(emsg)
-            six.reraise(StructureFormatError, e, exc_traceback)
+            raise e.with_traceback(exc_traceback)
         return self.stru
 
     def _parseCifBlock(self, blockname):
@@ -412,7 +412,7 @@ def _parse_lattice(self, block):
             exc_type, exc_value, exc_traceback = sys.exc_info()
             emsg = str(err)
             e = StructureFormatError(emsg)
-            six.reraise(StructureFormatError, e, exc_traceback)
+            raise e.with_traceback(exc_traceback)
         self.stru.lattice = Lattice(*latpars)
         return
 

src/diffpy/structure/parsers/p_discus.py

@@ -19,8 +19,6 @@
 import sys
 from functools import reduce
 
-import six
-
 from diffpy.structure import Lattice, PDFFitStructure
 from diffpy.structure.parsers import StructureParser
 from diffpy.structure.structureerrors import StructureFormatError
@@ -100,7 +98,7 @@ def parseLines(self, lines):
             exc_type, exc_value, exc_traceback = sys.exc_info()
             emsg = "%d: file is not in DISCUS format" % self.nl
             e = StructureFormatError(emsg)
-            six.reraise(StructureFormatError, e, exc_traceback)
+            raise e.with_traceback(exc_traceback)
         return self.stru
 
     def toLines(self, stru):

src/diffpy/structure/parsers/p_pdb.py

@@ -24,7 +24,6 @@
 import sys
 
 import numpy
-import six
 from numpy import pi
 
 from diffpy.structure import Structure
@@ -225,7 +224,7 @@ def parseLines(self, lines):
             emsg = "%d: invalid PDB record" % p_nl
             exc_type, exc_value, exc_traceback = sys.exc_info()
             e = StructureFormatError(emsg)
-            six.reraise(StructureFormatError, e, exc_traceback)
+            raise e.with_traceback(exc_traceback)
         return stru
 
     def titleLines(self, stru):

src/diffpy/structure/parsers/p_pdffit.py

@@ -20,7 +20,6 @@
 from functools import reduce
 
 import numpy
-import six
 
 from diffpy.structure import Lattice, PDFFitStructure
 from diffpy.structure.parsers import StructureParser
@@ -158,7 +157,7 @@ def parseLines(self, lines):
             emsg = "%d: file is not in PDFfit format" % p_nl
             exc_type, exc_value, exc_traceback = sys.exc_info()
             e = StructureFormatError(emsg)
-            six.reraise(StructureFormatError, e, exc_traceback)
+            raise e.with_traceback(exc_traceback)
         return stru
 
     def toLines(self, stru):

src/diffpy/structure/parsers/p_rawxyz.py

@@ -20,8 +20,6 @@
 
 import sys
 
-import six
-
 from diffpy.structure import Structure
 from diffpy.structure.parsers import StructureParser
 from diffpy.structure.structureerrors import StructureFormatError
@@ -91,7 +89,7 @@ def parseLines(self, lines):
             emsg = "%d: invalid number" % p_nl
             exc_type, exc_value, exc_traceback = sys.exc_info()
             e = StructureFormatError(emsg)
-            six.reraise(StructureFormatError, e, exc_traceback)
+            raise e.with_traceback(exc_traceback)
         return stru
 
     def toLines(self, stru):

src/diffpy/structure/parsers/p_xcfg.py

@@ -19,7 +19,6 @@
 import sys
 
 import numpy
-import six
 
 from diffpy.structure import Structure
 from diffpy.structure.parsers import StructureParser
@@ -260,7 +259,7 @@ def parseLines(self, lines):
             emsg = "%d: file is not in XCFG format" % p_nl
             exc_type, exc_value, exc_traceback = sys.exc_info()
             e = StructureFormatError(emsg)
-            six.reraise(StructureFormatError, e, exc_traceback)
+            raise e.with_traceback(exc_traceback)
         return stru
 
     def toLines(self, stru):