[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/77e5df9c1899
changeset:   86118:77e5df9c1899
parent:      86116:49e9ae4df749
parent:      86117:ea9fe37518d8
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 19:14:46 2013 +0200
summary:
  merge with 3.3

files:
  Doc/library/operator.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/operator.rst b/Doc/library/operator.rst
--- a/Doc/library/operator.rst
+++ b/Doc/library/operator.rst
@@ -278,7 +278,7 @@
                   return resolve_attr(obj, attr)
           else:
               def g(obj):
-                  return tuple(resolve_att(obj, attr) for attr in items)
+                  return tuple(resolve_attr(obj, attr) for attr in items)
           return g
 
       def resolve_attr(obj, attr):

-- 
Repository URL: http://hg.python.org/cpython