Merge pull request #1730 from ReactionMechanismGenerator/remove_future

Remove future imports and py2/py3 compatibility imports
ReactionMechanismGenerator · Sep 27, 2019 · 91cdd1d · 91cdd1d
2 parents 788c9c7 + 63a2b4b
commit 91cdd1d
Show file tree

Hide file tree

Showing 79 changed files with 3 additions and 153 deletions.
diff --git a/environment.yml b/environment.yml
@@ -16,7 +16,6 @@ dependencies:
   - coverage
   - cython >=0.25.2
   - ffmpeg
-  - future
   - gprof2dot
   - graphviz
   - h5py

diff --git a/rmg.py b/rmg.py
@@ -31,7 +31,6 @@
 """
 RMG is an automatic chemical mechanism generator. It is awesomely awesome.
 """
-from __future__ import print_function
 
 import os.path
 import logging

diff --git a/rmgpy/chemkin.pyx b/rmgpy/chemkin.pyx
@@ -29,8 +29,6 @@
 This module contains functions for writing of Chemkin input files.
 """
 
-from __future__ import division
-
 import logging
 import math
 import os.path

diff --git a/rmgpy/data/kinetics/database.py b/rmgpy/data/kinetics/database.py
@@ -29,8 +29,6 @@
 ###############################################################################
 
 
-from __future__ import division, print_function
-
 import logging
 import os.path
 from copy import deepcopy

diff --git a/rmgpy/data/kinetics/family.py b/rmgpy/data/kinetics/family.py
@@ -31,8 +31,6 @@
 """
 This module contains functionality for working with kinetics families.
 """
-from __future__ import division
-
 import codecs
 import itertools
 import logging

diff --git a/rmgpy/data/kinetics/groups.py b/rmgpy/data/kinetics/groups.py
@@ -33,8 +33,6 @@
 groups, including support for using group additivity to estimate rate
 coefficients.
 """
-from __future__ import division
-
 import logging
 import math
 import warnings

diff --git a/rmgpy/data/kinetics/kineticsTest.py b/rmgpy/data/kinetics/kineticsTest.py
@@ -28,7 +28,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import print_function
 import os
 import unittest
 

diff --git a/rmgpy/data/kinetics/library.py b/rmgpy/data/kinetics/library.py
@@ -31,7 +31,6 @@
 """
 This module contains functionality for working with kinetics libraries.
 """
-from __future__ import division
 
 import codecs
 import logging

diff --git a/rmgpy/data/solvation.py b/rmgpy/data/solvation.py
@@ -31,8 +31,6 @@
 """
 
 """
-from __future__ import division
-
 import logging
 import math
 import os.path

diff --git a/rmgpy/data/statmech.py b/rmgpy/data/statmech.py
@@ -28,8 +28,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
-
 import logging
 import os.path
 

diff --git a/rmgpy/data/statmechfit.py b/rmgpy/data/statmechfit.py
@@ -32,8 +32,6 @@
 Contains functions for fitting of molecular degrees of freedom from
 macroscopic properties, particularly the heat capacity.
 """
-from __future__ import division
-
 import logging
 import math
 

diff --git a/rmgpy/data/thermo.py b/rmgpy/data/thermo.py
@@ -31,8 +31,6 @@
 """
 
 """
-from __future__ import division
-
 import itertools
 import logging
 import math

diff --git a/rmgpy/data/thermoTest.py b/rmgpy/data/thermoTest.py
@@ -28,8 +28,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
-
 import math
 import os
 import unittest

diff --git a/rmgpy/data/transport.py b/rmgpy/data/transport.py
@@ -32,8 +32,6 @@
 A class for returning and estimating the transport properties of a species
 
 """
-from __future__ import division
-
 import logging
 import os.path
 from copy import deepcopy

diff --git a/rmgpy/kinetics/arrhenius.pyx b/rmgpy/kinetics/arrhenius.pyx
@@ -27,8 +27,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
-
 import numpy as np
 cimport numpy as np
 from libc.math cimport exp, sqrt, log10

