Mailman 3 April 2013 - Python-checkins

cpython (merge 3.3 -> default): null merge
by senthil.kumaran April 5, 2013

April 5, 2013

http://hg.python.org/cpython/rev/efbdff4829f4 changeset: 83103:efbdff4829f4 parent: 83101:178075fbff3a parent: 83102:fc39b8f0348d user: Senthil Kumaran <senthil(a)uthcode.com> date: Thu Apr 04 19:35:11 2013 -0700 summary: null merge files: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #17483: 3.3 Branch - Remove unreachable code in urllib.request
by senthil.kumaran April 5, 2013

April 5, 2013

http://hg.python.org/cpython/rev/fc39b8f0348d changeset: 83102:fc39b8f0348d branch: 3.3 parent: 83098:40f582a73901 user: Senthil Kumaran <senthil(a)uthcode.com> date: Thu Apr 04 19:34:02 2013 -0700 summary: Issue #17483: 3.3 Branch - Remove unreachable code in urllib.request files: Lib/urllib/request.py | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -142,16 +142,12 @@ raise ValueError('SSL support not available') context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) context.options |= ssl.OP_NO_SSLv2 - if cafile or capath or cadefault: - context.verify_mode = ssl.CERT_REQUIRED - if cafile or capath: - context.load_verify_locations(cafile, capath) - else: - context.set_default_verify_paths() - check_hostname = True + context.verify_mode = ssl.CERT_REQUIRED + if cafile or capath: + context.load_verify_locations(cafile, capath) else: - check_hostname = False - https_handler = HTTPSHandler(context=context, check_hostname=check_hostname) + context.set_default_verify_paths() + https_handler = HTTPSHandler(context=context, check_hostname=True) opener = build_opener(https_handler) elif _opener is None: _opener = opener = build_opener() -- Repository URL: http://hg.python.org/cpython

1 0

cpython: #17365: Remove Python 2 code from test_print
by andrew.svetlov April 4, 2013

April 4, 2013

http://hg.python.org/cpython/rev/178075fbff3a changeset: 83101:178075fbff3a parent: 83099:8dd7f7134700 user: Andrew Svetlov <andrew.svetlov(a)gmail.com> date: Thu Apr 04 22:32:28 2013 +0300 summary: #17365: Remove Python 2 code from test_print Patch by Berker Peksag files: Lib/test/test_print.py | 74 ++++++++++++----------------- 1 files changed, 31 insertions(+), 43 deletions(-) diff --git a/Lib/test/test_print.py b/Lib/test/test_print.py --- a/Lib/test/test_print.py +++ b/Lib/test/test_print.py @@ -1,62 +1,55 @@ -"""Test correct operation of the print function. -""" +import unittest +from io import StringIO -# In 2.6, this gives us the behavior we want. In 3.0, it has -# no function, but it still must parse correctly. -from __future__ import print_function - -import unittest from test import support -try: - # 3.x - from io import StringIO -except ImportError: - # 2.x - from StringIO import StringIO - NotDefined = object() # A dispatch table all 8 combinations of providing -# sep, end, and file +# sep, end, and file. # I use this machinery so that I'm not just passing default -# values to print, I'm either passing or not passing in the -# arguments +# values to print, I'm either passing or not passing in the +# arguments. dispatch = { (False, False, False): - lambda args, sep, end, file: print(*args), + lambda args, sep, end, file: print(*args), (False, False, True): - lambda args, sep, end, file: print(file=file, *args), + lambda args, sep, end, file: print(file=file, *args), (False, True, False): - lambda args, sep, end, file: print(end=end, *args), + lambda args, sep, end, file: print(end=end, *args), (False, True, True): - lambda args, sep, end, file: print(end=end, file=file, *args), + lambda args, sep, end, file: print(end=end, file=file, *args), (True, False, False): - lambda args, sep, end, file: print(sep=sep, *args), + lambda args, sep, end, file: print(sep=sep, *args), (True, False, True): - lambda args, sep, end, file: print(sep=sep, file=file, *args), + lambda args, sep, end, file: print(sep=sep, file=file, *args), (True, True, False): - lambda args, sep, end, file: print(sep=sep, end=end, *args), + lambda args, sep, end, file: print(sep=sep, end=end, *args), (True, True, True): - lambda args, sep, end, file: print(sep=sep, end=end, file=file, *args), - } + lambda args, sep, end, file: print(sep=sep, end=end, file=file, *args), +} + # Class used to test __str__ and print class ClassWith__str__: def __init__(self, x): self.x = x + def __str__(self): return self.x + class TestPrint(unittest.TestCase): + """Test correct operation of the print function.""" + def check(self, expected, args, - sep=NotDefined, end=NotDefined, file=NotDefined): + sep=NotDefined, end=NotDefined, file=NotDefined): # Capture sys.stdout in a StringIO. Call print with args, - # and with sep, end, and file, if they're defined. Result - # must match expected. + # and with sep, end, and file, if they're defined. Result + # must match expected. - # Look up the actual function to call, based on if sep, end, and file - # are defined + # Look up the actual function to call, based on if sep, end, + # and file are defined. fn = dispatch[(sep is not NotDefined, end is not NotDefined, file is not NotDefined)] @@ -69,7 +62,7 @@ def test_print(self): def x(expected, args, sep=NotDefined, end=NotDefined): # Run the test 2 ways: not using file, and using - # file directed to a StringIO + # file directed to a StringIO. self.check(expected, args, sep=sep, end=end) @@ -101,11 +94,6 @@ x('*\n', (ClassWith__str__('*'),)) x('abc 1\n', (ClassWith__str__('abc'), 1)) -# # 2.x unicode tests -# x(u'1 2\n', ('1', u'2')) -# x(u'u\1234\n', (u'u\1234',)) -# x(u' abc 1\n', (' ', ClassWith__str__(u'abc'), 1)) - # errors self.assertRaises(TypeError, print, '', sep=3) self.assertRaises(TypeError, print, '', end=3) @@ -113,12 +101,14 @@ def test_print_flush(self): # operation of the flush flag - class filelike(): + class filelike: def __init__(self): self.written = '' self.flushed = 0 + def write(self, str): self.written += str + def flush(self): self.flushed += 1 @@ -130,15 +120,13 @@ self.assertEqual(f.flushed, 2) # ensure exceptions from flush are passed through - class noflush(): + class noflush: def write(self, str): pass + def flush(self): raise RuntimeError self.assertRaises(RuntimeError, print, 1, file=noflush(), flush=True) -def test_main(): - support.run_unittest(TestPrint) - if __name__ == "__main__": - test_main() + unittest.main() -- Repository URL: http://hg.python.org/cpython

1 0

peps: Trim trailing whitespace
by eli.bendersky April 4, 2013

April 4, 2013

http://hg.python.org/peps/rev/1be7cfe9fb04 changeset: 4833:1be7cfe9fb04 user: Eli Bendersky <eliben(a)gmail.com> date: Thu Apr 04 06:52:41 2013 -0700 summary: Trim trailing whitespace files: pep-0435.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0435.txt b/pep-0435.txt --- a/pep-0435.txt +++ b/pep-0435.txt @@ -317,7 +317,7 @@ >>> class SpecialId(Enum): ... selector = '$IM($N)' ... adaptor = '~$IM' - ... + ... >>> SpecialId.selector <EnumValue: SpecialId.selector [value=$IM($N)]> >>> SpecialId.selector.value @@ -415,7 +415,7 @@ >>> Animals = Enum('Animals', 'ant bee cat dog') >>> Animals <Animals {ant: 1, bee: 2, cat: 3, dog: 4}> - >>> + >>> >>> Animals.ant <EnumValue: Animals.ant [value=1]> >>> Animals.ant.value -- Repository URL: http://hg.python.org/peps

1 0

peps: Updated PEP 435:
by eli.bendersky April 4, 2013

April 4, 2013

