Fix resource warnings (unclosed files)

osc/commandline.py

@@ -4249,13 +4249,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
     def _prdiff_output_diff(self, opts, rdiff):
         if opts.diffstat:
             print()
-            p = subprocess.Popen("diffstat",
-                                 stdin=subprocess.PIPE,
-                                 stdout=subprocess.PIPE,
-                                 close_fds=True)
-            p.stdin.write(rdiff)
-            p.stdin.close()
-            print("".join(decode_it(x) for x in p.stdout.readlines()))
+            with subprocess.Popen("diffstat", stdin=subprocess.PIPE, stdout=subprocess.PIPE, close_fds=True) as p:
+                p.stdin.write(rdiff)
+                p.stdin.close()
+                print("".join(decode_it(x) for x in p.stdout.readlines()))
         elif opts.unified:
             print()
             if isinstance(rdiff, str):

osc/connection.py

@@ -123,6 +123,24 @@ HTTP_PROXY_MANAGER = get_proxy_manager("HTTP_PROXY")
 HTTPS_PROXY_MANAGER = get_proxy_manager("HTTPS_PROXY")
 
 
+def http_request_wrap_file(func):
+    """
+    Turn file path into a file object and close it automatically
+    by using a context manager.
+    """
+    def new_func(method, url, headers=None, data=None, file=None):
+        if file:
+            with open(file, "rb") as f:
+                return func(method, url, headers, data, file=f)
+        else:
+            return func(method, url, headers, data, file)
+
+    new_func.__name__ = func.__name__
+    new_func.__doc__ = func.__doc__
+    return new_func
+
+
+@http_request_wrap_file
 def http_request(method, url, headers=None, data=None, file=None):
     """
     Send a HTTP request to a server.
@@ -162,8 +180,8 @@ def http_request(method, url, headers=None, data=None, file=None):
             data = data.encode("utf-8")
         content_length = len(data)
     elif file:
-        content_length = os.path.getsize(file)
-        data = open(file, "rb")
+        content_length = os.fstat(file.fileno()).st_size
+        data = file
     else:
         content_length = 0
 

osc/core.py

@@ -2023,7 +2023,8 @@ class Package:
                 if not add:
                     tmpl = b'-%s'
                     ltmpl = b'@@ -1,%d +0,0 @@\n'
-                lines = [tmpl % i for i in open(fname, 'rb').readlines()]
+                with open(fname, 'rb') as f:
+                    lines = [tmpl % i for i in f.readlines()]
                 if len(lines):
                     diff.append(ltmpl % len(lines))
                     if not lines[-1].endswith(b'\n'):
@@ -3277,7 +3278,8 @@ def store_readlist(dir, name):
 
     r = []
     if os.path.exists(os.path.join(dir, store, name)):
-        r = [line.rstrip('\n') for line in open(os.path.join(dir, store, name))]
+        with open(os.path.join(dir, store, name)) as f:
+            r = [line.rstrip('\n') for line in f]
     return r
 
 def read_tobeadded(dir):
@@ -3293,7 +3295,8 @@ def read_sizelimit(dir):
     fname = os.path.join(dir, store, '_size_limit')
 
     if os.path.exists(fname):
-        r = open(fname).readline().strip()
+        with open(fname) as f:
+            r = f.readline().strip()
 
     if r is None or not r.isdigit():
         return None
@@ -3351,7 +3354,8 @@ def check_store_version(dir):
 
     versionfile = os.path.join(dir, store, '_osclib_version')
     try:
-        v = open(versionfile).read().strip()
+        with open(versionfile) as f:
+            v = f.read().strip()
     except:
         v = ''
 
@@ -4741,7 +4745,8 @@ def binary(s):
 
 def binary_file(fn):
     """read 4096 bytes from a file named fn, and call binary() on the data"""
-    return binary(open(fn, 'rb').read(4096))
+    with open(fn, 'rb') as f:
+        return binary(f.read(4096))
 
 
 def get_source_file_diff(dir, filename, rev, oldfilename = None, olddir = None, origfilename = None):
@@ -6500,7 +6505,8 @@ def store_read_project(dir):
     global store
 
     try:
-        p = open(os.path.join(dir, store, '_project')).readlines()[0].strip()
+        with open(os.path.join(dir, store, '_project')) as f:
+            p = f.readline().strip()
     except OSError:
         msg = 'Error: \'%s\' is not an osc project dir or working copy' % os.path.abspath(dir)
         if os.path.exists(os.path.join(dir, '.svn')):
@@ -6513,7 +6519,8 @@ def store_read_package(dir):
     global store
 
     try:
-        p = open(os.path.join(dir, store, '_package')).readlines()[0].strip()
+        with open(os.path.join(dir, store, '_package')) as f:
+            p = f.readline().strip()
     except OSError:
         msg = 'Error: \'%s\' is not an osc package working copy' % os.path.abspath(dir)
         if os.path.exists(os.path.join(dir, '.svn')):
@@ -6541,7 +6548,8 @@ def store_read_apiurl(dir, defaulturl=True):
 
     fname = os.path.join(dir, store, '_apiurl')
     try:
-        url = open(fname).readlines()[0].strip()
+        with open(fname) as f:
+            url = f.readlines()[0].strip()
         # this is needed to get a proper apiurl
         # (former osc versions may stored an apiurl with a trailing slash etc.)
         apiurl = conf.urljoin(*conf.parse_apisrv_url(None, url))
@@ -6612,8 +6620,8 @@ def store_read_file(dir, file):
     global store
 
     try:
-        content = open(os.path.join(dir, store, file)).read()
-        return content
+        with open(os.path.join(dir, store, file)) as f:
+            return f.read()
     except:
         return None