Use expose decorator throughout the codebase.

1 files changed, 11 insertions, 11 deletions

diff --git a/cherrypy/test/test_conn.py b/cherrypy/test/test_conn.py
index 3e0cbc16..e5a02ec6 100644
--- a/cherrypy/test/test_conn.py
+++ b/cherrypy/test/test_conn.py
@@ -30,21 +30,22 @@ def setup_server():
 
     class Root:
 
+        @cherrypy.expose
         def index(self):
             return pov
-        index.exposed = True
         page1 = index
         page2 = index
         page3 = index
 
+        @cherrypy.expose
         def hello(self):
             return "Hello, world!"
-        hello.exposed = True
 
+        @cherrypy.expose
         def timeout(self, t):
             return str(cherrypy.server.httpserver.timeout)
-        timeout.exposed = True
 
+        @cherrypy.expose
         def stream(self, set_cl=False):
             if set_cl:
                 cherrypy.response.headers['Content-Length'] = 10
@@ -54,34 +55,34 @@ def setup_server():
                     yield str(x)
 
             return content()
-        stream.exposed = True
         stream._cp_config = {'response.stream': True}
 
+        @cherrypy.expose
         def error(self, code=500):
             raise cherrypy.HTTPError(code)
-        error.exposed = True
 
+        @cherrypy.expose
         def upload(self):
             if not cherrypy.request.method == 'POST':
                 raise AssertionError("'POST' != request.method %r" %
                                      cherrypy.request.method)
             return "thanks for '%s'" % cherrypy.request.body.read()
-        upload.exposed = True
 
+        @cherrypy.expose
         def custom(self, response_code):
             cherrypy.response.status = response_code
             return "Code = %s" % response_code
-        custom.exposed = True
 
+        @cherrypy.expose
         def err_before_read(self):
             return "ok"
-        err_before_read.exposed = True
         err_before_read._cp_config = {'hooks.on_start_resource': raise500}
 
+        @cherrypy.expose
         def one_megabyte_of_a(self):
             return ["a" * 1024] * 1024
-        one_megabyte_of_a.exposed = True
 
+        @cherrypy.expose
         def custom_cl(self, body, cl):
             cherrypy.response.headers['Content-Length'] = cl
             if not isinstance(body, list):
@@ -92,7 +93,6 @@ def setup_server():
                     chunk = chunk.encode('ISO-8859-1')
                 newbody.append(chunk)
             return newbody
-        custom_cl.exposed = True
         # Turn off the encoding tool so it doens't collapse
         # our response body and reclaculate the Content-Length.
         custom_cl._cp_config = {'tools.encode.on': False}
@@ -749,12 +749,12 @@ class ConnectionTests(helper.CPWebCase):
 def setup_upload_server():
 
     class Root:
+        @cherrypy.expose
         def upload(self):
             if not cherrypy.request.method == 'POST':
                 raise AssertionError("'POST' != request.method %r" %
                                      cherrypy.request.method)
             return "thanks for '%s'" % tonative(cherrypy.request.body.read())
-        upload.exposed = True
 
     cherrypy.tree.mount(Root())
     cherrypy.config.update({