http://hg.python.org/peps/rev/513ec334a4b1 changeset: 4832:513ec334a4b1 user: Eli Bendersky <eliben(a)gmail.com> date: Thu Apr 04 06:52:14 2013 -0700 summary: Updated PEP 435: * split the main section to some subsections, to make it more readable * described non-int values * removed mentions of implicit int-ness of Enum, which is no longer supported (unless in IntEnum) * described the new convenience API * misc. cleanups files: pep-0435.txt | 344 ++++++++++++++++++++------------------ 1 files changed, 179 insertions(+), 165 deletions(-) diff --git a/pep-0435.txt b/pep-0435.txt --- a/pep-0435.txt +++ b/pep-0435.txt @@ -20,11 +20,9 @@ Warsaw into the standard library. Much of this PEP is based on the "using" [1]_ document from the documentation of ``flufl.enum``. -An enumeration is a set of symbolic names bound to unique, constant integer -values. Within an enumeration, the values can be compared by identity, and the -enumeration itself can be iterated over. Enumeration items can be converted to -and from their integer equivalents, supporting use cases such as storing -enumeration values in a database. +An enumeration is a set of symbolic names bound to unique, constant values. +Within an enumeration, the values can be compared by identity, and the +enumeration itself can be iterated over. Decision @@ -109,17 +107,6 @@ ... green = 2 ... blue = 3 -Enumeration values are compared by identity:: - - >>> Colors.red is Colors.red - True - >>> Colors.blue is Colors.blue - True - >>> Colors.red is not Colors.blue - True - >>> Colors.blue is Colors.red - False - Enumeration values have nice, human readable string representations:: >>> print(Colors.red) @@ -161,6 +148,107 @@ >>> print(repr(Colors)) <Colors {red: 1, green: 2, blue: 3}> +The ``Enum`` class supports iteration. The returned order is not guaranteed +(unless you use `IntEnum`_):: + + >>> [v.name for v in MoreColors] + ['red', 'green', 'blue', 'pink', 'cyan'] + +Enumeration values are hashable, so they can be used in dictionaries and sets:: + + >>> apples = {} + >>> apples[Colors.red] = 'red delicious' + >>> apples[Colors.green] = 'granny smith' + >>> apples + {<EnumValue: Colors.green [value=2]>: 'granny smith', <EnumValue: Colors.red [value=1]>: 'red delicious'} + +You can convert back to the enumeration value by indexing into the +``Enum`` subclass, passing in the integer value for the item you want:: + + >>> Colors[1] + <EnumValue: Colors.red [int=1]> + >>> Colors[2] + <EnumValue: Colors.green [int=2]> + >>> Colors[3] + <EnumValue: Colors.blue [int=3]> + >>> Colors[1] is Colors.red + True + +The string name of the enumeration value is also accepted:: + + >>> Colors['red'] + <EnumValue: Colors.red [int=1]> + >>> Colors['blue'] is Colors.blue + True + +You get exceptions though, if you try to use invalid arguments:: + + >>> Colors['magenta'] + Traceback (most recent call last): + ... + ValueError: magenta + >>> Colors[99] + Traceback (most recent call last): + ... + ValueError: 99 + + +Comparisons +----------- + +Enumeration values are compared by identity:: + + >>> Colors.red is Colors.red + True + >>> Colors.blue is Colors.blue + True + >>> Colors.red is not Colors.blue + True + >>> Colors.blue is Colors.red + False + +Ordered comparisons between enumeration values are *not* supported. Enums are +not integers (but see `IntEnum`_ below):: + + >>> Colors.red < Colors.blue + Traceback (most recent call last): + ... + NotImplementedError + >>> Colors.red <= Colors.blue + Traceback (most recent call last): + ... + NotImplementedError + >>> Colors.blue > Colors.green + Traceback (most recent call last): + ... + NotImplementedError + >>> Colors.blue >= Colors.green + Traceback (most recent call last): + ... + NotImplementedError + +Equality comparisons are defined though:: + + >>> Colors.blue == Colors.blue + True + >>> Colors.green != Colors.blue + True + +Comparisons against non-enumeration values will always compare not equal:: + + >>> Colors.green == 2 + False + >>> Colors.blue == 3 + False + >>> Colors.green != 3 + True + >>> Colors.green == 'green' + False + + +Extending enumerations by subclassing +------------------------------------- + You can extend previously defined Enums by subclassing:: >>> class MoreColors(Colors): @@ -195,112 +283,7 @@ >>> len(set((Colors.red, OtherColors.red))) 2 -Ordered comparisons between enumeration values are *not* supported. Enums are -not integers (but see ``IntEnum`` below):: - - >>> Colors.red < Colors.blue - Traceback (most recent call last): - ... - NotImplementedError - >>> Colors.red <= Colors.blue - Traceback (most recent call last): - ... - NotImplementedError - >>> Colors.blue > Colors.green - Traceback (most recent call last): - ... - NotImplementedError - >>> Colors.blue >= Colors.green - Traceback (most recent call last): - ... - NotImplementedError - -Equality comparisons are defined though:: - - >>> Colors.blue == Colors.blue - True - >>> Colors.green != Colors.blue - True - -Enumeration values do not support ordered comparisons:: - - >>> Colors.red < Colors.blue - Traceback (most recent call last): - ... - NotImplementedError - >>> Colors.red < 3 - Traceback (most recent call last): - ... - NotImplementedError - >>> Colors.red <= 3 - Traceback (most recent call last): - ... - NotImplementedError - >>> Colors.blue > 2 - Traceback (most recent call last): - ... - NotImplementedError - >>> Colors.blue >= 2 - Traceback (most recent call last): - ... - NotImplementedError - -While equality comparisons are allowed, comparisons against non-enumeration -values will always compare not equal:: - - >>> Colors.green == 2 - False - >>> Colors.blue == 3 - False - >>> Colors.green != 3 - True - >>> Colors.green == 'green' - False - -If you really want the integer equivalent values, you can convert enumeration -values explicitly using the ``int()`` built-in. This is quite convenient for -storing enums in a database, as well as for interoperability with C extensions -that expect integers:: - - >>> int(Colors.red) - 1 - >>> int(Colors.green) - 2 - >>> int(Colors.blue) - 3 - -You can also convert back to the enumeration value by indexing into the Enum -subclass, passing in the integer value for the item you want:: - - >>> Colors[1] - <EnumValue: Colors.red [int=1]> - >>> Colors[2] - <EnumValue: Colors.green [int=2]> - >>> Colors[3] - <EnumValue: Colors.blue [int=3]> - >>> Colors[1] is Colors.red - True - -The string name of the enumeration value is also accepted:: - - >>> Colors['red'] - <EnumValue: Colors.red [int=1]> - >>> Colors['blue'] is Colors.blue - True - -You get exceptions though, if you try to use invalid arguments:: - - >>> Colors['magenta'] - Traceback (most recent call last): - ... - ValueError: magenta - >>> Colors[99] - Traceback (most recent call last): - ... - ValueError: 99 - -The integer equivalent values serve another purpose. You may not define two -enumeration values with the same integer value:: +You may not define two enumeration values with the same integer value:: >>> class Bad(Enum): ... cartman = 1 @@ -321,23 +304,42 @@ ... TypeError: Multiple enum values: 2 -The Enum class support iteration. Enumeration values are returned in the -sorted order of their integer equivalent values:: - >>> [v.name for v in MoreColors] - ['red', 'green', 'blue', 'pink', 'cyan'] - >>> [int(v) for v in MoreColors] - [1, 2, 3, 4, 5] +Enumeration values +------------------ -Enumeration values are hashable, so they can be used in dictionaries and sets:: +The examples above use integers for enumeration values. Using integers is +short and handy (and provided by default by the `Convenience API`_), but not +strictly enforced. In the vast majority of use-cases, one doesn't care what +the actual value of an enumeration is. But if the value *is* important, +enumerations can have arbitrary values. The following example uses strings:: - >>> apples = {} - >>> apples[Colors.red] = 'red delicious' - >>> apples[Colors.green] = 'granny smith' - >>> for color in sorted(apples, key=int): - ... print(color.name, '->', apples[color]) - red -> red delicious - green -> granny smith + >>> class SpecialId(Enum): + ... selector = '$IM($N)' + ... adaptor = '~$IM' + ... + >>> SpecialId.selector + <EnumValue: SpecialId.selector [value=$IM($N)]> + >>> SpecialId.selector.value + '$IM($N)' + >>> a = SpecialId.adaptor + >>> a == '~$IM' + False + >>> a == SpecialId.adaptor + True + >>> print(a) + SpecialId.adaptor + >>> print(a.value) + ~$IM + +Here ``Enum`` is used to provide readable (and syntactically valid!) names for +some special values, as well as group them together. + +While ``Enum`` supports this flexibility, one should only use it in very special +cases. Code will be most readable when actual values of enumerations aren't +important and enumerations are just used for their naming and comparison +properties. + IntEnum ------- @@ -377,6 +379,15 @@ >>> Shape.circle == Colors.red False +``IntEnum`` behaves like an integer in other ways you'd expect:: + + >>> int(Shape.circle) + 1 + >>> ['a', 'b', 'c'][Shape.circle] + 'b' + >>> [i for i in range(Shape.square)] + [0, 1] + For the vast majority of code, ``Enum`` is strongly recommended. Since ``IntEnum`` breaks some semantic promises of an enumeration (by being comparable to integers, and thus by transitivity to other unrelated enumerations), it @@ -384,6 +395,7 @@ when integer constants are replaced with enumerations and backwards compatibility is required with code that still expects integers. + Pickling -------- @@ -394,36 +406,42 @@ >>> Fruit.tomato is loads(dumps(Fruit.tomato)) True + Convenience API --------------- -TODO: update to the new convenience API +The ``Enum`` class is callable, providing the following convenience API:: -You can also create enumerations using the convenience function ``make()``, -which takes an iterable object or dictionary to provide the item names and -values. ``make()`` is a module-level function. + >>> Animals = Enum('Animals', 'ant bee cat dog') + >>> Animals + <Animals {ant: 1, bee: 2, cat: 3, dog: 4}> + >>> + >>> Animals.ant + <EnumValue: Animals.ant [value=1]> + >>> Animals.ant.value + 1 -The first argument to ``make()`` is the name of the enumeration, and it returns -the so-named `Enum` subclass. The second argument is a *source* which can be -either an iterable or a dictionary. In the most basic usage, *source* returns -a sequence of strings which name the enumeration items. In this case, the -values are automatically assigned starting from 1:: +The semantics of this API resemble ``namedtuple``. The first argument of +the call to ``Enum`` is the name of the enumeration. The second argument is +a source of enumeration value names. It can be a whitespace-separated string +of names, a sequence of names or a sequence of 2-tuples with key/value pairs. +The last option enables assigning arbitrary values to enumerations; the others +auto-assign increasing integers starting with 1. A new class derived from +``Enum`` is returned. In other words, the above assignment to ``Animals`` is +equivalent to:: - >>> import enum - >>> enum.make('Animals', ('ant', 'bee', 'cat', 'dog')) + >>> class Animals(Enum): + ... ant = 1 + ... bee = 2 + ... cat = 3 + ... dog = 4 + +Examples of alternative name/value specifications:: + + >>> Enum('Animals', ['ant', 'bee', 'cat', 'dog']) <Animals {ant: 1, bee: 2, cat: 3, dog: 4}> - -The items in source can also be 2-tuples, where the first item is the -enumeration value name and the second is the integer value to assign to the -value. If 2-tuples are used, all items must be 2-tuples:: - - >>> def enumiter(): - ... start = 1 - ... while True: - ... yield start - ... start <<= 1 - >>> enum.make('Flags', zip(list('abcdefg'), enumiter())) - <Flags {a: 1, b: 2, c: 4, d: 8, e: 16, f: 32, g: 64}> + >>> Enum('Animals', (('ant', 'one'), ('bee', 'two'), ('cat', 'three'), ('dog', 'four'))) + <Animals {dog: four, ant: one, cat: three, bee: two}> Proposed variations @@ -432,6 +450,7 @@ Some variations were proposed during the discussions in the mailing list. Here's some of the more popular ones. + Not having to specify values for enums -------------------------------------- @@ -450,6 +469,7 @@ definition of such enums baffling when first seen. Besides, explicit is better than implicit. + Using special names or forms to auto-assign enum values ------------------------------------------------------- @@ -571,12 +591,6 @@ ==== * Mark PEP 354 "superseded by" this one, if accepted - * New package name within stdlib - enum? (top-level) - * For make, can we add an API like namedtuple's? - make('Animals, 'ant bee cat dog') - I.e. when make sees a string argument it splits it, making it similar to a - tuple but with far less manual quote typing. OTOH, it just saves a ".split" - so may not be worth the effort ? .. Local Variables: -- Repository URL: http://hg.python.org/peps

