--- a/src/modules/client/progress.py	Tue Feb 24 14:50:35 2015 -0800
+++ b/src/modules/client/progress.py	Tue Mar 03 16:52:12 2015 -0800
@@ -2136,7 +2136,7 @@
                 if outspec.first:
                         if self.lint_phasetype == self.LINT_PHASETYPE_SETUP:
                                 self._pe.cprint("{0} ... ".format(
-                                    self.lintitems.name, end=''))
+                                    self.lintitems.name), end='')
                         elif self.lint_phasetype == self.LINT_PHASETYPE_EXECUTE:
                                 self._pe.cprint("# --- {0} ---".format(
                                     self.lintitems.name))

--- a/src/modules/server/depot.py	Tue Feb 24 14:50:35 2015 -0800
+++ b/src/modules/server/depot.py	Tue Mar 03 16:52:12 2015 -0800
@@ -297,7 +297,7 @@
                         if key in response.headers:
                                 del response.headers[key]
 
-                return _HTTPErrorTemplate.format(**kwargs)
+                return _HTTPErrorTemplate % kwargs
 
         def _get_req_pub(self):
                 """Private helper function to retrieve the publisher prefix

--- a/src/util/apache2/depot/depot_index.py	Tue Feb 24 14:50:35 2015 -0800
+++ b/src/util/apache2/depot/depot_index.py	Tue Mar 03 16:52:12 2015 -0800
@@ -716,19 +716,19 @@
                         # Convert the error to a 404 to obscure implementation
                         # from the client, but log the original error to the
                         # server logs.
-                        error = cherrypy._cperror._HTTPErrorTemplate.format(
-                            status=httplib.NOT_FOUND,
-                            message=httplib.responses[httplib.NOT_FOUND],
-                            traceback="",
-                            version=cherrypy.__version__)
+                        error = cherrypy._cperror._HTTPErrorTemplate % \
+                            {"status": httplib.NOT_FOUND,
+                            "message": httplib.responses[httplib.NOT_FOUND],
+                            "traceback": "",
+                            "version": cherrypy.__version__}
                         print("Path that raised exception was {0}".format(
                             cherrypy.request.path_info))
                         print(message)
                         return error
                 else:
-                        error = cherrypy._cperror._HTTPErrorTemplate.format(
-                            status=httplib.NOT_FOUND, message=message,
-                            traceback="", version=cherrypy.__version__)
+                        error = cherrypy._cperror._HTTPErrorTemplate % \
+                            {"status": httplib.NOT_FOUND, "message": message,
+                            "traceback": "", "version": cherrypy.__version__}
                         return error
 
         def dispatch(self, path_info):