Index: package_branches/invirt-web/cherrypy/code/view.py
===================================================================
--- package_branches/invirt-web/cherrypy/code/view.py	(revision 2644)
+++ package_branches/invirt-web/cherrypy/code/view.py	(revision 2645)
@@ -9,4 +9,5 @@
 from invirt.config import structs as config
 from webcommon import State
+
 
 class MakoHandler(cherrypy.dispatch.LateParamPageHandler):
@@ -58,4 +59,5 @@
 cherrypy.tools.mako = cherrypy.Tool('on_start_resource', MakoLoader())
 
+
 def revertStandardError():
     """Move stderr to stdout, and return the contents of the old stderr."""
@@ -66,4 +68,5 @@
     errio.seek(0)
     return errio.read()
+
 
 def catchStderr():
@@ -82,4 +85,5 @@
 cherrypy.tools.catch_stderr = cherrypy.Tool('before_handler', catchStderr)
 
+
 class JSONEncoder(simplejson.JSONEncoder):
 	def default(self, obj):
@@ -91,4 +95,5 @@
 			return simplejson.JSONEncoder.default(self, obj)
 
+
 def jsonify_tool_callback(*args, **kwargs):
     if not cherrypy.request.cached:
@@ -98,4 +103,5 @@
 
 cherrypy.tools.jsonify = cherrypy.Tool('before_finalize', jsonify_tool_callback, priority=30)
+
 
 def require_login():
@@ -107,4 +113,5 @@
 cherrypy.tools.require_login = cherrypy.Tool('on_start_resource', require_login, priority=150)
 
+
 def require_POST():
     """If the request isn't a POST request, raise 405 Method Not Allowed"""
@@ -114,4 +121,5 @@
 
 cherrypy.tools.require_POST = cherrypy.Tool('on_start_resource', require_POST, priority=150)
+
 
 def remote_user_login():
@@ -140,4 +148,5 @@
 cherrypy.tools.remote_user_login = cherrypy.Tool('on_start_resource', remote_user_login, priority=50)
 
+
 def invirtwebstate_init():
     """Initialize the cherrypy.request.state object from Invirt"""
@@ -147,4 +156,5 @@
 cherrypy.tools.invirtwebstate = cherrypy.Tool('on_start_resource', invirtwebstate_init, priority=100)
 
+
 class View(object):
     _cp_config = {'tools.mako.directories': [os.path.join(os.path.dirname(__file__),'templates')]}