minor improvements

Author: carantunes

tika/tika.py

@@ -140,7 +140,7 @@ def make_content_disposition_header(fn):
 from subprocess import STDOUT
 from os import walk
 import logging
-import _io
+import io
 
 log_path = os.getenv('TIKA_LOG_PATH', tempfile.gettempdir())
 log_file = os.path.join(log_path, 'tika.log')
@@ -326,7 +326,7 @@ def parse1(option, urlOrPath, serverEndpoint=ServerEndpoint, verbose=Verbose, ti
     service = services.get(option, services['all'])
     if service == '/tika': responseMimeType = 'text/plain'
     headers.update({'Accept': responseMimeType, 'Content-Disposition': make_content_disposition_header(path.encode('utf-8') if type(path) is unicode_string else path)})
-    with urlOrPath if type(urlOrPath) is _io.BufferedReader else open(path, 'rb') as f:
+    with urlOrPath if isinstance(urlOrPath, io.BufferedIOBase) else open(path, 'rb') as f:
         status, response = callServer('put', serverEndpoint, service, f,
                                       headers, verbose, tikaServerJar, config_path=config_path,
                                       rawResponse=rawResponse, requestOptions=requestOptions)
@@ -699,8 +699,8 @@ def getRemoteFile(urlOrPath, destPath):
     :param destPath: path to store the resource, usually a path on file system
     :return: tuple having (path, 'local'/'remote'/'binary')
     '''
-    #update to handle binary stream input
-    if type(urlOrPath) is _io.BufferedReader:
+    # handle binary stream input
+    if isinstance(urlOrPath, io.BufferedIOBase):
         return (urlOrPath.name, 'binary')
 
     urlp = urlparse(urlOrPath)