Migrated % string formating

btsync/client.py

@@ -41,7 +41,7 @@ def __init__(self, **kwargs):
         self._password = kwargs.pop('password', 'password')
 
         assert len(kwargs.keys()) == 0, \
-            "Unrecognized params: %r" % kwargs.keys()
+            "Unrecognized params: {0!r}".format(kwargs.keys())
         self._session = self._authenticate()
 
     def _make_request(self, **kwargs):
@@ -65,7 +65,7 @@ def _make_request(self, **kwargs):
 
         method = getattr(
             session if session is not None else self._session, method)
-        assert method is not None, 'Invalid method: %s' % method
+        assert method is not None, 'Invalid method: {0!s}'.format(method)
 
         response = method(url)
         response.raise_for_status()

btsync/models.py

@@ -7,7 +7,7 @@ def __init__(self, **params):
                 value = params.pop(field)
                 self[field] = factory(value)
 
-        assert len(params) == 0, "Unrecognized params: %r" % params.keys()
+        assert len(params) == 0, "Unrecognized params: {0!r}".format(params.keys())
 
 
 class Settings(Model):

fabfile.py

@@ -3,7 +3,7 @@
 
 def _run_coverage_for(kind):
     assert kind in ('unit', 'integration', '')
-    test_folder = 'test/%s' % kind
+    test_folder = 'test/{0!s}'.format(kind)
     local('coverage run --source=btsync,%(test_folder)s '
           '$(which nosetests) %(test_folder)s' % dict(
               test_folder=test_folder))

test/integration/test_integration.py

@@ -34,7 +34,7 @@ def setup(self):
 
         with open(config_file_name, 'w') as f:
             CONFIG['storage_path'] = storage_path
-            CONFIG['webui']['listen'] = '0.0.0.0:%s' % PORT
+            CONFIG['webui']['listen'] = '0.0.0.0:{0!s}'.format(PORT)
             json.dump(CONFIG, f)
 
         self.btsync_process = subprocess.Popen([