1 0

cpython (2.7): #8913: add examples and docs for date/time/datetime.__format__. Patch by
by ezio.melotti April 4, 2013

April 4, 2013

http://hg.python.org/cpython/rev/0dac103a41bb changeset: 83100:0dac103a41bb branch: 2.7 parent: 83095:757c71f5ab8d user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Thu Apr 04 09:16:15 2013 +0300 summary: #8913: add examples and docs for date/time/datetime.__format__. Patch by Heikki Partanen. files: Doc/library/datetime.rst | 27 +++++++++++++++++++++++++++ Misc/ACKS | 1 + 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -555,6 +555,13 @@ section :ref:`strftime-strptime-behavior`. +.. method:: date.__format__(format) + + Same as :meth:`.date.strftime`. This makes it possible to specify format + string for a :class:`.date` object when using :meth:`str.format`. + See section :ref:`strftime-strptime-behavior`. + + Example of counting days to an event:: >>> import time @@ -605,6 +612,8 @@ '11/03/02' >>> d.strftime("%A %d. %B %Y") 'Monday 11. March 2002' + >>> 'The {1} is {0:%d}, the {2} is {0:%B}.'.format(d, "day", "month") + 'The day is 11, the month is March.' .. _datetime-datetime: @@ -1044,6 +1053,13 @@ string. See section :ref:`strftime-strptime-behavior`. +.. method:: datetime.__format__(format) + + Same as :meth:`.datetime.strftime`. This makes it possible to specify format + string for a :class:`.datetime` object when using :meth:`str.format`. + See section :ref:`strftime-strptime-behavior`. + + Examples of working with datetime objects: .. doctest:: @@ -1088,6 +1104,8 @@ >>> # Formatting datetime >>> dt.strftime("%A, %d. %B %Y %I:%M%p") 'Tuesday, 21. November 2006 04:30PM' + >>> 'The {1} is {0:%d}, the {2} is {0:%B}, the {3} is {0:%I:%M%p}.'.format(dt, "day", "month", "time") + 'The day is 21, the month is November, the time is 04:30PM.' Using datetime with tzinfo: @@ -1268,6 +1286,13 @@ See section :ref:`strftime-strptime-behavior`. +.. method:: time.__format__(format) + + Same as :meth:`.time.strftime`. This makes it possible to specify format string + for a :class:`.time` object when using :meth:`str.format`. + See section :ref:`strftime-strptime-behavior`. + + .. method:: time.utcoffset() If :attr:`tzinfo` is ``None``, returns ``None``, else returns @@ -1314,6 +1339,8 @@ 'Europe/Prague' >>> t.strftime("%H:%M:%S %Z") '12:10:30 Europe/Prague' + >>> 'The {} is {:%H:%M}.'.format("time", t) + 'The time is 12:10.' .. _datetime-tzinfo: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -761,6 +761,7 @@ Alexandre Parenteau Dan Parisien William Park +Heikki Partanen Harri Pasanen Randy Pausch Samuele Pedroni -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): #8913: merge with 3.3.
by ezio.melotti April 4, 2013

