Use with blocks to close out the objects.

James William Pye · James William Pye · commit 6ce07c945ea6 · 2011-04-09T10:10:23.000-07:00
diff --git a/postgresql/configfile.py b/postgresql/configfile.py
@@ -245,10 +245,11 @@ def __delitem__(self, k):
 		self._save()
 
 	def __getitem__(self, k):
-		return read_config(
-			self._open(self.path),
-			selector = k.__eq__
-		)[k]
+		with self._open(self.path) as cfo:
+			return read_config(
+				cfo,
+				selector = k.__eq__
+			)[k]
 
 	def __setitem__(self, k, v):
 		self.update({k : v})
@@ -279,9 +280,8 @@ def __exit__(self, exc, val, tb):
 		return exc is None
 
 	def get(self, k, alt = None):
-		return read_config(
-			self._open(self.path), selector = k.__eq__
-		).get(k, alt)
+		with self._open(self.path) as cf:
+			return read_config(cf, selector = k.__eq__).get(k, alt)
 
 	def keys(self):
 		return read_config(self._open(self.path)).keys()
@@ -307,12 +307,13 @@ def getset(self, keys):
 		Returns a dictionary of those keys.
 		"""
 		keys = set(keys)
-		cfg = read_config(
-			self._open(self.path),
-			selector = keys.__contains__
-		)
-		for x in (keys - set(cfg.keys())):
-			cfg[x] = None
-		return cfg
+		with self._open(self.path) as cfo:
+			cfg = read_config(
+				cfo,
+				selector = keys.__contains__
+			)
+			for x in (keys - set(cfg.keys())):
+				cfg[x] = None
+			return cfg
 ##
 # vim: ts=3:sw=3:noet:
diff --git a/postgresql/installation.py b/postgresql/installation.py
@@ -31,6 +31,7 @@ def get_command_output(exe, *args):
 		shell = False
 	)
 	p.stdin.close()
+	p.stderr.close()
 	while True:
 		try:
 			rv = p.wait()
@@ -40,7 +41,8 @@ def get_command_output(exe, *args):
 				raise
 	if rv != 0:
 		return None
-	return io.TextIOWrapper(p.stdout).read()
+	with p.stdout, io.TextIOWrapper(p.stdout) as txt:
+		return txt.read()
 
 def pg_config_dictionary(*pg_config_path):
 	"""
