support instantiation from a byte stream

simplistix · Mar 15, 2019 · acc21db · acc21db
1 parent 1824a46
commit acc21db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/configurator/config.py b/configurator/config.py
@@ -13,7 +13,9 @@ class Config(ConfigNode):
     parsers = load_parsers()
 
     @classmethod
-    def from_text(cls, text, parser):
+    def from_text(cls, text, parser, encoding='ascii'):
+        if isinstance(text, bytes):
+            text = text.decode(encoding)
         return cls.from_stream(StringIO(text), parser)
 
     @classmethod

diff --git a/tests/test_config.py b/tests/test_config.py
@@ -39,6 +39,10 @@ def test_text_string_parser(self):
         config = Config.from_text('{"foo": "bar"}', 'json')
         compare(config.data, expected={'foo': 'bar'})
 
+    def test_bytes_string_parser(self):
+        config = Config.from_text(b'{"foo": "bar"}', 'json')
+        compare(config.data, expected={'foo': 'bar'})
+
     def test_text_callable_parser(self):
         config = Config.from_text("{'foo': 'bar'}", python_literal)
         compare(config.data, expected={'foo': 'bar'})