Removed redunant code due to parital reimplementation of a file descriptor stream wrapper

Author: Byron

db/loose.py

@@ -174,15 +174,15 @@ def store(self, istream):
 					write_object(istream.type, istream.size, istream.read, writer.write,
 									chunk_size=self.stream_chunk_size)
 				# END handle direct stream copies
-			except:
+			finally:
 				if tmp_path:
-					os.remove(tmp_path)
-				raise
-			# END assure tmpfile removal on error
-		finally:
+					writer.close()
+			# END assure target stream is closed
+		except:
 			if tmp_path:
-				writer.close()
-		# END assure target stream is closed
+				os.remove(tmp_path)
+			raise
+		# END assure tmpfile removal on error
 
 		hexsha = None
 		if istream.sha:

stream.py

@@ -560,19 +560,38 @@ def close(self):
 
 	#} END stream interface
 
+
 class FDStream(object):
-	"""Simple wrapper around a file descriptor"""
-	__slots__ = "_fd"
+	"""A simple wrapper providing the most basic functions on a file descriptor 
+	with the fileobject interface. Cannot use os.fdopen as the resulting stream
+	takes ownership"""
+	__slots__ = ("_fd", '_pos')
 	def __init__(self, fd):
 		self._fd = fd
+		self._pos = 0
 
 	def write(self, data):
-		return write(self._fd, data)
+		self._pos += len(data)
+		os.write(self._fd, data)
+	
+	def read(self, count=0):
+		if count == 0:
+			count = os.path.getsize(self._filepath)
+		# END handle read everything
+			
+		bytes = os.read(self._fd, count)
+		self._pos += len(bytes)
+		return bytes
+		
+	def fileno(self):
+		return self._fd
+		
+	def tell(self):
+		return self._pos
 
 	def close(self):
 		close(self._fd)
-	
-	
+
 
 class NullStream(object):
 	"""A stream that does nothing but providing a stream interface.

test/lib.py

@@ -38,11 +38,12 @@ def wrapper(self):
 		path = tempfile.mktemp(prefix=func.__name__)
 		os.mkdir(path)
 		try:
-			return func(self, path)
-		except Exception:
-			print >> sys.stderr, "Test %s.%s failed, output is at %r" % (type(self).__name__, func.__name__, path)
-			raise
-		else:
+			try:
+				return func(self, path)
+			except Exception:
+				print >> sys.stderr, "Test %s.%s failed, output is at %r" % (type(self).__name__, func.__name__, path)
+				raise
+		finally:
 			shutil.rmtree(path)
 		# END handle exception
 	# END wrapper

test/test_util.py

@@ -88,4 +88,14 @@ def test_lockedfd(self):
 		finally:
 			os.remove(my_file)
 		# END final cleanup
+		
+		# try non-existing file for reading
+		lfd = LockedFD(tempfile.mktemp())
+		try:
+			lfd.open(write=False)
+		except OSError:
+			assert not os.path.exists(lfd._lockfilepath())
+		else:
+			self.fail("expected OSError")
+		# END handle exceptions
 

util.py

@@ -161,35 +161,6 @@ def _set_cache_(self, attr):
 		in the single attribute."""
 		pass
 
-
-class FDStreamWrapper(object):
-	"""A simple wrapper providing the most basic functions on a file descriptor 
-	with the fileobject interface. Cannot use os.fdopen as the resulting stream
-	takes ownership"""
-	__slots__ = ("_fd", '_pos')
-	def __init__(self, fd):
-		self._fd = fd
-		self._pos = 0
-		
-	def write(self, data):
-		self._pos += len(data)
-		os.write(self._fd, data)
-	
-	def read(self, count=0):
-		if count == 0:
-			count = os.path.getsize(self._filepath)
-		# END handle read everything
-			
-		bytes = os.read(self._fd, count)
-		self._pos += len(bytes)
-		return bytes
-		
-	def fileno(self):
-		return self._fd
-		
-	def tell(self):
-		return self._pos
-			
 
 class LockedFD(object):
 	"""This class facilitates a safe read and write operation to a file on disk.
@@ -240,7 +211,7 @@ def open(self, write=False, stream=False):
 		binary = getattr(os, 'O_BINARY', 0)
 		lockmode = 	os.O_WRONLY | os.O_CREAT | os.O_EXCL | binary
 		try:
-			fd = os.open(self._lockfilepath(), lockmode)
+			fd = os.open(self._lockfilepath(), lockmode, 0600)
 			if not write:
 				os.close(fd)
 			else:
@@ -253,11 +224,19 @@ def open(self, write=False, stream=False):
 		# open actual file if required
 		if self._fd is None:
 			# we could specify exlusive here, as we obtained the lock anyway
-			self._fd = os.open(self._filepath, os.O_RDONLY | binary)
+			try:
+				self._fd = os.open(self._filepath, os.O_RDONLY | binary)
+			except:
+				# assure we release our lockfile
+				os.remove(self._lockfilepath())
+				raise
+			# END handle lockfile
 		# END open descriptor for reading
 
 		if stream:
-			return FDStreamWrapper(self._fd)
+			# need delayed import
+			from stream import FDStream
+			return FDStream(self._fd)
 		else:
 			return self._fd
 		# END handle stream