Rev 2302: Merge changes from subvertpy. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2302
revision-id: jelmer at samba.org-20090114180105-3jab2wtm7z5rm5ye
parent: jelmer at samba.org-20090114174946-0l9iy000huh9myhe
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Wed 2009-01-14 19:01:05 +0100
message:
  Merge changes from subvertpy.
modified:
  subvertpy/setup.py             setup.py-20060502115218-86950492da22353f
  subvertpy/subvertpy/delta.py   delta.py-20080316001917-xyng7m3jlxvdc4c9-1
=== modified file 'subvertpy/setup.py'
--- a/subvertpy/setup.py	2009-01-14 17:49:46 +0000
+++ b/subvertpy/setup.py	2009-01-14 18:01:05 +0000
@@ -112,7 +112,7 @@
     """
     abd = apr_build_data()
     sbd = svn_build_data()
-    gcc_command_args = ['gcc'] + ['-I' + inc for inc in sbd[0]] + ['-L' + lib for lib in sbd[1]] + ['-I' + abd[0], '-lsvn_subr-1', '-o', '.keychain_check', '-x', 'c', '-']
+    gcc_command_args = ['gcc'] + ['-I' + inc for inc in sbd[0]] + ['-L' + lib for lib in sbd[1]] + ['-I' + abd[0], '-lsvn_subr-1', '-x', 'c', '-']
     (gcc_in, gcc_out, gcc_err) = os.popen3(gcc_command_args)
     gcc_in.write("""
 #include <svn_auth.h>
@@ -122,8 +122,6 @@
 """)
     gcc_in.close()
     gcc_out.read()
-    if os.path.exists('.keychain_check'):
-        os.remove('.keychain_check')
     return (gcc_out.close() is None)
 
 class VersionQuery(object):
@@ -321,4 +319,3 @@
           ext_modules=subvertpy_modules("subvertpy"),
           cmdclass = { 'install_lib': install_lib_with_dlls },
           )
-

=== modified file 'subvertpy/subvertpy/delta.py'
--- a/subvertpy/subvertpy/delta.py	2008-11-16 18:41:04 +0000
+++ b/subvertpy/subvertpy/delta.py	2009-01-14 18:01:05 +0000
@@ -18,7 +18,7 @@
 __author__ = "Jelmer Vernooij <jelmer at samba.org>"
 __docformat__ = "restructuredText"
 
-from bzrlib.osutils import md5
+import md5
 
 TXDELTA_SOURCE = 0
 TXDELTA_TARGET = 1
@@ -58,7 +58,7 @@
 
 
 def send_stream(stream, handler, block_size=SEND_STREAM_BLOCK_SIZE):
-    hash = md5()
+    hash = md5.new()
     text = stream.read(block_size)
     while text != "":
         hash.update(text)