1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
=== modified file 'bzrlib/errors.py'
--- bzrlib/errors.py 2006-08-22 21:31:23 +0000
+++ bzrlib/errors.py 2006-09-21 21:01:04 +0000
@@ -44,7 +44,7 @@
>>> try:
... raise NotBranchError(path='/foo/bar')
... except:
-... print sys.exc_type
+... print '%s.%s' % (sys.exc_type.__module__, sys.exc_type.__name__)
... print sys.exc_value
... path = getattr(sys.exc_value, 'path', None)
... if path is not None:
@@ -264,8 +264,7 @@
def __init__(self, msg, base, args):
PathError.__init__(self, base, msg)
- self.args = [base]
- self.args.extend(args)
+ self.args = [base] + list(args)
class UnsupportedProtocol(PathError):
=== modified file 'bzrlib/plugins/launchpad/test_register.py'
--- bzrlib/plugins/launchpad/test_register.py 2006-05-16 02:31:06 +0000
+++ bzrlib/plugins/launchpad/test_register.py 2006-09-21 21:44:39 +0000
@@ -71,6 +71,9 @@
class InstrumentedXMLRPCTransport(xmlrpclib.Transport):
+ # Python 2.5's xmlrpclib looks for this.
+ _use_datetime = False
+
def __init__(self, testcase):
self.testcase = testcase
=== modified file 'bzrlib/trace.py'
--- bzrlib/trace.py 2006-08-22 21:39:33 +0000
+++ bzrlib/trace.py 2006-09-21 20:53:45 +0000
@@ -288,7 +288,8 @@
"""Report an exception that probably indicates a bug in bzr"""
import traceback
exc_type, exc_object, exc_tb = exc_info
- print >>err_file, "bzr: ERROR: %s: %s" % (exc_type, exc_object)
+ print >>err_file, "bzr: ERROR: %s.%s: %s" % (
+ exc_type.__module__, exc_type.__name__, exc_object)
print >>err_file
traceback.print_exception(exc_type, exc_object, exc_tb, file=err_file)
print >>err_file
|