From 6c1faef799095f3990e9970bc2cb10aa0221cf9c Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Sat, 12 Jun 2010 17:20:43 +0200
Subject: Removed odb from project, it is now used as a submodule named gitdb,
 which was added instead Adjusted all imports to deal with the changed package
 names

---
 lib/git/utils.py | 35 ++++-------------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

(limited to 'lib/git/utils.py')

diff --git a/lib/git/utils.py b/lib/git/utils.py
index 60a7de48..ab763a10 100644
--- a/lib/git/utils.py
+++ b/lib/git/utils.py
@@ -9,38 +9,11 @@ import sys
 import time
 import tempfile
 
-try:
-    import hashlib
-except ImportError:
-    import sha
+from gitdb.util import (
+	stream_copy,
+	make_sha
+	)
 
-def make_sha(source=''):
-    """
-    A python2.4 workaround for the sha/hashlib module fiasco
-    
-    Note
-        From the dulwich project
-    """
-    try:
-        return hashlib.sha1(source)
-    except NameError:
-        sha1 = sha.sha(source)
-        return sha1
-
-def stream_copy(source, destination, chunk_size=512*1024):
-	"""Copy all data from the source stream into the destination stream in chunks
-	of size chunk_size
-	:return: amount of bytes written"""
-	br = 0
-	while True:
-		chunk = source.read(chunk_size)
-		destination.write(chunk)
-		br += len(chunk)
-		if len(chunk) < chunk_size:
-			break
-	# END reading output stream
-	return br
-	
 
 def join_path(a, *p):
     """Join path tokens together similar to os.path.join, but always use 
-- 
cgit v1.2.1