April 4, 2013

http://hg.python.org/cpython/rev/8dd7f7134700 changeset: 83099:8dd7f7134700 parent: 83097:a6c2210220dd parent: 83098:40f582a73901 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Thu Apr 04 09:16:42 2013 +0300 summary: #8913: merge with 3.3. files: Doc/library/datetime.rst | 27 +++++++++++++++++++++++++++ Misc/ACKS | 1 + 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -597,6 +597,13 @@ section :ref:`strftime-strptime-behavior`. +.. method:: date.__format__(format) + + Same as :meth:`.date.strftime`. This makes it possible to specify format + string for a :class:`.date` object when using :meth:`str.format`. + See section :ref:`strftime-strptime-behavior`. + + Example of counting days to an event:: >>> import time @@ -647,6 +654,8 @@ '11/03/02' >>> d.strftime("%A %d. %B %Y") 'Monday 11. March 2002' + >>> 'The {1} is {0:%d}, the {2} is {0:%B}.'.format(d, "day", "month") + 'The day is 11, the month is March.' .. _datetime-datetime: @@ -1154,6 +1163,13 @@ string. See section :ref:`strftime-strptime-behavior`. +.. method:: datetime.__format__(format) + + Same as :meth:`.datetime.strftime`. This makes it possible to specify format + string for a :class:`.datetime` object when using :meth:`str.format`. + See section :ref:`strftime-strptime-behavior`. + + Examples of working with datetime objects: .. doctest:: @@ -1198,6 +1214,8 @@ >>> # Formatting datetime >>> dt.strftime("%A, %d. %B %Y %I:%M%p") 'Tuesday, 21. November 2006 04:30PM' + >>> 'The {1} is {0:%d}, the {2} is {0:%B}, the {3} is {0:%I:%M%p}.'.format(dt, "day", "month", "time") + 'The day is 21, the month is November, the time is 04:30PM.' Using datetime with tzinfo: @@ -1385,6 +1403,13 @@ See section :ref:`strftime-strptime-behavior`. +.. method:: time.__format__(format) + + Same as :meth:`.time.strftime`. This makes it possible to specify format string + for a :class:`.time` object when using :meth:`str.format`. + See section :ref:`strftime-strptime-behavior`. + + .. method:: time.utcoffset() If :attr:`tzinfo` is ``None``, returns ``None``, else returns @@ -1431,6 +1456,8 @@ 'Europe/Prague' >>> t.strftime("%H:%M:%S %Z") '12:10:30 Europe/Prague' + >>> 'The {} is {:%H:%M}.'.format("time", t) + 'The time is 12:10.' .. _datetime-tzinfo: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -922,6 +922,7 @@ Alexandre Parenteau Dan Parisien William Park +Heikki Partanen Harri Pasanen Gaël Pasgrimaud Ashish Nitin Patil -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): #8913: add examples and docs for date/time/datetime.__format__. Patch by
by ezio.melotti April 4, 2013