diff --git a/rmgpy/kinetics/arrheniusTest.py b/rmgpy/kinetics/arrheniusTest.py
@@ -31,7 +31,6 @@
 """
 This script contains unit tests of the :mod:`rmgpy.kinetics.arrhenius` module.
 """
-from __future__ import division
 
 import math
 import unittest

diff --git a/rmgpy/kinetics/chebyshev.pyx b/rmgpy/kinetics/chebyshev.pyx
@@ -27,8 +27,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
-
 import logging
 
 import numpy as np

diff --git a/rmgpy/kinetics/chebyshevTest.py b/rmgpy/kinetics/chebyshevTest.py
@@ -31,7 +31,6 @@
 """
 This script contains unit tests of the :mod:`rmgpy.kinetics.chebyshev` module.
 """
-from __future__ import division
 
 import unittest
 

diff --git a/rmgpy/kinetics/diffusionLimited.py b/rmgpy/kinetics/diffusionLimited.py
@@ -27,7 +27,6 @@
 # DEALINGS IN THE SOFTWARE.                                                   #
 #                                                                             #
 ###############################################################################
-from __future__ import division
 
 import logging
 import math

diff --git a/rmgpy/kinetics/falloff.pyx b/rmgpy/kinetics/falloff.pyx
@@ -32,8 +32,6 @@ This module contains classes representing pressure-dependent kinetics models
 of "standard" falloff.
 """
 
-from __future__ import division
-
 from libc.math cimport exp, log, log10
 
 cimport rmgpy.constants as constants

diff --git a/rmgpy/kinetics/kineticsdata.pyx b/rmgpy/kinetics/kineticsdata.pyx
@@ -27,8 +27,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
-
 import numpy as np
 cimport numpy as np
 from libc.math cimport log

diff --git a/rmgpy/kinetics/model.pyx b/rmgpy/kinetics/model.pyx
@@ -31,7 +31,6 @@
 This module contains base classes that represent various rate coefficient
 models.
 """
-from __future__ import division
 
 import numpy as np
 cimport numpy as np

diff --git a/rmgpy/kinetics/surface.pyx b/rmgpy/kinetics/surface.pyx
@@ -27,8 +27,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
-
 import numpy as np
 cimport numpy as np
 from libc.math cimport exp, sqrt

diff --git a/rmgpy/kinetics/tunneling.pyx b/rmgpy/kinetics/tunneling.pyx
@@ -32,8 +32,6 @@ This module contains classes representing various models of tunneling through
 a reaction barrier.
 """
 
-from __future__ import division
-
 import logging
 
 import cython

diff --git a/rmgpy/kinetics/uncertainties.pyx b/rmgpy/kinetics/uncertainties.pyx
@@ -32,8 +32,6 @@
 This module contains information related to kinetic uncertainties
 """
 
-from __future__ import division
-
 import numpy as np
 cimport numpy as np
 

diff --git a/rmgpy/molecule/converter.py b/rmgpy/molecule/converter.py
@@ -31,7 +31,6 @@
 """
 This module provides methods for converting molecules between RMG, RDKit, and OpenBabel.
 """
-from __future__ import print_function
 
 import logging
 import sys

diff --git a/rmgpy/molecule/draw.py b/rmgpy/molecule/draw.py
@@ -46,8 +46,6 @@
 
 """
 
-from __future__ import division
-
 import logging
 import math
 import os.path

diff --git a/rmgpy/molecule/inchi.py b/rmgpy/molecule/inchi.py
@@ -28,8 +28,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
-
 import itertools
 import re
 import warnings

diff --git a/rmgpy/molecule/isomorphismTest.py b/rmgpy/molecule/isomorphismTest.py
@@ -28,8 +28,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
-
 import itertools
 import logging
 

diff --git a/rmgpy/molecule/molecule.py b/rmgpy/molecule/molecule.py
@@ -36,17 +36,12 @@
 describe the corresponding atom or bond.
 """
 
