Merge pull request #363 from arturponinski/support-prefix-in-environ-env

Support prefix in environ.Env

environ/environ.py

@@ -171,6 +171,7 @@ class Env:
     def __init__(self, **scheme):
         self.smart_cast = True
         self.escape_proxy = False
+        self.prefix = ""
         self.scheme = scheme
 
     def __call__(self, var, cast=None, default=NOTSET, parse_default=False):
@@ -344,8 +345,9 @@ def get_value(self, var, cast=None, default=NOTSET, parse_default=False):
             var, cast, default
         ))
 
-        if var in self.scheme:
-            var_info = self.scheme[var]
+        var_name = "{}{}".format(self.prefix, var)
+        if var_name in self.scheme:
+            var_info = self.scheme[var_name]
 
             try:
                 has_default = len(var_info) == 2
@@ -366,7 +368,7 @@ def get_value(self, var, cast=None, default=NOTSET, parse_default=False):
                     cast = var_info
 
         try:
-            value = self.ENVIRON[var]
+            value = self.ENVIRON[var_name]
         except KeyError as exc:
             if default is self.NOTSET:
                 error_msg = "Set the {} environment variable".format(var)

tests/fixtures.py

@@ -28,10 +28,10 @@ class FakeEnv:
     PATH = '/home/dev'
     EXPORTED = 'exported var'
     SAML_ATTRIBUTE_MAPPING = dict(
-        uid=('username', ),
-        mail=('email', ),
-        cn=('first_name', ),
-        sn=('last_name', )
+        uid=('username',),
+        mail=('email',),
+        cn=('first_name',),
+        sn=('last_name',)
     )
 
     @classmethod
@@ -82,4 +82,6 @@ def generate_data(cls):
                     JSON_VAR=json.dumps(cls.JSON),
                     PATH_VAR=cls.PATH,
                     EXPORTED_VAR=cls.EXPORTED,
-                    SAML_ATTRIBUTE_MAPPING='uid=username;mail=email;cn=first_name;sn=last_name;')
+                    SAML_ATTRIBUTE_MAPPING='uid=username;mail=email;cn=first_name;sn=last_name;',
+                    PREFIX_TEST='foo',
+                    )

tests/test_env.py

@@ -312,6 +312,10 @@ def test_smart_cast(self):
     def test_exported(self):
         assert self.env('EXPORTED_VAR') == FakeEnv.EXPORTED
 
+    def test_prefix(self):
+        self.env.prefix = 'PREFIX_'
+        assert self.env('TEST') == 'foo'
+
 
 class TestFileEnv(TestEnv):
     def setup_method(self, method):

tests/test_env.txt

@@ -59,3 +59,6 @@ SAML_ATTRIBUTE_MAPPING="uid=username;mail=email;cn=first_name;sn=last_name;"
 
 # Exports
 export EXPORTED_VAR="exported var"
+
+# Prefixed
+PREFIX_TEST='foo'