April 4, 2013

http://hg.python.org/cpython/rev/40f582a73901 changeset: 83098:40f582a73901 branch: 3.3 parent: 83096:36130b84cd22 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Thu Apr 04 09:16:15 2013 +0300 summary: #8913: add examples and docs for date/time/datetime.__format__. Patch by Heikki Partanen. files: Doc/library/datetime.rst | 27 +++++++++++++++++++++++++++ Misc/ACKS | 1 + 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst --- a/Doc/library/datetime.rst +++ b/Doc/library/datetime.rst @@ -597,6 +597,13 @@ section :ref:`strftime-strptime-behavior`. +.. method:: date.__format__(format) + + Same as :meth:`.date.strftime`. This makes it possible to specify format + string for a :class:`.date` object when using :meth:`str.format`. + See section :ref:`strftime-strptime-behavior`. + + Example of counting days to an event:: >>> import time @@ -647,6 +654,8 @@ '11/03/02' >>> d.strftime("%A %d. %B %Y") 'Monday 11. March 2002' + >>> 'The {1} is {0:%d}, the {2} is {0:%B}.'.format(d, "day", "month") + 'The day is 11, the month is March.' .. _datetime-datetime: @@ -1154,6 +1163,13 @@ string. See section :ref:`strftime-strptime-behavior`. +.. method:: datetime.__format__(format) + + Same as :meth:`.datetime.strftime`. This makes it possible to specify format + string for a :class:`.datetime` object when using :meth:`str.format`. + See section :ref:`strftime-strptime-behavior`. + + Examples of working with datetime objects: .. doctest:: @@ -1198,6 +1214,8 @@ >>> # Formatting datetime >>> dt.strftime("%A, %d. %B %Y %I:%M%p") 'Tuesday, 21. November 2006 04:30PM' + >>> 'The {1} is {0:%d}, the {2} is {0:%B}, the {3} is {0:%I:%M%p}.'.format(dt, "day", "month", "time") + 'The day is 21, the month is November, the time is 04:30PM.' Using datetime with tzinfo: @@ -1385,6 +1403,13 @@ See section :ref:`strftime-strptime-behavior`. +.. method:: time.__format__(format) + + Same as :meth:`.time.strftime`. This makes it possible to specify format string + for a :class:`.time` object when using :meth:`str.format`. + See section :ref:`strftime-strptime-behavior`. + + .. method:: time.utcoffset() If :attr:`tzinfo` is ``None``, returns ``None``, else returns @@ -1431,6 +1456,8 @@ 'Europe/Prague' >>> t.strftime("%H:%M:%S %Z") '12:10:30 Europe/Prague' + >>> 'The {} is {:%H:%M}.'.format("time", t) + 'The time is 12:10.' .. _datetime-tzinfo: diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -907,6 +907,7 @@ Alexandre Parenteau Dan Parisien William Park +Heikki Partanen Harri Pasanen Gaël Pasgrimaud Randy Pausch -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (44586e16b2a7): sum=0
by solipsis＠pitrou.net April 4, 2013

April 4, 2013

results for 44586e16b2a7 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog5K6K_A', '-x']

1 0