remove unsupported py2 and deprecated py3 code and fallbacks

2 files changed, 4 insertions, 11 deletions

diff --git a/src/snakeoil/compression/_bzip2.py b/src/snakeoil/compression/_bzip2.py
index dc63ab5a..edd20dce 100644
--- a/src/snakeoil/compression/_bzip2.py
+++ b/src/snakeoil/compression/_bzip2.py
@@ -15,7 +15,6 @@ __all__ = ("compress_data", "decompress_data")
 
 from functools import partial
 import multiprocessing
-import sys
 
 from snakeoil import process
 from snakeoil.compression import _util
@@ -72,7 +71,7 @@ def compress_handle(handle, level=9, parallelize=False):
     if parallelize and parallelizable:
         return _util.compress_handle(lbzip2_path, handle, compresslevel=level,
                                      extra_args=lbzip2_compress_args)
-    elif native and isinstance(handle, basestring):
+    elif native and isinstance(handle, str):
         return BZ2File(handle, mode='w', compresslevel=level)
     return _compress_handle(handle, compresslevel=level)
 
@@ -80,9 +79,6 @@ def decompress_handle(handle, parallelize=False):
     if parallelize and parallelizable:
         return _util.decompress_handle(lbzip2_path, handle,
                                        extra_args=lbzip2_decompress_args)
-    elif (native and isinstance(handle, basestring)
-          and sys.version_info[:3] >= (3, 3)):
-        # note that <3.3, bz2file doesn't handle multiple streams.
-        # thus don't use it.
+    elif (native and isinstance(handle, str)):
         return BZ2File(handle, mode='r')
     return _decompress_handle(handle)
diff --git a/src/snakeoil/compression/_util.py b/src/snakeoil/compression/_util.py
index b3a65b5f..c0c3b741 100644
--- a/src/snakeoil/compression/_util.py
+++ b/src/snakeoil/compression/_util.py
@@ -7,7 +7,6 @@ import errno
 import os
 import subprocess
 
-from snakeoil.weakrefs import WeakRefFinalizer
 
 def _drive_process(args, mode, data):
     p = subprocess.Popen(args,
@@ -37,8 +36,6 @@ def decompress_data(binary, data, extra_args=()):
 
 class _process_handle(object):
 
-    __metaclass__ = WeakRefFinalizer
-
     def __init__(self, handle, args, is_read=False):
         self.mode = 'wb'
         if is_read:
@@ -51,12 +48,12 @@ class _process_handle(object):
     def _open_handle(self, handle):
         self._allow_reopen = None
         close = False
-        if isinstance(handle, basestring):
+        if isinstance(handle, str):
             if self.is_read:
                 self._allow_reopen = handle
             handle = open(handle, mode=self.mode)
             close = True
-        elif not isinstance(handle, (long, int)):
+        elif not isinstance(handle, int):
             if not hasattr(handle, 'fileno'):
                 raise TypeError(
                     "handle %r isn't a string, integer, and lacks a fileno "