merge the benjamins and my changes, accidentally caused a new remote head

--HG--
branch : trunk

py/code/_assertionnew.py

@@ -68,6 +68,10 @@ operator_map = {
     ast.LtE : "<=",
     ast.Gt : ">",
     ast.GtE : ">=",
+    ast.Is : "is",
+    ast.IsNot : "is not",
+    ast.In : "in",
+    ast.NotIn : "not in"
 }
 
 unary_map = {

py/code/testing/test_assertion.py

@@ -65,6 +65,22 @@ def test_assert_multiline_2():
         s = str(e)
         assert s.startswith('assert 2 ==')
 
+def test_in():
+    try:
+        assert "hi" in [1, 2]
+    except AssertionError:
+        e = exvalue()
+        s = str(e)
+        assert s.startswith("assert 'hi' in")
+
+def test_is():
+    try:
+        assert 1 is 2
+    except AssertionError:
+        e = exvalue()
+        s = str(e)
+        assert s.startswith("assert 1 is 2")
+
 def test_assert_non_string_message(): 
     class A: 
         def __str__(self): 

py/rest/rst.py

@@ -120,7 +120,7 @@ class Rest(AbstractNode):
             return ""
         link_texts = []
         # XXX this could check for duplicates and remove them...
-        for link, target in self.links.iteritems():
+        for link, target in self.links.items():
             link_texts.append(".. _`%s`: %s" % (escape(link), target))
         return "\n" + "\n".join(link_texts) + "\n\n"
 
@@ -401,7 +401,7 @@ class Directive(Paragraph):
         txt = super(Directive, self).text()
         txt = '.. %s::%s' % (self.name, txt[namechunksize + 3:],)
         options = '\n'.join(['   :%s: %s' % (k, v) for (k, v) in
-                             self.options.iteritems()])
+                             self.options.items()])
         if options:
             txt += '\n%s' % (options,)
 

py/test/plugin/pytest_terminal.py

@@ -441,7 +441,7 @@ def folded_skips(skipped):
         key = entry.path, entry.lineno, entry.message
         d.setdefault(key, []).append(event)
     l = []
-    for key, events in d.iteritems(): 
+    for key, events in d.items(): 
         l.append((len(events),) + key)
     return l