summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2014-01-09 18:49:33 +0100
committerJulien Danjou <julien@danjou.info>2014-01-10 14:17:33 +0100
commitd69a287ba4fb78d0edc921f663ea4fd944f2661e (patch)
tree919611a41fd7cf5b985e03fe1c087ce9b564d6cb
parente26d1b608cc5a05940c0b6b7fc176a0d587ba611 (diff)
downloadwsme-d69a287ba4fb78d0edc921f663ea4fd944f2661e.tar.gz
pecan: cleanup, use global vars and staticmethod
Change-Id: If5a7c1b4b71380053ed650ddc8e9928422869807
-rw-r--r--wsmeext/pecan.py41
1 files changed, 23 insertions, 18 deletions
diff --git a/wsmeext/pecan.py b/wsmeext/pecan.py
index 66b9e7a..41c0334 100644
--- a/wsmeext/pecan.py
+++ b/wsmeext/pecan.py
@@ -15,10 +15,12 @@ from wsme.utils import is_valid_code
class JSonRenderer(object):
- def __init__(self, path, extra_vars):
+ @staticmethod
+ def __init__(path, extra_vars):
pass
- def render(self, template_path, namespace):
+ @staticmethod
+ def render(template_path, namespace):
if 'faultcode' in namespace:
return wsme.rest.json.encode_error(None, namespace)
return wsme.rest.json.encode_result(
@@ -28,10 +30,12 @@ class JSonRenderer(object):
class XMLRenderer(object):
- def __init__(self, path, extra_vars):
+ @staticmethod
+ def __init__(path, extra_vars):
pass
- def render(self, template_path, namespace):
+ @staticmethod
+ def render(template_path, namespace):
if 'faultcode' in namespace:
return wsme.rest.xml.encode_error(None, namespace)
return wsme.rest.xml.encode_result(
@@ -42,22 +46,23 @@ class XMLRenderer(object):
pecan.templating._builtin_renderers['wsmejson'] = JSonRenderer
pecan.templating._builtin_renderers['wsmexml'] = XMLRenderer
+pecan_json_decorate = pecan.expose(
+ template='wsmejson:',
+ content_type='application/json',
+ generic=False)
+pecan_xml_decorate = pecan.expose(
+ template='wsmexml:',
+ content_type='application/xml',
+ generic=False
+)
+pecan_text_xml_decorate = pecan.expose(
+ template='wsmexml:',
+ content_type='text/xml',
+ generic=False
+)
+
def wsexpose(*args, **kwargs):
- pecan_json_decorate = pecan.expose(
- template='wsmejson:',
- content_type='application/json',
- generic=False)
- pecan_xml_decorate = pecan.expose(
- template='wsmexml:',
- content_type='application/xml',
- generic=False
- )
- pecan_text_xml_decorate = pecan.expose(
- template='wsmexml:',
- content_type='text/xml',
- generic=False
- )
sig = wsme.signature(*args, **kwargs)
def decorate(f):