git.fiddlerwoaroof.com
Browse code

changed string formatting to be python 3 compatible

Michael Penhallegon authored on 03/10/2011 22:45:42
Showing 1 changed files
... ...
@@ -123,10 +123,10 @@ class JSONRPCProxy(object):
123 123
 	def from_url(cls, url, ctxid=None, serviceName=None):
124 124
 		'''Create a JSONRPCProxy from a URL'''
125 125
 		urlsp = urlparse.urlsplit(url)
126
-		url = '%s://%s' % (urlsp.scheme, urlsp.netloc)
126
+		url = '{0}://{1}'.format(urlsp.scheme, urlsp.netloc)
127 127
 		path = urlsp.path
128
-		if urlsp.query: path = '%s?%s' % (path, urlsp.query)
129
-		if urlsp.fragment: path = '%s#%s' % (path, urlsp.fragment)
128
+		if urlsp.query: path = '{0}?{1}'.format(path, urlsp.query)
129
+		if urlsp.fragment: path = '{0}#{1}'.format(path, urlsp.fragment)
130 130
 		return cls(url, path, serviceName, ctxid)
131 131
 
132 132
 
... ...
@@ -148,7 +148,7 @@ class JSONRPCProxy(object):
148 148
 
149 149
 	def __getattr__(self, name):
150 150
 		if self._serviceName != None:
151
-			name = "%s.%s" % (self._serviceName, name)
151
+			name = "{0}.{1}".format(self._serviceName, name)
152 152
 		return self.__class__(self.serviceURL, path=self._path, serviceName=name).customize(type(self._eventhandler))._set_opener(self._opener)
153 153
 
154 154
 
... ...
@@ -199,7 +199,7 @@ class JSONRPCProxy(object):
199 199
 		result = None
200 200
 		if hasattr(methods, 'items'): methods = methods.items()
201 201
 		data = [ getattr(self, k)._get_postdata(*v) for k, v in methods ]
202
-		postdata = '[%s]' % ','.join(data)
202
+		postdata = '{0}'.format(','.join(data))
203 203
 		respdata = self._post(self._get_url(), postdata).read()
204 204
 		resp = Response.from_json(respdata)
205 205
 		try: