Grammar modifications so that the Python2.7 grammar looks more like the Python 3.4 grammar.

test/test_parser/test_parser.py

@@ -152,6 +152,6 @@ def test_error_correction_with():
         try:
             f."""
     comps = jedi.Script(source).completions()
-    assert len(comps) > 40
+    assert len(comps) > 30
     # `open` completions have a closed attribute.
     assert [1 for c in comps if c.name == 'closed']

test/test_parser/test_tokenize.py

@@ -27,7 +27,7 @@ asdfasdf""" + "h"
 
     def test_simple_no_whitespace(self):
         # Test a simple one line string, no preceding whitespace
-        simple_docstring = '"""simple one line docstring"""'
+        simple_docstring = u'"""simple one line docstring"""'
         simple_docstring_io = StringIO(simple_docstring)
         tokens = parser.tokenize.generate_tokens(simple_docstring_io.readline)
         token_list = list(tokens)