[Python-3000-checkins] r61960 - in python/branches/py3k: Lib/test/test_future4.py Parser/parsetok.c Python/import.c Python/pythonrun.c

[christian.heimes]

Author: christian.heimes
Date: Thu Mar 27 00:24:27 2008
New Revision: 61960

Added:
   python/branches/py3k/Lib/test/test_future4.py
      - copied, changed from r61957, python/trunk/Lib/test/test_future4.py
Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Parser/parsetok.c
   python/branches/py3k/Python/import.c
   python/branches/py3k/Python/pythonrun.c
Log:
Merged revisions 61954,61956-61957 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r61954 | christian.heimes | 2008-03-26 23:20:26 +0100 (Wed, 26 Mar 2008) | 1 line
  
  Surround p_flags access with #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD
........
  r61956 | christian.heimes | 2008-03-26 23:51:58 +0100 (Wed, 26 Mar 2008) | 1 line
  
  Initialize PyCompilerFlags cf_flags with 0
........
  r61957 | christian.heimes | 2008-03-26 23:55:31 +0100 (Wed, 26 Mar 2008) | 1 line
  
  I forgot to svn add the future test
........


Copied: python/branches/py3k/Lib/test/test_future4.py (from r61957, python/trunk/Lib/test/test_future4.py)
==============================================================================
--- python/trunk/Lib/test/test_future4.py	(original)
+++ python/branches/py3k/Lib/test/test_future4.py	Thu Mar 27 00:24:27 2008
@@ -4,21 +4,8 @@
 import unittest
 from test import test_support
 
-class TestFuture(unittest.TestCase):
-    def assertType(self, obj, typ):
-        self.assert_(type(obj) is typ,
-            "type(%r) is %r, not %r" % (obj, type(obj), typ))
-
-    def test_unicode_strings(self):
-        self.assertType("", unicode)
-        self.assertType(r"", unicode)
-        self.assertType(u"", unicode)
-        self.assertType(ur"", unicode)
-        self.assertType(b"", str)
-        self.assertType(br"", str)
-
 def test_main():
-    test_support.run_unittest(TestFuture)
+    pass
 
 if __name__ == "__main__":
     test_main()

Modified: python/branches/py3k/Parser/parsetok.c
==============================================================================
--- python/branches/py3k/Parser/parsetok.c	(original)
+++ python/branches/py3k/Parser/parsetok.c	Thu Mar 27 00:24:27 2008
@@ -225,6 +225,7 @@
 	}
 	else
 		n = NULL;
+
 #ifdef PY_PARSER_REQUIRES_FUTURE_KEYWORD
 	*flags = ps->p_flags;
 #endif

Modified: python/branches/py3k/Python/import.c
==============================================================================
--- python/branches/py3k/Python/import.c	(original)
+++ python/branches/py3k/Python/import.c	Thu Mar 27 00:24:27 2008
@@ -826,6 +826,7 @@
 	if (arena == NULL)
 		return NULL;
 
+	flags.cf_flags = 0;
 	mod = PyParser_ASTFromFile(fp, pathname, NULL,
 				   Py_file_input, 0, 0, &flags, 
 				   NULL, arena);

Modified: python/branches/py3k/Python/pythonrun.c
==============================================================================
--- python/branches/py3k/Python/pythonrun.c	(original)
+++ python/branches/py3k/Python/pythonrun.c	Thu Mar 27 00:24:27 2008
@@ -1568,6 +1568,7 @@
 	if (arena == NULL)
 		return NULL;
 
+	flags.cf_flags = 0;
 	mod = PyParser_ASTFromString(str, filename, start, &flags, arena);
 	if (mod == NULL) {
 		PyArena_Free(arena);