Browse code
changed string formatting to be python 3 compatible
Michael Penhallegon authored on 03/10/2011 22:45:42
Showing 1 changed files
Showing 1 changed files
... | ... |
@@ -135,10 +135,10 @@ class JSONRPCProxy(object): |
135 | 135 |
def from_url(cls, url, ctxid=None, serviceName=None): |
136 | 136 |
'''Create a JSONRPCProxy from a URL''' |
137 | 137 |
urlsp = urlparse.urlsplit(url) |
138 |
- url = '%s://%s' % (urlsp.scheme, urlsp.netloc) |
|
138 |
+ url = '{0}://{1}'.format(urlsp.scheme, urlsp.netloc) |
|
139 | 139 |
path = urlsp.path |
140 |
- if urlsp.query: path = '%s?%s' % (path, urlsp.query) |
|
141 |
- if urlsp.fragment: path = '%s#%s' % (path, urlsp.fragment) |
|
140 |
+ if urlsp.query: path = '{0}?{1}'.format(path, urlsp.query) |
|
141 |
+ if urlsp.fragment: path = '{0}#{1}'.format(path, urlsp.fragment) |
|
142 | 142 |
return cls(url, path, serviceName, ctxid) |
143 | 143 |
|
144 | 144 |
|
... | ... |
@@ -160,7 +160,7 @@ class JSONRPCProxy(object): |
160 | 160 |
|
161 | 161 |
def __getattr__(self, name): |
162 | 162 |
if self._serviceName != None: |
163 |
- name = "%s.%s" % (self._serviceName, name) |
|
163 |
+ name = "{0}.{1}".format(self._serviceName, name) |
|
164 | 164 |
return self.__class__(self.serviceURL, path=self._path, serviceName=name).customize(type(self._eventhandler))._set_opener(self._opener) |
165 | 165 |
|
166 | 166 |
|
... | ... |
@@ -211,7 +211,7 @@ class JSONRPCProxy(object): |
211 | 211 |
result = None |
212 | 212 |
if hasattr(methods, 'items'): methods = methods.items() |
213 | 213 |
data = [ getattr(self, k)._get_postdata(*v) for k, v in methods ] |
214 |
- postdata = '[%s]' % ','.join(data) |
|
214 |
+ postdata = '{0}'.format(','.join(data)) |
|
215 | 215 |
respdata = self._post(self._get_url(), postdata).read() |
216 | 216 |
resp = Response.from_json(respdata) |
217 | 217 |
try: |