From: David Wolever <david@wolever.net>
Date: Mon, 12 Aug 2013 21:15:36 +0000 (-0400)
Subject: Merge issue #17701: Improving strftime documentation.
X-Git-Tag: v3.4.0a2~239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbf4a4630449f49a24a43ec642aa493ad647ad0d;p=python

Merge issue #17701: Improving strftime documentation.
---

bbf4a4630449f49a24a43ec642aa493ad647ad0d
diff --cc Doc/library/datetime.rst
index 5bcac47427,27885f9544..a42fb6e129
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@@ -1401,8 -1404,9 +1406,9 @@@ Instance methods
  
  .. method:: time.strftime(format)
  
-    Return a string representing the time, controlled by an explicit format string.
-    See section :ref:`strftime-strptime-behavior`.
+    Return a string representing the time, controlled by an explicit format
+    string.  For a complete list of formatting directives, see
 -   :ref:`strftime-strptime-behavior`. 
++   :ref:`strftime-strptime-behavior`.
  
  
  .. method:: time.__format__(format)
diff --cc Misc/NEWS
index 29b0465355,b37bf3adde..be9e1c40a4
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -742,97 -565,22 +742,99 @@@ Test
  - Issue #17690: test_time now works with unittest test discovery.
    Patch by Zachary Ware.
  
 -- Issue #17692: test_sqlite now works with unittest test discovery.
 -  Patch by Zachary Ware.
 +- Issue #17692: test_sqlite now works with unittest test discovery.
 +  Patch by Zachary Ware.
 +
 +- Issue #11995: test_pydoc doesn't import all sys.path modules anymore.
 +
 +Documentation
 +-------------
 +
++- Issue #17701: Improving strftime documentation.
++
 +- Issue #18440: Clarify that `hash()` can truncate the value returned from an
 +  object's custom `__hash__()` method.
 +
 +- Issue #17844: Add links to encoders and decoders for bytes-to-bytes codecs.
 +
 +- Issue #14097: improve the "introduction" page of the tutorial.
 +
 +- Issue #17977: The documentation for the cadefault argument's default value
 +  in urllib.request.urlopen() is fixed to match the code.
 +
 +- Issue #15940: Specify effect of locale on time functions.
 +
 +- Issue #6696: add documentation for the Profile objects, and improve
 +  profile/cProfile docs.  Patch by Tom Pinckney.
 +
 +C-API
 +-----
 +
 +- Issue #18351: Fix various issues in a function in importlib provided to help
 +  PyImport_ExecCodeModuleWithPathnames() (and thus by extension PyImport_ExecCodeModule() and PyImport_ExecCodeModuleEx()).
 +
 +- Issue #9369: The types of `char*` arguments of PyObject_CallFunction() and
 +  PyObject_CallMethod() now changed to `const char*`.  Based on patches by
 +  Jörg Müller and Lars Buitinck.
 +
 +- Issue #17206: Py_CLEAR(), Py_DECREF(), Py_XINCREF() and Py_XDECREF() now
 +  expand their arguments once instead of multiple times.  Patch written by Illia
 +  Polosukhin.
 +
 +- Issue #17522: Add the PyGILState_Check() API.
 +
 +- Issue #17327: Add PyDict_SetDefault.
 +
 +IDLE
 +----
 +
 +- Issue #18429: Format / Format Paragraph, now works when comment blocks
 +  are selected. As with text blocks, this works best when the selection
 +  only includes complete lines.
 +
 +- Issue #18226: Add docstrings and unittests for FormatParagraph.py.
 +  Original patches by Todd Rovito and Phil Webster.
 +
 +- Issue #18279: Format - Strip trailing whitespace no longer marks a file as
 +  changed when it has not been changed. This fix followed the addition of a
 +  test file originally written by Phil Webster (the issue's main goal).
 +
 +- Issue #7136: In the Idle File menu, "New Window" is renamed "New File".
 +  Patch by Tal Einat, Roget Serwy, and Todd Rovito.
 +
 +- Remove dead imports of imp.
 +
 +- Issue #18196: Avoid displaying spurious SystemExit tracebacks.
 +
 +- Issue #5492: Avoid traceback when exiting IDLE caused by a race condition.
 +
 +- Issue #17511: Keep IDLE find dialog open after clicking "Find Next".
 +  Original patch by Sarah K.
 +
 +- Issue #18055: Move IDLE off of imp and on to importlib.
 +
 +- Issue #15392: Create a unittest framework for IDLE.
 +  Initial patch by Rajagopalasarma Jayakrishnan.
 +  See Lib/idlelib/idle_test/README.txt for how to run Idle tests.
 +
 +- Issue #14146: Highlight source line while debugging on Windows.
 +
 +- Issue #17838: Allow sys.stdin to be reassigned.
 +
 +- Issue #13495: Avoid loading the color delegator twice in IDLE.
  
 -- Issue #17843: Removed bz2 test data file that was triggering false-positive
 -  virus warnings with certain antivirus software.
 +- Issue #17798: Allow IDLE to edit new files when specified on command line.
  
 -Documentation
 --------------
 +- Issue #14735: Update IDLE docs to omit "Control-z on Windows".
  
 -- Issue #15940: Specify effect of locale on time functions.
 +- Issue #17532: Always include Options menu for IDLE on OS X.
 +  Patch by Guilherme Simões.
  
 -- Issue #6696: add documentation for the Profile objects, and improve
 -  profile/cProfile docs.  Patch by Tom Pinckney.
 +Windows
 +-------
  
 -- Issue #17915: Fix interoperability of xml.sax with file objects returned by
 -  codecs.open().
 +- Issue #18569: The installer now adds .py to the PATHEXT variable when extensions
 +  are registered. Patch by Paul Moore.
  
  Build
  -----