Fixed minor issues

dhondta · dhondta · commit beeb8adcbb5d · 2021-12-26T17:01:55.000+01:00
diff --git a/codext/__common__.py b/codext/__common__.py
@@ -273,7 +273,7 @@ class StreamReader(Codec, codecs.StreamReader):
             CODECS_CATEGORIES.append(cat)
         ci.parameters['category'] = kwargs.get('category', cat)
         ci.parameters['examples'] = kwargs.get('examples', glob.get('__examples__'))
-        ci.parameters['guess'] = kwargs.get('guess', glob.get('__guess__', [ename]))
+        ci.parameters['guess'] = kwargs.get('guess', glob.get('__guess__', [ename])) or []
         ci.parameters['module'] = kwargs.get('module', glob.get('__name__'))
         ci.parameters.setdefault("scoring", {})
         for attr in ["bonus_func", "entropy", "len_charset", "penalty", "printables_rate", "padding_char"]:
diff --git a/tests/test_common.py b/tests/test_common.py
@@ -242,7 +242,8 @@ def test_handle_macros(self):
         self.assertIsNone(codext.remove("VALID-MACRO"))
         self.assertIsNone(codext.add_macro("VALID-MACRO", "gzip", "base64"))
         self.assertIsNone(codext.remove("VALID-MACRO"))
-        self.assertIsNone(codext.add_macro("VALID-MACRO", "lzma", "base64"))
-        self.assertIsNone(codext.remove("VALID-MACRO"))
+        if PY3:
+            self.assertIsNone(codext.add_macro("VALID-MACRO", "lzma", "base64"))
+            self.assertIsNone(codext.remove("VALID-MACRO"))
         self.assertRaises(ValueError, codext.add_macro, "SHALL-FAIL", "base26", "sms", "letter-indices")
 
