From 4711b7ae8befb52017ed5abdd272f6e5eff61606 Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Fri, 3 Oct 2014 14:13:36 -0400
Subject: Introduce viewkeys(), viewvalues(), and viewitems().

Closes issue #92
---
 six.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'six.py')

diff --git a/six.py b/six.py
index 21b0e80..5efb62b 100644
--- a/six.py
+++ b/six.py
@@ -554,6 +554,15 @@ if PY3:
 
     def iterlists(d, **kw):
         return iter(d.lists(**kw))
+
+    def viewkeys(d, **kw):
+        return d.keys(**kw)
+
+    def viewvalues(d, **kw):
+        return d.values(**kw)
+
+    def viewitems(d, **kw):
+        return d.items(**kw)
 else:
     def iterkeys(d, **kw):
         return iter(d.iterkeys(**kw))
@@ -567,12 +576,25 @@ else:
     def iterlists(d, **kw):
         return iter(d.iterlists(**kw))
 
+    def viewkeys(d, **kw):
+        return d.viewkeys(**kw)
+
+    def viewvalues(d, **kw):
+        return d.viewvalues(**kw)
+
+    def viewitems(d, **kw):
+        return d.viewitems(**kw)
+
 _add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
 _add_doc(itervalues, "Return an iterator over the values of a dictionary.")
 _add_doc(iteritems,
          "Return an iterator over the (key, value) pairs of a dictionary.")
 _add_doc(iterlists,
          "Return an iterator over the (key, [values]) pairs of a dictionary.")
+_add_doc(viewkeys, "Return a view over the keys of a dictionary.")
+_add_doc(viewvalues, "Retun a view over the values of a dictionary.")
+_add_doc(viewitems,
+         "Return a view over the (key, value) pairs of a dictionary.")
 
 
 if PY3:
-- 
cgit v1.2.1


From 165e06f7cbb9fd1861aea0cc08ebd331597afff5 Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Sun, 5 Oct 2014 16:28:21 -0400
Subject: Address PR comments

---
 six.py | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'six.py')

diff --git a/six.py b/six.py
index 5efb62b..4252fdf 100644
--- a/six.py
+++ b/six.py
@@ -555,14 +555,11 @@ if PY3:
     def iterlists(d, **kw):
         return iter(d.lists(**kw))
 
-    def viewkeys(d, **kw):
-        return d.keys(**kw)
+    viewkeys = operator.methodcaller("keys")
 
-    def viewvalues(d, **kw):
-        return d.values(**kw)
+    viewvalues = operator.methodcaller("values")
 
-    def viewitems(d, **kw):
-        return d.items(**kw)
+    viewitems = operator.methodcaller("items")
 else:
     def iterkeys(d, **kw):
         return iter(d.iterkeys(**kw))
@@ -576,14 +573,11 @@ else:
     def iterlists(d, **kw):
         return iter(d.iterlists(**kw))
 
-    def viewkeys(d, **kw):
-        return d.viewkeys(**kw)
+    viewkeys = operator.methodcaller("viewkeys")
 
-    def viewvalues(d, **kw):
-        return d.viewvalues(**kw)
+    viewvalues = operator.methodcaller("viewvalues")
 
-    def viewitems(d, **kw):
-        return d.viewitems(**kw)
+    viewitems = operator.methodcaller("viewitems")
 
 _add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
 _add_doc(itervalues, "Return an iterator over the values of a dictionary.")
@@ -591,10 +585,6 @@ _add_doc(iteritems,
          "Return an iterator over the (key, value) pairs of a dictionary.")
 _add_doc(iterlists,
          "Return an iterator over the (key, [values]) pairs of a dictionary.")
-_add_doc(viewkeys, "Return a view over the keys of a dictionary.")
-_add_doc(viewvalues, "Retun a view over the values of a dictionary.")
-_add_doc(viewitems,
-         "Return a view over the (key, value) pairs of a dictionary.")
 
 
 if PY3:
-- 
cgit v1.2.1