[z3-checkins] r51808 - z3/deliverance/branches/urienv/deliverance

[tseaver at codespeak.net]

Author: tseaver
Date: Fri Feb 22 20:04:40 2008
New Revision: 51808

Modified:
   z3/deliverance/branches/urienv/deliverance/test_wsgi.py
   z3/deliverance/branches/urienv/deliverance/utils.py
   z3/deliverance/branches/urienv/deliverance/wsgimiddleware.py
Log:
Avoid camelCased API names.

Modified: z3/deliverance/branches/urienv/deliverance/test_wsgi.py
==============================================================================
--- z3/deliverance/branches/urienv/deliverance/test_wsgi.py	(original)
+++ z3/deliverance/branches/urienv/deliverance/test_wsgi.py	Fri Feb 22 20:04:40 2008
@@ -317,33 +317,33 @@
     assert(status == 200)
 
 def do_rule_uri_environ(renderer_type, name):
-    from deliverance.utils import setRuleURI
+    from deliverance.utils import set_rule_uri
     wsgi_app = DeliveranceMiddleware(urienv_app, 'theme.html', 'rules.xml',
                                      renderer_type)
     environ = {}
-    setRuleURI(environ, 'rules2.xml')
+    set_rule_uri(environ, 'rules2.xml')
     app = TestApp(wsgi_app, extra_environ=environ)
     res = app.get('/example.html')
     res2 = app.get('/example_expected_rule_uri_environ.html?notheme')
     html_string_compare(res.body, res2.body)
 
 def do_theme_uri_environ(renderer_type, name):
-    from deliverance.utils import setThemeURI
+    from deliverance.utils import set_theme_uri
     wsgi_app = DeliveranceMiddleware(urienv_app, 'theme.html', 'rules.xml',
                                      renderer_type)
     environ = {}
-    setThemeURI(environ, 'theme2.html')
+    set_theme_uri(environ, 'theme2.html')
     app = TestApp(wsgi_app, extra_environ=environ)
     res = app.get('/example.html')
     res2 = app.get('/example_expected_theme_uri_environ.html?notheme')
     html_string_compare(res.body, res2.body)
     
 def do_serializer_environ(renderer_type, name):
-    from deliverance.utils import setSerializer
+    from deliverance.utils import set_serializer
     wsgi_app = DeliveranceMiddleware(urienv_app, 'theme.html', 'rules.xml',
                                      renderer_type)
     environ = {}
-    setSerializer(environ, 'deliverance.test_wsgi:_uppercaseTextNodes')
+    set_serializer(environ, 'deliverance.test_wsgi:_uppercaseTextNodes')
     app = TestApp(wsgi_app, extra_environ=environ)
     res = app.get('/example.html')
     res2 = app.get('/example_expected_uppercase.html?notheme')

Modified: z3/deliverance/branches/urienv/deliverance/utils.py
==============================================================================
--- z3/deliverance/branches/urienv/deliverance/utils.py	(original)
+++ z3/deliverance/branches/urienv/deliverance/utils.py	Fri Feb 22 20:04:40 2008
@@ -540,26 +540,26 @@
 
 _THEME_URI_KEY = 'deliverance.theme_uri'
 
-def setThemeURI(environ, uri):
+def set_theme_uri(environ, uri):
     environ[_THEME_URI_KEY] = uri
 
-def getThemeURI(environ, default=None):
+def get_theme_uri(environ, default=None):
     return environ.get(_THEME_URI_KEY, default)
 
 _RULE_URI_KEY = 'deliverance.rule_uri'
 
-def setRuleURI(environ, uri):
+def set_rule_uri(environ, uri):
     environ[_RULE_URI_KEY] = uri
 
-def getRuleURI(environ, default=None):
+def get_rule_uri(environ, default=None):
     return environ.get(_RULE_URI_KEY, default)
 
 _SERIALIZER_KEY = 'deliverance.serializer'
 
-def setSerializer(environ, dotted_or_egg):
+def set_serializer(environ, dotted_or_egg):
     environ[_SERIALIZER_KEY] = dotted_or_egg
 
-def getSerializer(environ, default=None):
+def get_serializer(environ, default=None):
     dotted_or_egg = environ.get(_SERIALIZER_KEY, default)
     if isinstance(dotted_or_egg, basestring):
         return _resolveDottedOrEgg(dotted_or_egg)

Modified: z3/deliverance/branches/urienv/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/branches/urienv/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/branches/urienv/deliverance/wsgimiddleware.py	Fri Feb 22 20:04:40 2008
@@ -15,9 +15,9 @@
 from htmlserialize import tostring
 from deliverance.utils import DeliveranceError
 from deliverance.utils import DELIVERANCE_ERROR_PAGE
-from deliverance.utils import getThemeURI
-from deliverance.utils import getRuleURI
-from deliverance.utils import getSerializer
+from deliverance.utils import get_theme_uri
+from deliverance.utils import get_rule_uri
+from deliverance.utils import get_serializer
 from deliverance.resource_fetcher import InternalResourceFetcher, FileResourceFetcher, ExternalResourceFetcher
 from deliverance import cache_utils
 import sys 
@@ -148,7 +148,7 @@
         """
         if environ is None:
             environ = {}
-        rule_uri = getRuleURI(environ, self.rule_uri)
+        rule_uri = get_rule_uri(environ, self.rule_uri)
         try:
             return (self.get_resource(environ, rule_uri), rule_uri)
         except Exception, message:
@@ -166,7 +166,7 @@
         """
         if environ is None:
             environ = {}
-        theme_uri = getThemeURI(environ, self.theme_uri)
+        theme_uri = get_theme_uri(environ, self.theme_uri)
         try:
             return (self.get_resource(environ, theme_uri), theme_uri)
         except Exception, message:
@@ -257,7 +257,7 @@
         or whatever the configured serializer makes it.
         """
         content = self.get_renderer(environ).render(parseHTML(body))
-        serializer = getSerializer(environ, self.serializer)
+        serializer = get_serializer(environ, self.serializer)
         return serializer(content)
 
 
@@ -454,9 +454,9 @@
         if environ is None:
             environ = {}
         resources = Set()
-        rule_uri = getRuleURI(environ, self.rule_uri)
+        rule_uri = get_rule_uri(environ, self.rule_uri)
         resources.add(rule_uri)
-        theme_uri = getThemeURI(environ, self.theme_uri)
+        theme_uri = get_theme_uri(environ, self.theme_uri)
         resources.add(theme_uri)
 
         for rule in rules: