Merge 5b77c3f into 20faebf

gwpy · Apr 12, 2019 · 267128f · 267128f
2 parents 20faebf + 5b77c3f
commit 267128f
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 52 deletions.
diff --git a/bin/gw_summary b/bin/gw_summary
@@ -47,12 +47,11 @@ import os
 import re
 import warnings
 from collections import OrderedDict
+from configparser import (DEFAULTSECT, NoOptionError, NoSectionError)
 try:
     from urllib.parse import urlparse
-    from configparser import (DEFAULTSECT, NoOptionError, NoSectionError)
 except ImportError:  # python < 3
     from urlparse import urlparse
-    from ConfigParser import (DEFAULTSECT, NoOptionError, NoSectionError)
 
 from dateutil.relativedelta import relativedelta
 

diff --git a/bin/gwsumm-plot-guardian b/bin/gwsumm-plot-guardian
@@ -11,9 +11,9 @@ import argparse
 import os
 import re
 from collections import OrderedDict
+from configparser import DEFAULTSECT
 
 from six import text_type
-from six.moves.configparser import DEFAULTSECT
 
 from matplotlib import use
 use('agg')

diff --git a/gwsumm/config.py b/gwsumm/config.py
@@ -19,6 +19,7 @@
 """Thin wrapper around configparser
 """
 
+import configparser
 import os.path
 import re
 from collections import OrderedDict
@@ -27,7 +28,6 @@
 from six import string_types
 from six.moves import (
     StringIO,
-    configparser,
     http_client as httplib,
 )
 

diff --git a/gwsumm/data/timeseries.py b/gwsumm/data/timeseries.py
@@ -28,12 +28,9 @@
 from math import (floor, ceil)
 from time import sleep
 from collections import OrderedDict
+from configparser import (NoSectionError, NoOptionError)
 
 from six.moves import reduce
-from six.moves.configparser import (
-    NoSectionError,
-    NoOptionError,
-)
 from six.moves.urllib.parse import urlparse
 
 from astropy import units

diff --git a/gwsumm/plot/segments.py b/gwsumm/plot/segments.py
@@ -25,9 +25,9 @@
 from itertools import (cycle, combinations)
 from numbers import Number
 from collections import OrderedDict
+from configparser import NoOptionError
 
 from six import string_types
-from six.moves.configparser import NoOptionError
 
 import numpy
 

diff --git a/gwsumm/plot/sei.py b/gwsumm/plot/sei.py
@@ -20,8 +20,7 @@
 """
 
 import re
-
-from six.moves.configparser import NoOptionError
+from configparser import NoOptionError
 
 from matplotlib.pyplot import subplots
 from matplotlib.ticker import NullLocator

diff --git a/gwsumm/segments.py b/gwsumm/segments.py
@@ -24,16 +24,16 @@
 import sys
 import warnings
 from collections import OrderedDict
-
-from six import string_types
-from six.moves import reduce
-from six.moves.configparser import (
+from configparser import (
     DEFAULTSECT,
     ConfigParser,
     NoSectionError,
     NoOptionError,
 )
 
+from six import string_types
+from six.moves import reduce
+
 from astropy.io.registry import IORegistryError
 
 from gwpy.segments import (DataQualityFlag, DataQualityDict,

diff --git a/gwsumm/state/core.py b/gwsumm/state/core.py
@@ -22,10 +22,7 @@
 import datetime
 import re
 import operator
-try:
-    from configparser import (NoOptionError, DEFAULTSECT)
-except ImportError:  # python < 3
-    from ConfigParser import (NoOptionError, DEFAULTSECT)
+from configparser import (NoOptionError, DEFAULTSECT)
 
 from astropy.time import Time
 

diff --git a/gwsumm/tabs/builtin.py b/gwsumm/tabs/builtin.py
@@ -29,9 +29,9 @@
 
 import os.path
 import warnings
+from configparser import NoOptionError
 
 from six import string_types
-from six.moves.configparser import NoOptionError
 
 from MarkupPy import markup
 

diff --git a/gwsumm/tabs/core.py b/gwsumm/tabs/core.py
@@ -36,10 +36,10 @@
 import os
 import re
 from collections import OrderedDict
+from configparser import NoOptionError
 from shutil import copyfile
 
 from six import string_types
-from six.moves.configparser import NoOptionError
 from six.moves.urllib.parse import urlparse
 
 from MarkupPy import markup

diff --git a/gwsumm/tabs/data.py b/gwsumm/tabs/data.py
@@ -28,16 +28,15 @@
 import os.path
 import getpass
 import re
-
-from copy import copy
-from datetime import timedelta
-
-from six.moves import StringIO
-from six.moves.configparser import (
+from configparser import (
     ConfigParser,
     NoOptionError,
     NoSectionError,
 )
+from copy import copy
+from datetime import timedelta
+
+from six.moves import StringIO
 
 from MarkupPy import markup
 

diff --git a/gwsumm/tabs/etg.py b/gwsumm/tabs/etg.py
@@ -20,10 +20,10 @@
 """
 
 import os
+from configparser import NoOptionError
 from warnings import warn
 
 from six import string_types
-from six.moves.configparser import NoOptionError
 
 from MarkupPy import markup
 

diff --git a/gwsumm/tabs/gracedb.py b/gwsumm/tabs/gracedb.py
@@ -20,10 +20,7 @@
 """
 
 from collections import OrderedDict
-try:
-    from configparser import NoOptionError
-except ImportError:  # python < 3
-    from ConfigParser import NoOptionError
+from configparser import NoOptionError
 
 from MarkupPy import markup
 

diff --git a/gwsumm/tabs/guardian.py b/gwsumm/tabs/guardian.py
@@ -21,10 +21,7 @@
 
 import re
 from collections import OrderedDict
-try:
-    from configparser import NoOptionError
-except ImportError:
-    from ConfigParser import NoOptionError
+from configparser import NoOptionError
 
 from dateutil import tz
 

diff --git a/gwsumm/tabs/management.py b/gwsumm/tabs/management.py
@@ -21,10 +21,7 @@
 
 import re
 from collections import OrderedDict
-try:
-    from configparser import NoOptionError
-except ImportError:
-    from ConfigParser import NoOptionError
+from configparser import NoOptionError
 
 from glue.lal import Cache
 

diff --git a/gwsumm/tabs/sei.py b/gwsumm/tabs/sei.py
@@ -24,10 +24,7 @@
 import os
 import re
 from collections import OrderedDict
-try:
-    from configparser import NoOptionError
-except ImportError:  # python < 3
-    from ConfigParser import NoOptionError
+from configparser import NoOptionError
 
 from dateutil import tz
 

diff --git a/gwsumm/tests/test_config.py b/gwsumm/tests/test_config.py
@@ -22,9 +22,9 @@
 import os.path
 import tempfile
 from collections import OrderedDict
+from configparser import (DEFAULTSECT, ConfigParser)
 
 from six.moves import StringIO
-from six.moves.configparser import (DEFAULTSECT, ConfigParser)
 
 import pytest
 

diff --git a/gwsumm/tests/test_plot.py b/gwsumm/tests/test_plot.py
@@ -22,10 +22,7 @@
 
 import os
 
-try:
-    from configparser import ConfigParser
-except ImportError:  # python < 3
-    from ConfigParser import ConfigParser
+from configparser import ConfigParser
 
 from matplotlib import use
 use('agg')  # noqa

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ libsass
 jsmin
 
 # core requirements
-enum34 ; python_version < '3'
+enum34 ; python_version < '3.4'
 python-dateutil
 lxml
 numpy>=1.10
@@ -20,6 +20,7 @@ pygments
 MarkupPy
 gwdetchar>=0.4.0
 gwpy>=0.14.2
+configparser ; python_version < '3.6'
 
 # optional extras (not module-level imports)
 pykerberos

diff --git a/setup.py b/setup.py
@@ -85,9 +85,9 @@
     'pygments',
     'MarkupPy',
     'gwdetchar>=0.4.0',
+    'configparser ; python_version < \'3.6\'',
+    'enum34 ; python_version < \'3.4\''
 ]
-if sys.version < '3':
-    install_requires.append('enum34')
 
 # testing requirements
 if {'pytest', 'test'}.intersection(sys.argv):