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

georg.brandl python-checkins at python.org
Sat Sep 29 09:58:32 CEST 2012


http://hg.python.org/cpython/rev/1465cbbc8f64
changeset:   79244:1465cbbc8f64
parent:      79241:7aa546e4a892
parent:      79243:5f854a8a0e8f
user:        Georg Brandl <georg at python.org>
date:        Sat Sep 29 09:51:42 2012 +0200
summary:
  merge with 3.3

files:
  .hgtags              |  2 +-
  Lib/test/test_sys.py |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -108,4 +108,4 @@
 8bb5c7bc46ba43804480f3e328e1fa956672c885 v3.3.0rc1
 88a0792e8ba3e4916b24c7e7a522c277d326d66e v3.3.0rc2
 c191d21cefafb3832c45570e84854e309aa62eaa v3.3.0rc3
-de6b91d9711329b32e6fd0a3495cc31ff5009625 v3.3.0
+bd8afb90ebf28ba4edc901d4a235f75e7bbc79fd v3.3.0
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -585,7 +585,7 @@
     def test_implementation(self):
         # This test applies to all implementations equally.
 
-        levels = {'alpha': 0xA, 'beta': 0xB, 'candidate': 0xC, 'release': 0xF}
+        levels = {'alpha': 0xA, 'beta': 0xB, 'candidate': 0xC, 'final': 0xF}
 
         self.assertTrue(hasattr(sys.implementation, 'name'))
         self.assertTrue(hasattr(sys.implementation, 'version'))

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


More information about the Python-checkins mailing list