remove names which are no longer in use from _compat.py

2 files changed, 2 insertions, 18 deletions

diff --git a/psutil/_compat.py b/psutil/_compat.py
index 84fd9ca8..7afd4c6a 100644
--- a/psutil/_compat.py
+++ b/psutil/_compat.py
@@ -6,7 +6,7 @@
 
 """Module which provides compatibility with older Python versions."""
 
-__all__ = ["PY3", "int", "long", "xrange", "exec_", "callable", "lru_cache"]
+__all__ = ["PY3", "long", "xrange", "unicode", "callable", "lru_cache"]
 
 import collections
 import functools
@@ -19,29 +19,13 @@ except ImportError:
 PY3 = sys.version_info[0] == 3
 
 if PY3:
-    int = int
     long = int
     xrange = range
     unicode = str
-    basestring = str
-    exec_ = getattr(__builtin__, "exec")
 else:
-    int = int
     long = long
     xrange = xrange
     unicode = unicode
-    basestring = basestring
-
-    def exec_(code, globs=None, locs=None):
-        if globs is None:
-            frame = sys._getframe(1)
-            globs = frame.f_globals
-            if locs is None:
-                locs = frame.f_locals
-            del frame
-        elif locs is None:
-            locs = globs
-        exec("""exec code in globs, locs""")
 
 
 # removed in 3.0, reintroduced in 3.2
diff --git a/test/_posix.py b/test/_posix.py
index 8cbd629a..4518cd7f 100644
--- a/test/_posix.py
+++ b/test/_posix.py
@@ -14,7 +14,7 @@ import time
 
 import psutil
 
-from psutil._compat import PY3
+from psutil._compat import PY3, callable
 from test_psutil import LINUX, SUNOS, OSX, BSD, PYTHON
 from test_psutil import (get_test_subprocess, skip_on_access_denied,
                          retry_before_failing, reap_children, sh, unittest,