Remove comments and fix PEP8 issues

AMeng · AMeng · commit d021902e0ddf · 2015-03-14T23:47:43.000-04:00
diff --git a/saml/__init__.py b/saml/__init__.py
@@ -9,14 +9,15 @@
 """
 # Version of the library.
 from ._version import __version__, __version_info__  # noqa
-VERSION = __version__
 
 # Version of the SAML standard supported.
 from .schema import VERSION as SAML_VERSION
 
 from .signature import sign, verify
 from . import client
 
+VERSION = __version__
+
 __all__ = [
     'VERSION',
     'SAML_VERSION',
diff --git a/saml/schema/base.py b/saml/schema/base.py
@@ -55,6 +55,10 @@ def _is_derived(cls, name, bases):
         # This is not derived at all from Resource (eg. is base).
         return False
 
+    @classmethod
+    def _get_attributes_dict(cls, obj):
+        return {n: getattr(obj, n) for n in dir(obj)}
+
     def __new__(cls, name, bases, attrs):
         # Only continue if we are dervied from declarative.
         if not cls._is_derived(name, bases):
@@ -64,20 +68,19 @@ def __new__(cls, name, bases, attrs):
         # Gather the attributes of all options classes.
         # Start with the base configuration.
         metadata = {}
-        values = lambda x: {n: getattr(x, n) for n in dir(x)}
 
         # Expand the options class with the gathered metadata.
         base_meta = []
         cls._gather_metadata(base_meta, bases)
 
         # Apply the configuration from each class in the chain.
         for meta in base_meta:
-            metadata.update(**values(meta))
+            metadata.update(**cls._get_attributes_dict(meta))
 
         # Apply the configuration from the current class.
         cur_meta = {}
         if attrs.get('Meta'):
-            cur_meta = values(attrs['Meta'])
+            cur_meta = cls._get_attributes_dict(attrs['Meta'])
             metadata.update(**cur_meta)
 
         # Gather and construct the options object.
@@ -93,8 +96,8 @@ def __new__(cls, name, bases, attrs):
                 attrs['_items'].update(values)
 
         # Collect attributes from current class.
-        test = lambda x: issubclass(type(x[1]), Component)
-        attrs_l = list(filter(test, attrs.items()))
+        attrs_l = list(filter(lambda x: issubclass(type(x[1]), Component),
+                              attrs.items()))
         attrs_l.sort(key=lambda x: x[1].creation_counter)
         for key, attr in attrs_l:
             # If name reference is null; default to camel-cased name.
diff --git a/tests/test_schema.py b/tests/test_schema.py
@@ -303,15 +303,6 @@ def test_generic_deserialize_outside_registry():
     assert result is None
 
 
-# NAMES = [
-#     'assertion',
-#     'response',
-#     'logout-response',
-#     'artifact-resolve',
-#     'artifact-response'
-# ]
-
-
 @mark.parametrize('name', NAMES)
 def test_sign(name):
     # Load the expected result.
@@ -330,10 +321,6 @@ def test_sign(name):
         # Sign the result.
         saml.sign(result, stream)
 
-    # print()
-    # print(etree.tostring(result).decode('utf8'))
-    # print()
-
     # Compare the nodes.
     assert_node(expected, result)
 
@@ -358,7 +345,7 @@ def test_verify_with_bad_signature_returns_False(name):
     signature_node.clear()
 
     with open(path.join(BASE_DIR, 'rsapub.pem'), 'r') as stream:
-        assert saml.verify(expected, stream) == False
+        assert saml.verify(expected, stream) is False
 
 
 @mark.parametrize('name', NAMES)
@@ -367,4 +354,4 @@ def test_verify_with_no_signature_returns_False(name):
     expected = etree.parse(filename).getroot()
 
     with open(path.join(BASE_DIR, 'rsapub.pem'), 'r') as stream:
-        assert saml.verify(expected, stream) == False
+        assert saml.verify(expected, stream) is False
