At file:///data/jelmer/bzr-svn/0.5/
------------------------------------------------------------
revno: 2012
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.5
timestamp: Tue 2008-11-18 02:54:17 +0100
message:
Fix tests.
modified:
subvertpy/subvertpy/_ra.c ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
subvertpy/subvertpy/editor.c editor.c-20080602191336-frj7az1sdk13o1tw-1
subvertpy/subvertpy/ra.py ra.py-20081116162923-6yq5jahxp5y23n5t-1
subvertpy/subvertpy/ra_svn.py ra_svn.py-20081116165419-qplciag3b7ikc6ms-1
tests/mapping3/__init__.py __init__.py-20080831152358-oy04n53cpnh64aj6-1
tests/mapping_implementations/test_repository.py
test_repository.py-20080902013845-ity7d1ymye69sobm-2
------------------------------------------------------------
revno: 1925.2.36
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Tue 2008-11-18 02:48:52 +0100
message:
Fix error name.
modified:
subvertpy/ra.py ra.py-20081116162923-6yq5jahxp5y23n5t-1
------------------------------------------------------------
revno: 1925.2.35
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Tue 2008-11-18 02:47:35 +0100
message:
Use correct error code.
modified:
subvertpy/ra.py ra.py-20081116162923-6yq5jahxp5y23n5t-1
------------------------------------------------------------
revno: 1925.2.34
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: trunk
timestamp: Mon 2008-11-17 23:22:50 +0100
message:
Fix names, use new style classes.
modified:
subvertpy/_ra.c ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
subvertpy/editor.c editor.c-20080602191336-frj7az1sdk13o1tw-1
subvertpy/ra_svn.py ra_svn.py-20081116165419-qplciag3b7ikc6ms-1
=== modified file 'subvertpy/subvertpy/_ra.c'
--- a/subvertpy/subvertpy/_ra.c 2008-11-16 18:41:04 +0000
+++ b/subvertpy/subvertpy/_ra.c 2008-11-18 01:54:17 +0000
@@ -206,7 +206,7 @@
PyTypeObject Reporter_Type = {
PyObject_HEAD_INIT(NULL) 0,
- "ra.Reporter", /* const char *tp_name; For printing, in format
"<module>.<name>" */
+ "_ra.Reporter", /* const char *tp_name; For printing, in format
"<module>.<name>" */
sizeof(ReporterObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
@@ -1942,7 +1942,7 @@
PyTypeObject RemoteAccess_Type = {
PyObject_HEAD_INIT(NULL) 0,
- "ra.RemoteAccess", /* const char *tp_name; For printing, in format
"<module>.<name>" */
+ "_ra.RemoteAccess", /* const char *tp_name; For printing, in format
"<module>.<name>" */
sizeof(RemoteAccessObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
@@ -2026,7 +2026,7 @@
PyTypeObject AuthProvider_Type = {
PyObject_HEAD_INIT(NULL) 0,
- "ra.AuthProvider", /* const char *tp_name; For printing, in format
"<module>.<name>" */
+ "_ra.AuthProvider", /* const char *tp_name; For printing, in format
"<module>.<name>" */
sizeof(AuthProviderObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
@@ -2215,7 +2215,7 @@
PyTypeObject CredentialsIter_Type = {
PyObject_HEAD_INIT(NULL) 0,
- "ra.CredentialsIter", /* const char *tp_name; For printing, in
format "<module>.<name>" */
+ "_ra.CredentialsIter", /* const char *tp_name; For printing, in
format "<module>.<name>" */
sizeof(CredentialsIterObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
@@ -2287,7 +2287,7 @@
PyTypeObject Auth_Type = {
PyObject_HEAD_INIT(NULL) 0,
- "ra.Auth", /* const char *tp_name; For printing, in format
"<module>.<name>" */
+ "_ra.Auth", /* const char *tp_name; For printing, in format
"<module>.<name>" */
sizeof(AuthObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
@@ -2872,7 +2872,7 @@
PyModule_AddObject(mod, "Auth", (PyObject *)&Auth_Type);
Py_INCREF(&Auth_Type);
- busy_exc = PyErr_NewException("ra.BusyException", NULL, NULL);
+ busy_exc = PyErr_NewException("_ra.BusyException", NULL, NULL);
PyModule_AddObject(mod, "BusyException", busy_exc);
PyModule_AddIntConstant(mod, "DIRENT_KIND", SVN_DIRENT_KIND);
=== modified file 'subvertpy/subvertpy/editor.c'
--- a/subvertpy/subvertpy/editor.c 2008-11-10 15:10:19 +0000
+++ b/subvertpy/subvertpy/editor.c 2008-11-18 01:54:17 +0000
@@ -131,7 +131,7 @@
PyTypeObject TxDeltaWindowHandler_Type = {
PyObject_HEAD_INIT(NULL) 0,
- "ra.TxDeltaWindowHandler", /* const char *tp_name; For printing, in
format "<module>.<name>" */
+ "_ra.TxDeltaWindowHandler", /* const char *tp_name; For printing, in
format "<module>.<name>" */
sizeof(TxDeltaWindowHandlerObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
@@ -229,7 +229,7 @@
PyTypeObject FileEditor_Type = {
PyObject_HEAD_INIT(NULL) 0,
- "ra.FileEditor", /* const char *tp_name; For printing, in format
"<module>.<name>" */
+ "_ra.FileEditor", /* const char *tp_name; For printing, in format
"<module>.<name>" */
sizeof(EditorObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
@@ -486,7 +486,7 @@
PyTypeObject DirectoryEditor_Type = {
PyObject_HEAD_INIT(NULL) 0,
- "ra.DirEditor", /* const char *tp_name; For printing, in format
"<module>.<name>" */
+ "_ra.DirEditor", /* const char *tp_name; For printing, in format
"<module>.<name>" */
sizeof(EditorObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
@@ -629,7 +629,7 @@
PyTypeObject Editor_Type = {
PyObject_HEAD_INIT(NULL) 0,
- "ra.Editor", /* const char *tp_name; For printing, in format
"<module>.<name>" */
+ "_ra.Editor", /* const char *tp_name; For printing, in format
"<module>.<name>" */
sizeof(EditorObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
=== modified file 'subvertpy/subvertpy/ra.py'
--- a/subvertpy/subvertpy/ra.py 2008-11-16 23:44:38 +0000
+++ b/subvertpy/subvertpy/ra.py 2008-11-18 01:54:17 +0000
@@ -17,7 +17,7 @@
__author__ = "Jelmer Vernooij <[EMAIL PROTECTED]>"
-from __init__ import SubversionException, ERR_RA_ILLEGAL_URL
+from subvertpy import SubversionException, ERR_BAD_URL
import _ra
from _ra import *
@@ -37,5 +37,5 @@
def RemoteAccess(url, *args, **kwargs):
(type, opaque) = urllib.splittype(url)
if not type in url_handlers:
- raise SubversionException(ERR_RA_ILLEGAL_URL, "Unknown URL type '%s'"
% type)
+ raise SubversionException("Unknown URL type '%s'" % type, ERR_BAD_URL)
return url_handlers[type](url, *args, **kwargs)
=== modified file 'subvertpy/subvertpy/ra_svn.py'
--- a/subvertpy/subvertpy/ra_svn.py 2008-11-17 02:04:21 +0000
+++ b/subvertpy/subvertpy/ra_svn.py 2008-11-17 22:22:50 +0000
@@ -193,7 +193,7 @@
conn._unpack()
-class Reporter:
+class Reporter(object):
def __init__(self, conn, editor):
self.conn = conn
@@ -237,7 +237,7 @@
self.conn.busy = False
-class Editor:
+class Editor(object):
def __init__(self, conn):
self.conn = conn
=== modified file 'tests/mapping3/__init__.py'
--- a/tests/mapping3/__init__.py 2008-11-17 16:40:30 +0000
+++ b/tests/mapping3/__init__.py 2008-11-18 01:54:17 +0000
@@ -250,9 +250,9 @@
dc.close()
repository = Repository.open(self.repos_url)
mapping = repository.get_mapping()
- self.assertEqual((repository.uuid, "", 1),
repository.lookup_revision_id(
+ self.assertEqual(((repository.uuid, "", 1), mapping),
repository.lookup_revision_id(
mapping.revision_id_foreign_to_bzr((repository.uuid, "", 1)))[:2])
- self.assertEqual((repository.uuid, "", 1),
+ self.assertEqual(((repository.uuid, "", 1), mapping),
repository.lookup_revision_id("myid")[:2])
def test_lookup_revision_id_overridden_invalid(self):
@@ -263,7 +263,7 @@
repository = Repository.open(self.repos_url)
mapping = repository.get_mapping()
- self.assertEqual((repository.uuid, "", 1),
repository.lookup_revision_id(
+ self.assertEqual(((repository.uuid, "", 1), mapping),
repository.lookup_revision_id(
mapping.revision_id_foreign_to_bzr((repository.uuid, "", 1)))[:2])
self.assertRaises(NoSuchRevision, repository.lookup_revision_id,
"corrupt-entry")
@@ -282,11 +282,11 @@
self.client_commit("dc", "foobar")
repository = Repository.open(self.repos_url)
mapping = repository.get_mapping()
- self.assertEqual((repository.uuid, "", 2),
repository.lookup_revision_id(
+ self.assertEqual(((repository.uuid, "", 2), mapping),
repository.lookup_revision_id(
mapping.revision_id_foreign_to_bzr((repository.uuid, "", 2)))[:2])
- self.assertEqual((repository.uuid, "", 1),
repository.lookup_revision_id(
+ self.assertEqual(((repository.uuid, "", 1), mapping),
repository.lookup_revision_id(
mapping.revision_id_foreign_to_bzr((repository.uuid, "", 1)))[:2])
- self.assertEqual((repository.uuid, "", 2),
repository.lookup_revision_id(
+ self.assertEqual(((repository.uuid, "", 2), mapping),
repository.lookup_revision_id(
"corrupt-entry")[:2])
def test_lookup_revision_id_overridden_not_found(self):
=== modified file 'tests/mapping_implementations/test_repository.py'
--- a/tests/mapping_implementations/test_repository.py 2008-11-17 16:40:30
+0000
+++ b/tests/mapping_implementations/test_repository.py 2008-11-18 01:54:17
+0000
@@ -785,7 +785,7 @@
self.assertRaises(NoSuchRevision, repository.lookup_revision_id,
"nonexisting")
mapping = repository.get_mapping()
- self.assertEqual((repository.uuid, "bloe", 1),
+ self.assertEqual(((repository.uuid, "bloe", 1), mapping),
repository.lookup_revision_id(
repository.generate_revision_id(1, "bloe", mapping))[:2])
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
