summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-vcs/cvs2svn/files/2.2.0-deprecated-modules.patch')
-rw-r--r--dev-vcs/cvs2svn/files/2.2.0-deprecated-modules.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/dev-vcs/cvs2svn/files/2.2.0-deprecated-modules.patch b/dev-vcs/cvs2svn/files/2.2.0-deprecated-modules.patch
deleted file mode 100644
index 94ceaa2b2fa2..000000000000
--- a/dev-vcs/cvs2svn/files/2.2.0-deprecated-modules.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: cvs2svn_lib/dumpfile_delegate.py
-===================================================================
---- cvs2svn_lib/dumpfile_delegate.py (revision 4808)
-+++ cvs2svn_lib/dumpfile_delegate.py (working copy)
-@@ -16,9 +16,11 @@
-
- """This module contains database facilities used by cvs2svn."""
-
-+try:
-+ from hashlib import md5
-+except ImportError:
-+ from md5 import new as md5
-
--import md5
--
- from cvs2svn_lib import config
- from cvs2svn_lib.common import FatalError
- from cvs2svn_lib.common import InternalError
-@@ -320,7 +322,7 @@
- self.dumpfile.write(prop_contents)
-
- # Insert the rev contents, calculating length and checksum as we go.
-- checksum = md5.new()
-+ checksum = md5()
- length = 0
- if buf is None:
- buf = stream.read(config.PIPE_READ_SIZE)
-Index: cvs2svn_lib/metadata_database.py
-===================================================================
---- cvs2svn_lib/metadata_database.py (revision 4808)
-+++ cvs2svn_lib/metadata_database.py (working copy)
-@@ -16,9 +16,11 @@
-
- """This module contains classes to manage CVSRevision metadata."""
-
-+try:
-+ from hashlib import sha1
-+except ImportError:
-+ from sha import new as sha1
-
--import sha
--
- from cvs2svn_lib.context import Ctx
- from cvs2svn_lib.database import IndexedDatabase
- from cvs2svn_lib.key_generator import KeyGenerator
-@@ -86,7 +88,7 @@
- if not Ctx().cross_branch_commits:
- key.append(branch_name or '')
-
-- digest = sha.new('\0'.join(key)).digest()
-+ digest = sha1('\0'.join(key)).digest()
- try:
- # See if it is already known:
- return self._digest_to_id[digest]