Fix some deprecation and resource warnings

1 files changed, 11 insertions, 9 deletions

diff --git a/paramiko/primes.py b/paramiko/primes.py
index 4db6d52d..13ec52d0 100644
--- a/paramiko/primes.py
+++ b/paramiko/primes.py
@@ -114,15 +114,17 @@ class ModulusPack (object):
         """
         self.pack = {}
         f = open(filename, 'r')
-        for line in f:
-            line = line.strip()
-            if (len(line) == 0) or (line[0] == '#'):
-                continue
-            try:
-                self._parse_modulus(line)
-            except:
-                continue
-        f.close()
+        try:
+            for line in f:
+                line = line.strip()
+                if (len(line) == 0) or (line[0] == '#'):
+                    continue
+                try:
+                    self._parse_modulus(line)
+                except:
+                    continue
+        finally:
+            f.close()
 
     def get_modulus(self, min, prefer, max):
         bitsizes = sorted(self.pack.keys())