Merge pull request #13 from dshen109/master

Add `.items()` to Namespaces

pytool/lang.py

@@ -477,7 +477,7 @@ def __bool__(self):
         return bool(self.__dict__)
 
     def iteritems(self, base_name=None):
-        """ Return iterator which returns ``(key, value)`` tuples.
+        """ Return generator which returns ``(key, value)`` tuples.
 
             :param str base_name: Base namespace (optional)
 
@@ -495,6 +495,16 @@ def iteritems(self, base_name=None):
             else:
                 yield name, value
 
+    def items(self, base_name=None):
+        """ Return generator which returns ``(key, value)`` tuples.
+
+            Analagous to dict.items() behavior in Python3
+
+            :param str base_name: Base namespace (optional)
+
+        """
+        return self.iteritems(base_name)
+
     def as_dict(self, base_name=None):
         """ Return the current namespace as a dictionary.
 

test/test_lang.py

@@ -594,7 +594,6 @@ def test_namespace_list_key_access_traversal():
     eq_(ns['foo.0'], 'you')
     eq_(ns['foo.1'], 'blue')
 
-
     ns.nested = []
     ns2 = pytool.lang.Namespace()
     ns2.foo.bar = 'you'
@@ -623,3 +622,23 @@ def test_namespace_traversal_str_key_list_raises_typeerror():
     ns.foo = [1, 2]
 
     ns['foo.1e9']
+
+
+def test_namespace_items():
+    ns = pytool.lang.Namespace()
+    ns.foo = "bar"
+    ns.fooby = "foobar"
+
+    ns_items = {k: v for k, v in ns.items()}
+
+    eq_(ns_items, {"foo": "bar", "fooby": "foobar"})
+
+
+def test_namespace_items_nested():
+    ns = pytool.lang.Namespace()
+    ns.foo.bar = "foobar"
+    ns.fooby = "foobaz"
+
+    ns_items = {k: v for k, v in ns.items()}
+
+    eq_(ns_items, {"foo.bar": "foobar", "fooby": "foobaz"})