Merge
This commit is contained in:
commit
8213cafd62
|
@ -26,9 +26,6 @@
|
|||
#define PY_VERSION "3.3a0"
|
||||
/*--end constants--*/
|
||||
|
||||
/* Subversion Revision number of this file (not of the repository) */
|
||||
#define PY_PATCHLEVEL_REVISION "$Revision$"
|
||||
|
||||
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
|
||||
Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */
|
||||
#define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \
|
||||
|
|
|
@ -1374,7 +1374,7 @@ def strip_python_stderr(stderr):
|
|||
|
||||
def args_from_interpreter_flags():
|
||||
"""Return a list of command-line arguments reproducing the current
|
||||
settings in sys.flags."""
|
||||
settings in sys.flags and sys.warnoptions."""
|
||||
flag_opt_map = {
|
||||
'bytes_warning': 'b',
|
||||
'dont_write_bytecode': 'B',
|
||||
|
@ -1389,6 +1389,9 @@ def args_from_interpreter_flags():
|
|||
v = getattr(sys.flags, flag)
|
||||
if v > 0:
|
||||
args.append('-' + opt * v)
|
||||
if sys.warnoptions:
|
||||
args.append('-W')
|
||||
args.extend(sys.warnoptions)
|
||||
return args
|
||||
|
||||
#============================================================
|
||||
|
|
|
@ -277,7 +277,7 @@ class FileInputTests(unittest.TestCase):
|
|||
|
||||
def test_empty_files_list_specified_to_constructor(self):
|
||||
with FileInput(files=[]) as fi:
|
||||
self.assertEquals(fi._files, ('-',))
|
||||
self.assertEqual(fi._files, ('-',))
|
||||
|
||||
def test__getitem__(self):
|
||||
"""Tests invoking FileInput.__getitem__() with the current
|
||||
|
@ -298,7 +298,7 @@ class FileInputTests(unittest.TestCase):
|
|||
with FileInput(files=[t]) as fi:
|
||||
with self.assertRaises(RuntimeError) as cm:
|
||||
fi[1]
|
||||
self.assertEquals(cm.exception.args, ("accessing lines out of order",))
|
||||
self.assertEqual(cm.exception.args, ("accessing lines out of order",))
|
||||
|
||||
def test__getitem__eof(self):
|
||||
"""Tests invoking FileInput.__getitem__() with the line number but at
|
||||
|
@ -308,7 +308,7 @@ class FileInputTests(unittest.TestCase):
|
|||
with FileInput(files=[t]) as fi:
|
||||
with self.assertRaises(IndexError) as cm:
|
||||
fi[0]
|
||||
self.assertEquals(cm.exception.args, ("end of input reached",))
|
||||
self.assertEqual(cm.exception.args, ("end of input reached",))
|
||||
|
||||
def test_nextfile_oserror_deleting_backup(self):
|
||||
"""Tests invoking FileInput.nextfile() when the attempt to delete
|
||||
|
|
|
@ -12,6 +12,10 @@ Core and Builtins
|
|||
|
||||
- _ast.__version__ is now a Mercurial integer and hex revision.
|
||||
|
||||
- Issue #11432: A bug was introduced in subprocess.Popen on posix systems with
|
||||
3.2.0 where the stdout or stderr file descriptor being the same as the stdin
|
||||
file descriptor would raise an exception. webbrowser.open would fail. fixed.
|
||||
|
||||
- Issue #9856: Change object.__format__ with a non-empty format string
|
||||
to be a DeprecationWarning. In 3.2 it was a PendingDeprecationWarning.
|
||||
In 3.4 it will be a TypeError.
|
||||
|
@ -241,6 +245,11 @@ Tests
|
|||
|
||||
- Issue #10990: Prevent tests from clobbering a set trace function.
|
||||
|
||||
C-API
|
||||
-----
|
||||
|
||||
- PY_PATCHLEVEL_REVISION has been removed, since it's meaningless with Mercurial.
|
||||
|
||||
|
||||
What's New in Python 3.2?
|
||||
=========================
|
||||
|
|
Loading…
Reference in New Issue