1. Armin Rigo
  2. cpython-withatomic

Commits

Georg Brandl  committed 39b5af7

Fix mismerges of version directives.

  • Participants
  • Parent commits 71b7715
  • Branches 2.7

Comments (0)

Files changed (2)

File Doc/library/syslog.rst

View file
    keyword argument (default is :const:`LOG_USER`) sets the default facility for
    messages which do not have a facility explicitly encoded.
 
-   .. versionchanged:: 3.2
-      In previous versions, keyword arguments were not allowed, and *ident* was
-      required.  The default for *ident* was dependent on the system libraries,
-      and often was ``python`` instead of the name of the python program file.
-
 
 .. function:: closelog()
 

File Doc/library/warnings.rst

View file
 the command-line options passed to :option:`-W` and calls to
 :func:`filterwarnings`.
 
-* :exc:`DeprecationWarning` and :exc:`PendingDeprecationWarning`, and
-  :exc:`ImportWarning` are ignored.
+* :exc:`PendingDeprecationWarning`, and :exc:`ImportWarning` are ignored.
 
 * :exc:`BytesWarning` is ignored unless the :option:`-b` option is given once or
   twice; in this case this warning is either printed (``-b``) or turned into an
   exception (``-bb``).
 
-.. versionchanged:: 3.2
-   :exc:`DeprecationWarning` is now ignored by default in addition to
-   :exc:`PendingDeprecationWarning`.
-
 
 .. _warning-suppress: