MAINT: Remove more compat shims

Remove the remainder of the easy to replace shims

Author: bashtage

statsmodels/compat/__init__.py

@@ -2,19 +2,15 @@
 
 from .python import (
     PY37,
-    asunicode, asbytes, asstr, asstr2,
+    asunicode, asbytes, asstr,
     lrange, lzip, lmap, lfilter,
     iteritems, iterkeys, itervalues,
-    urlopen, urljoin, urlencode, HTTPError, URLError,
-    getargspec, next, get_class
 )
 
 __all__ = ['PY37',
-           'asunicode', 'asbytes', 'asstr', 'asstr2',
+           'asunicode', 'asbytes', 'asstr',
            'lrange', 'lzip', 'lmap', 'lfilter',
-           'iteritems',
-           'iterkeys', 'itervalues', 'urlopen', 'urljoin', 'urlencode',
-           'HTTPError', 'URLError',
-           'getargspec', 'next', 'get_class', 'test']
+           'iteritems', 'iterkeys', 'itervalues',
+           'test']
 
 test = PytestTester()

statsmodels/compat/python.py

@@ -1,15 +1,7 @@
 """
 Compatibility tools for differences between Python 2 and 3
 """
-__all__ = ['HTTPError', 'URLError']
-
 import sys
-import urllib
-import inspect
-from collections import namedtuple
-import urllib.request
-import urllib.parse
-from urllib.error import HTTPError, URLError
 
 PY37 = (sys.version_info[:2] == (3, 7))
 
@@ -28,15 +20,6 @@ def asstr(s):
     return s.decode('latin1')
 
 
-def asstr2(s):  # added JP, not in numpy version
-    if isinstance(s, str):
-        return s
-    elif isinstance(s, bytes):
-        return s.decode('latin1')
-    else:
-        return str(s)
-
-
 # list-producing versions of the major Python iterating functions
 def lrange(*args, **kwargs):
     return list(range(*args, **kwargs))
@@ -54,48 +37,6 @@ def lfilter(*args, **kwargs):
     return list(filter(*args, **kwargs))
 
 
-urlopen = urllib.request.urlopen
-urljoin = urllib.parse.urljoin
-urlretrieve = urllib.request.urlretrieve
-urlencode = urllib.parse.urlencode
-
-ArgSpec = namedtuple('ArgSpec',
-                     ['args', 'varargs', 'keywords', 'defaults'])
-
-
-def getargspec(func):
-    """
-    Simple workaroung for getargspec deprecation that returns
-    an ArgSpec-like object
-    """
-    sig = inspect.signature(func)
-    parameters = sig.parameters
-    args, defaults = [], []
-    varargs, keywords = None, None
-
-    for key in parameters:
-        parameter = parameters[key]
-
-        if parameter.kind == inspect.Parameter.VAR_POSITIONAL:
-            varargs = key
-        elif parameter.kind == inspect.Parameter.VAR_KEYWORD:
-            keywords = key
-        else:
-            args.append(key)
-        if parameter.default is not parameter.empty:
-            defaults.append(parameter.default)
-    defaults = None if len(defaults) == 0 else defaults
-
-    return ArgSpec(args, varargs, keywords, defaults)
-
-
-try:
-    next = next
-except NameError:
-    def next(it):
-        return it.next()
-
-
 def iteritems(obj, **kwargs):
     """replacement for six's iteritems for Python2/3 compat
        uses 'iteritems' if available and otherwise uses 'items'.
@@ -122,14 +63,6 @@ def itervalues(obj, **kwargs):
     return func(**kwargs)
 
 
-def get_class(func):
-    try:
-        return func.im_class
-    except AttributeError:
-        # Python 3
-        return func.__self__.__class__
-
-
 def with_metaclass(meta, *bases):
     """Create a base class with a metaclass."""
     # This requires a bit of explanation: the basic idea is to make a dummy

statsmodels/datasets/tests/test_utils.py

@@ -1,8 +1,7 @@
-from statsmodels.compat.python import HTTPError, URLError
-
 import os
 from ssl import SSLError
 from socket import timeout
+from urllib.error import HTTPError, URLError
 
 import numpy as np
 from numpy.testing import assert_, assert_array_equal

statsmodels/datasets/utils.py

@@ -1,10 +1,13 @@
-from statsmodels.compat.python import (urlopen, HTTPError, URLError,
-                                       lrange, urljoin)
+from statsmodels.compat.python import lrange
+
 from io import StringIO
 import pickle
 import shutil
 from os import environ, makedirs
 from os.path import expanduser, exists, dirname, abspath, join
+from urllib.error import HTTPError, URLError
+from urllib.request import urlopen
+from urllib.parse import urljoin
 
 import numpy as np
 from pandas import read_stata, read_csv, DataFrame, Series, Index

statsmodels/distributions/empirical_distribution.py

@@ -167,7 +167,7 @@ def monotone_fn_inverter(fn, x, vectorized=True, **keywords):
 if __name__ == "__main__":
     #TODO: Make sure everything is correctly aligned and make a plotting
     # function
-    from statsmodels.compat.python import urlopen
+    from urllib.request import urlopen
     import matplotlib.pyplot as plt
     nerve_data = urlopen('http://www.statsci.org/data/general/nerve.txt')
     nerve_data = np.loadtxt(nerve_data)

statsmodels/examples/ex_sandwich2.py

@@ -4,8 +4,8 @@
 Created on Fri Dec 16 12:52:13 2011
 Author: Josef Perktold
 """
+from urllib.request import urlretrieve
 
-from statsmodels.compat.python import urlretrieve
 import numpy as np
 from numpy.testing import assert_almost_equal
 

statsmodels/examples/ex_sandwich3.py

@@ -5,7 +5,8 @@
 
 Author: Josef Perktold
 """
-from statsmodels.compat.python import urlretrieve
+from urllib.request import urlretrieve
+
 import numpy as np
 from numpy.testing import assert_almost_equal
 

statsmodels/iolib/table.py

@@ -82,7 +82,7 @@ def mylabeller(cell):
 :change: 2010-05-06 add `label_cells` to `SimpleTable`
 """
 
-from statsmodels.compat.python import lmap, lrange, next, iteritems
+from statsmodels.compat.python import lmap, lrange, iteritems
 
 from itertools import cycle, zip_longest
 import csv

statsmodels/nonparametric/kernel_density.py

@@ -28,8 +28,6 @@
 
 """
 # TODO: make default behavior efficient=True above a certain n_obs
-
-from statsmodels.compat.python import next
 import numpy as np
 
 from . import kernels

statsmodels/nonparametric/kernel_regression.py

@@ -29,8 +29,6 @@
 """
 
 # TODO: make default behavior efficient=True above a certain n_obs
-
-from statsmodels.compat.python import next
 import copy
 
 import numpy as np