Bumped version to 0.5.1, added changelog to documentation

Byron · Byron · commit 18152febd428 · 2010-07-09T12:13:18.000+02:00
diff --git a/doc/source/changes.rst b/doc/source/changes.rst
@@ -0,0 +1,12 @@
+#########
+Changelog
+#########
+*****
+0.5.1
+*****
+* Restored most basic python 2.4 compatibility, such that gitdb can be imported within python 2.4, pack access cannot work though. This at least allows Super-Projects to provide their own workarounds, or use everything but pack support.
+
+*****
+0.5.0
+*****
+Initial Release
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -47,7 +47,7 @@
 # The short X.Y version.
 version = '0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.0'
+release = '0.5.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -14,6 +14,7 @@ Contents:
    intro
    tutorial
    api
+   changes
 
 Indices and tables
 ==================
diff --git a/setup.py b/setup.py
@@ -56,7 +56,7 @@ def get_data_files(self):
 # END apply setuptools patch too
 
 setup(name = "gitdb",
-      version = "0.5.0",
+      version = "0.5.1",
       description = "Git Object Database",
       author = "Sebastian Thiel",
       author_email = "byronimo@gmail.com",
@@ -67,7 +67,7 @@ def get_data_files(self):
       package_dir = {'gitdb':''},
       ext_modules=[Extension('gitdb._fun', ['_fun.c'])],
       license = "BSD License",
-      requires=('async (>=0.6.0)',),
-      install_requires='async >= 0.6.0',
+      requires=('async (>=0.6.1)',),
+      install_requires='async >= 0.6.1',
       long_description = """GitDB is a pure-Python git object database"""
       )
diff --git a/stream.py b/stream.py
@@ -170,7 +170,7 @@ def compressed_bytes_read(self):
 	def seek(self, offset, whence=getattr(os, 'SEEK_SET', 0)):
 		"""Allows to reset the stream to restart reading
 		:raise ValueError: If offset and whence are not 0"""
-		if offset != 0 or whence != os.SEEK_SET:
+		if offset != 0 or whence != getattr(os, 'SEEK_SET', 0):
 			raise ValueError("Can only seek to position 0")
 		# END handle offset
 		
@@ -411,7 +411,7 @@ def seek(self, offset, whence=getattr(os, 'SEEK_SET', 0)):
 		"""Allows to reset the stream to restart reading
 		
 		:raise ValueError: If offset and whence are not 0"""
-		if offset != 0 or whence != os.SEEK_SET:
+		if offset != 0 or whence != getattr(os, 'SEEK_SET', 0):
 			raise ValueError("Can only seek to position 0")
 		# END handle offset
 		self._br = 0
@@ -520,7 +520,7 @@ def close(self):
 	def seek(self, offset, whence=getattr(os, 'SEEK_SET', 0)):
 		"""Seeking currently only supports to rewind written data
 		Multiple writes are not supported"""
-		if offset != 0 or whence != os.SEEK_SET:
+		if offset != 0 or whence != getattr(os, 'SEEK_SET', 0):
 			raise ValueError("Can only seek to position 0")
 		# END handle offset
 		self.buf.seek(0)
diff --git a/util.py b/util.py
@@ -3,7 +3,14 @@
 import mmap
 import sys
 import errno
-import cStringIO
+
+from cStringIO import StringIO
+
+# in py 2.4, StringIO is only StringI, without write support.
+# Hence we must use the python implementation for this
+if sys.version_info[1] < 5:
+	from StringIO import StringIO
+# END handle python 2.4
 
 try:
 	import async.mod.zlib as zlib
@@ -73,6 +80,29 @@ def unpack_from(fmt, data, offset=0):
 
 #} END Aliases
 
+#{ compatibility stuff ... 
+
+class _RandomAccessStringIO(object):
+	"""Wrapper to provide required functionality in case memory maps cannot or may 
+	not be used. This is only really required in python 2.4"""
+	__slots__ = '_sio'
+	
+	def __init__(self, buf=''):
+		self._sio = StringIO(buf)
+		
+	def __getattr__(self, attr):
+		return getattr(self._sio, attr)
+	
+	def __len__(self):
+		return len(self.getvalue())
+		
+	def __getitem__(self, i):
+		return self.getvalue()[i]
+		
+	def __getslice__(self, start, end):
+		return self.getvalue()[start:end]
+	
+#} END compatibility stuff ...
 
 #{ Routines
 
@@ -94,7 +124,7 @@ def allocate_memory(size):
 		# this of course may fail if the amount of memory is not available in
 		# one chunk - would only be the case in python 2.4, being more likely on 
 		# 32 bit systems.
-		return cStringIO.StringIO("\0"*size)
+		return _RandomAccessStringIO("\0"*size)
 	# END handle memory allocation
 	
 
@@ -109,15 +139,20 @@ def file_contents_ro(fd, stream=False, allow_mmap=True):
 	try:
 		if allow_mmap:
 			# supports stream and random access
-			return mmap.mmap(fd, 0, access=mmap.ACCESS_READ)
+			try:
+				return mmap.mmap(fd, 0, access=mmap.ACCESS_READ)
+			except EnvironmentError:
+				# python 2.4 issue, 0 wants to be the actual size
+				return mmap.mmap(fd, os.fstat(fd).st_size, access=mmap.ACCESS_READ)
+			# END handle python 2.4
 	except OSError:
 		pass
 	# END exception handling
 	
 	# read manully
 	contents = os.read(fd, os.fstat(fd).st_size)
 	if stream:
-		return cStringIO.StringIO(contents)
+		return _RandomAccessStringIO(contents)
 	return contents
 	
 def file_contents_ro_filepath(filepath, stream=False, allow_mmap=True, flags=0):
