]>
Commit | Line | Data |
---|---|---|
bef057b8 | 1 | diff -Naur xen-2.0.orig/tools/python/xen/xend/server/SrvBase.py xen-2.0/tools/python/xen/xend/server/SrvBase.py |
2 | --- xen-2.0.orig/tools/python/xen/xend/server/SrvBase.py 2005-05-22 12:56:27.000000000 +0200 | |
3 | +++ xen-2.0/tools/python/xen/xend/server/SrvBase.py 2005-06-12 20:08:20.000000000 +0200 | |
4 | @@ -9,7 +9,7 @@ | |
5 | ||
6 | from twisted.internet import defer | |
7 | from twisted.internet import reactor | |
8 | -from twisted.protocols import http | |
9 | +from twisted.web import http | |
10 | from twisted.web import error | |
11 | from twisted.web import resource | |
12 | from twisted.web import server | |
13 | diff -Naur xen-2.0.orig/tools/python/xen/xend/server/SrvDir.py xen-2.0/tools/python/xen/xend/server/SrvDir.py | |
14 | --- xen-2.0.orig/tools/python/xen/xend/server/SrvDir.py 2005-05-22 12:56:27.000000000 +0200 | |
15 | +++ xen-2.0/tools/python/xen/xend/server/SrvDir.py 2005-06-12 20:08:26.000000000 +0200 | |
16 | @@ -1,6 +1,6 @@ | |
17 | # Copyright (C) 2004 Mike Wray <mike.wray@hp.com> | |
18 | ||
19 | -from twisted.protocols import http | |
20 | +from twisted.web import http | |
21 | from twisted.web import error | |
22 | ||
23 | from xen.xend import sxp | |
24 | diff -Naur xen-2.0.orig/tools/python/xen/xend/server/SrvDomainDir.py xen-2.0/tools/python/xen/xend/server/SrvDomainDir.py | |
25 | --- xen-2.0.orig/tools/python/xen/xend/server/SrvDomainDir.py 2005-05-22 12:56:31.000000000 +0200 | |
26 | +++ xen-2.0/tools/python/xen/xend/server/SrvDomainDir.py 2005-06-12 20:08:40.000000000 +0200 | |
27 | @@ -3,7 +3,7 @@ | |
28 | import traceback | |
29 | from StringIO import StringIO | |
30 | ||
31 | -from twisted.protocols import http | |
32 | +from twisted.web import http | |
33 | from twisted.web import error | |
34 | from twisted.python.failure import Failure | |
35 | ||
36 | diff -Naur xen-2.0.orig/tools/python/xen/xend/server/SrvDomain.py xen-2.0/tools/python/xen/xend/server/SrvDomain.py | |
37 | --- xen-2.0.orig/tools/python/xen/xend/server/SrvDomain.py 2005-05-22 12:56:30.000000000 +0200 | |
38 | +++ xen-2.0/tools/python/xen/xend/server/SrvDomain.py 2005-06-12 20:08:33.000000000 +0200 | |
39 | @@ -1,6 +1,6 @@ | |
40 | # Copyright (C) 2004 Mike Wray <mike.wray@hp.com> | |
41 | ||
42 | -from twisted.protocols import http | |
43 | +from twisted.web import http | |
44 | ||
45 | from xen.xend import sxp | |
46 | from xen.xend import XendDomain | |
47 | diff -Naur xen-2.0.orig/tools/python/xen/xend/XendAsynchProtocol.py xen-2.0/tools/python/xen/xend/XendAsynchProtocol.py | |
48 | --- xen-2.0.orig/tools/python/xen/xend/XendAsynchProtocol.py 2005-05-22 12:56:31.000000000 +0200 | |
49 | +++ xen-2.0/tools/python/xen/xend/XendAsynchProtocol.py 2005-06-12 20:08:10.000000000 +0200 | |
50 | @@ -1,6 +1,6 @@ | |
51 | # Copyright (C) 2004 Mike Wray <mike.wray@hp.com> | |
52 | ||
53 | -from twisted.protocols import http | |
54 | +from twisted.web import http | |
55 | from twisted.internet.protocol import ClientCreator | |
56 | from twisted.internet.defer import Deferred | |
57 | from twisted.internet import reactor |