Resolve conflicts and merge #264 contributed by @jjelosua ResourceWarning issues. Fixes #262 and #263

Author: chrismattmann

tika/tika.py

@@ -325,8 +325,10 @@ 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)})
-    status, response = callServer('put', serverEndpoint, service, open(path, 'rb'),
-                                  headers, verbose, tikaServerJar, config_path=config_path, rawResponse=rawResponse, requestOptions=requestOptions)
+    with open(path, 'rb') as f:
+        status, response = callServer('put', serverEndpoint, service, f,
+                                      headers, verbose, tikaServerJar, config_path=config_path, 
+                                      rawResponse=rawResponse, requestOptions=requestOptions)
 
     if file_type == 'remote': os.unlink(path)
     return (status, response)
@@ -761,8 +763,6 @@ def checkPortIsOpen(remoteServerHost=ServerHost, port = Port):
             return True
         else :
             return False
-        sock.close()
-        #FIXME: the above line is unreachable
 
     except KeyboardInterrupt:
         print("You pressed Ctrl+C")
@@ -776,6 +776,9 @@ def checkPortIsOpen(remoteServerHost=ServerHost, port = Port):
         print("Couldn't connect to server")
         sys.exit()
 
+    finally:
+        sock.close()
+
 def main(argv=None):
     """Run Tika from command line according to USAGE."""
     global Verbose