-from __future__ import division
-
 import itertools
 import logging
 import os
 from collections import OrderedDict, defaultdict
 from copy import deepcopy
-try:
-    from urllib.parse import quote  # py3
-except ImportError:
-    from urllib import quote  # py2
+from urllib.parse import quote
 
 import cython
 import numpy as np

diff --git a/rmgpy/molecule/pathfinder.py b/rmgpy/molecule/pathfinder.py
@@ -33,10 +33,7 @@
 The paths generally consist of alternating atoms and bonds.
 """
 import itertools
-try:
-    from queue import Queue  # py3
-except ImportError:
-    from Queue import Queue  # py2
+from queue import Queue
 
 import cython
 

diff --git a/rmgpy/molecule/resonanceTest.py b/rmgpy/molecule/resonanceTest.py
@@ -28,8 +28,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
-
 import unittest
 
 from external.wip import work_in_progress

diff --git a/rmgpy/molecule/symmetry.py b/rmgpy/molecule/symmetry.py
@@ -32,8 +32,6 @@
 This module provides functionality for estimating the symmetry number of a
 molecule from its chemical graph representation.
 """
-from __future__ import division
-
 import itertools
 
 

diff --git a/rmgpy/pdep/collisionTest.py b/rmgpy/pdep/collisionTest.py
@@ -31,8 +31,6 @@
 """
 This module contains unit tests of the :mod:`rmgpy.pdep.collision` module.
 """
-from __future__ import division
-
 import unittest
 
 from rmgpy.pdep.collision import SingleExponentialDown

diff --git a/rmgpy/pdep/network.py b/rmgpy/pdep/network.py
@@ -32,8 +32,6 @@
 This module contains the :class:`Network` class, a representation of a 
 pressure-dependent unimolecular reaction network
 """
-from __future__ import division
-
 import logging
 import math
 

diff --git a/rmgpy/qm/molecule.py b/rmgpy/qm/molecule.py
@@ -28,8 +28,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
-
 import logging
 import math
 import os

diff --git a/rmgpy/quantity.py b/rmgpy/quantity.py
@@ -33,8 +33,6 @@
 particularly the :class:`Quantity` class for representing physical quantities.
 """
 
-from __future__ import division
-
 import logging
 
 import cython

diff --git a/rmgpy/quantityTest.py b/rmgpy/quantityTest.py
@@ -31,8 +31,6 @@
 """
 This script contains unit tests of the :mod:`rmgpy.quantity` module.
 """
-from __future__ import print_function
-
 import unittest
 
 import numpy as np

diff --git a/rmgpy/reaction.py b/rmgpy/reaction.py
@@ -40,17 +40,12 @@
 representing a set of chemical reactions and the species involved.
 """
 
-from __future__ import division
-
 import logging
 import math
 import os.path
 from copy import deepcopy
 from functools import reduce
-try:
-    from urllib.parse import quote  # py3
-except ImportError:
-    from urllib import quote  # py2
+from urllib.parse import quote
 
 import cython
 import numpy as np

diff --git a/rmgpy/reactionTest.py b/rmgpy/reactionTest.py
@@ -32,8 +32,6 @@
 This module contains unit tests of the rmgpy.reaction module.
 """
 
-from __future__ import division
-
 import unittest
 
 import cantera as ct

diff --git a/rmgpy/rmg/main.py b/rmgpy/rmg/main.py
@@ -32,7 +32,6 @@
 This module contains the main execution functionality for Reaction Mechanism
 Generator (RMG).
 """
-from __future__ import print_function
 
 import copy
 import gc

diff --git a/rmgpy/rmg/model.py b/rmgpy/rmg/model.py
@@ -31,7 +31,6 @@
 """
 Contains classes for working with the reaction model generated by RMG.
 """
-from __future__ import print_function
 
 import gc
 import itertools

diff --git a/rmgpy/solver/liquidTest.py b/rmgpy/solver/liquidTest.py
@@ -28,8 +28,6 @@
 #                                                                             #
 ###############################################################################
 
-from __future__ import division
-
 import os
 import unittest