Revamp configuration

aspen/configuration/__init__.py

@@ -21,10 +21,11 @@ def update(value, extend):
                 d[name] = value
 
         # get from the environment
-        envvar = env_prefix + name.upper()
-        raw = os.environ.get(envvar, '').strip()
-        if raw:
-            update(*parse_conf_var(raw, func, 'environment', envvar))
+        if env_prefix:
+            envvar = env_prefix + name.upper()
+            raw = os.environ.get(envvar, '').strip()
+            if raw:
+                update(*parse_conf_var(raw, func, 'environment', envvar))
 
         # get from kwargs
         raw = kwargs.get(name)

aspen/request_processor/__init__.py

@@ -24,8 +24,8 @@
     # 'name':               (default,               from_unicode)
 KNOBS = \
     { 'changes_reload':     (False,                 parse.yes_no)
-    , 'charset_dynamic':    ('UTF-8',               parse.codec)
     , 'charset_static':     (None,                  parse.codec)
+    , 'encode_output_as':   ('UTF-8',               parse.codec)
     , 'indices':            (default_indices,       parse.list_)
     , 'media_type_default': ('text/plain',          parse.media_type)
     , 'media_type_json':    ('application/json',    parse.media_type)
@@ -44,6 +44,8 @@ class RequestProcessor(object):
 
     def __init__(self, **kwargs):
         """Takes configuration in kwargs.
+
+        See the `KNOBS` global variable for valid keys and default values.
         """
         self.algorithm = Algorithm.from_dotted_name('aspen.request_processor.algorithm')
         self.configure(**kwargs)
@@ -81,10 +83,10 @@ def configure(self, **kwargs):
         self.typecasters = default_typecasters
 
 
-        # Configure from defaults, environment, and kwargs.
-        # =================================================
+        # Configure from defaults and kwargs.
+        # ===================================
 
-        configure(KNOBS, self.__dict__, 'ASPEN_', kwargs)
+        configure(KNOBS, self.__dict__, None, kwargs)
 
 
         # Set some attributes.
@@ -109,10 +111,10 @@ def safe_getcwd(errorstr):
         if self.project_root is not None:
             # canonicalize it
             if not os.path.isabs(self.project_root):
-                cwd = safe_getcwd("Could not get a current working "
-                                  "directory. You can specify "
-                                  "ASPEN_PROJECT_ROOT in the environment, "
-                                  "or project_root in kwargs.")
+                cwd = safe_getcwd(
+                    "Could not get a current working directory. You can specify "
+                    "project_root in kwargs."
+                )
                 self.project_root = os.path.join(cwd, self.project_root)
 
             self.project_root = os.path.realpath(self.project_root)
@@ -126,10 +128,10 @@ def safe_getcwd(errorstr):
 
         # www_root
         if self.www_root is None:
-            self.www_root = safe_getcwd("Could not get a current working "
-                                         "directory. You can specify "
-                                         "ASPEN_WWW_ROOT in the environment, "
-                                         "or www_root in kwargs.")
+            self.www_root = safe_getcwd(
+                "Could not get a current working directory. You can specify "
+                "www_root in kwargs."
+            )
 
         self.www_root = os.path.realpath(self.www_root)
 

aspen/request_processor/algorithm.py

@@ -75,5 +75,5 @@ def render_resource(state, resource):
 
 def encode_output(output, request_processor):
     if not isinstance(output.body, bytes):
-        output.charset = request_processor.charset_dynamic
+        output.charset = request_processor.encode_output_as
         output.body = output.body.encode(output.charset)

tests/test_configuration.py

@@ -17,14 +17,14 @@ def test_defaults_to_defaults(harness):
              , rp.www_root
 
              , rp.changes_reload
-             , rp.charset_dynamic
              , rp.charset_static
+             , rp.encode_output_as
              , rp.indices
              , rp.media_type_default
              , rp.media_type_json
              , rp.renderer_default
               )
-    expected = ( None, os.getcwd(), False, 'UTF-8', None
+    expected = ( None, os.getcwd(), False, None, 'UTF-8'
                , ['index.html', 'index.json', 'index', 'index.html.spt', 'index.json.spt', 'index.spt']
                , 'text/plain', 'application/json', 'stdlib_percent'
                 )

tests/test_resources.py

@@ -39,10 +39,10 @@ def test_charset_static_None(harness):
     assert output.media_type == 'text/html'
     assert output.charset is None
 
-def test_charset_dynamic_barely_working(harness):
+def test_encode_output_as_barely_working(harness):
     output = harness.simple( '[---]\n[---]\nGreetings, program!'
                            , 'index.html.spt'
-                           , request_processor_configuration={'charset_dynamic': 'ascii'}
+                           , request_processor_configuration={'encode_output_as': 'ascii'}
                             )
     assert output.media_type == 'text/html'
     assert output.charset == 'ascii'