1. python_mirrors
  2. sandbox/bcannon

Commits

Brett Cannon  committed 86a73b2 Merge

Merge w/ default

  • Participants
  • Parent commits ae296c8, e730da0
  • Branches bootstrap_importlib

Comments (0)

Files changed (4)

File Doc/library/json.rst

View file
  • Ignore whitespace
     ['[2.0', ', 1.0', ']']
 
 
-.. highlight:: none
+.. highlight:: bash
 
 Using json.tool from the shell to validate and pretty-print::
 
     {
         "json": "obj"
     }
-    $ echo '{ 1.2:3.4}' | python -mjson.tool
-    Expecting property name: line 1 column 2 (char 2)
+    $ echo '{1.2:3.4}' | python -mjson.tool
+    Expecting property name: line 1 column 1 (char 1)
 
-.. highlight:: python
+.. highlight:: python3
 
 .. note::
 

File Doc/library/multiprocessing.rst

View file
  • Ignore whitespace
     HELLO WORLD
     [(3.515625, 39.0625), (33.0625, 4.0), (5.640625, 90.25)]
 
-.. highlight:: python
+.. highlight:: python3
 
 
 .. _multiprocessing-managers:
 Demonstration of how to create and use customized managers and proxies:
 
 .. literalinclude:: ../includes/mp_newtype.py
+   :language: python3
 
 
 Using :class:`Pool`:
 
 .. literalinclude:: ../includes/mp_pool.py
+   :language: python3
 
 
 Synchronization types like locks, conditions and queues:
 
 .. literalinclude:: ../includes/mp_synchronize.py
+   :language: python3
 
 
 An example showing how to use queues to feed tasks to a collection of worker

File Doc/library/random.rst

View file
  • Ignore whitespace
    >>> random.sample([1, 2, 3, 4, 5],  3)   # Three samples without replacement
    [4, 1, 5]
 
-A common task is to make a :func:`random.choice` with weighted probababilites.
+A common task is to make a :func:`random.choice` with weighted probabilities.
 
 If the weights are small integer ratios, a simple technique is to build a sample
 population with repeats::

File Misc/NEWS

View file
  • Ignore whitespace
 - Have importlib take advantage of ImportError's new 'name' and 'path'
   attributes.
 
-- Issue #14399: zipfile now correctly adds a comment even when the zipfile
-  being created is otherwise empty.  In addition, the TypeError that results
-  from trying to set a non-binary value as a comment is now now raised at the
-  time the comment is set rather than at the time the zipfile is written.
+- Issue #14399: zipfile now recognizes that the archive has been modified even
+  if only the comment is changed.  In addition, the TypeError that results from
+  trying to set a non-binary value as a comment is now now raised at the time
+  the comment is set rather than at the time the zipfile is written.
 
 - trace.CoverageResults.is_ignored_filename() now ignores any name that starts
   with "<" and ends with ">" instead of special-casing "<string>" and