txAMQP

Merge lp://staging/~esteve/txamqp/397557-support-loading-xml-from-string-2 into lp://staging/txamqp

  1. 397557-support-loading-xml-from-string-2
  2. Merge into trunk
Proposed by Esteve Fernandez
Status: Merged
Merge reported by: Esteve Fernandez
Merged at revision: not available
Proposed branch: lp://staging/~esteve/txamqp/397557-support-loading-xml-from-string-2
Merge into: lp://staging/txamqp
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~esteve/txamqp/397557-support-loading-xml-from-string-2
Reviewer Review Type Date Requested Status
Thomas Herve Approve
Esteve Fernandez Approve
Zooko Wilcox-O'Hearn Pending
Review via email: mp+8907@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Esteve Fernandez (esteve) wrote :

Zooko, can you test if my change doesn't break your setup? Thomas, can you test it doesn't break the testsuite? I tested the latter, but three reviews are better than one :-)

Revision history for this message
Esteve Fernandez (esteve) :
review: Approve
lp://staging/~esteve/txamqp/397557-support-loading-xml-from-string-2 updated
25. By Esteve Fernandez

use lazy loading

Revision history for this message
Thomas Herve (therve) wrote :

Thanks for the fix, +1!

review: Approve
Revision history for this message
Zooko Wilcox-O'Hearn (zooko) wrote :

I didn't look at the patch, but I confirmed that my setup builds and runs with this branch. +1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/txamqp/spec.py'
2--- src/txamqp/spec.py 2009-07-09 21:28:09 +0000
3+++ src/txamqp/spec.py 2009-07-16 19:01:07 +0000
4@@ -244,7 +244,7 @@
5 l.add(Field(f_nd["@name"], f_nd.index(), type, get_docs(f_nd)))
6
7 def load(specfile):
8- return loadString(open(specfile).read(), specfilename=specfile.name)
9+ return loadString(open(specfile).read(), specfilename=specfile)
10
11 def loadString(specfilestr, specfilename=None):
12 doc = xmlutil.parseString(specfilestr)

Subscribers

People subscribed via source and target branches

to status/vote changes: