Branch merge

Doc/library/ctypes.rst

@@ -869,10 +869,10 @@ later::
 
    struct cell; /* forward declaration */
 
-   struct {
+   struct cell {
        char *name;
        struct cell *next;
-   } cell;
+   };
 
 The straightforward translation into ctypes code would be this, but it does not
 work::

Doc/library/shutil.rst

@@ -105,8 +105,9 @@ Directory and files operations
    :func:`copy2`.
 
    If *symlinks* is true, symbolic links in the source tree are represented as
-   symbolic links in the new tree; if false or omitted, the contents of the
-   linked files are copied to the new tree.
+   symbolic links in the new tree, but the metadata of the original links is NOT
+   copied; if false or omitted, the contents and metadata of the linked files
+   are copied to the new tree.
 
    If *ignore* is given, it must be a callable that will receive as its
    arguments the directory being visited by :func:`copytree`, and a list of its

Doc/library/stat.rst

@@ -84,7 +84,7 @@ Example::
 
        for f in os.listdir(top):
            pathname = os.path.join(top, f)
-           mode = os.stat(pathname)[ST_MODE]
+           mode = os.stat(pathname).st_mode
            if S_ISDIR(mode):
                # It's a directory, recurse into it
                walktree(pathname, callback)

Lib/test/test_locale.py

 from test.test_support import run_unittest, verbose
+from platform import linux_distribution
 import unittest
 import locale
 import sys
@@ -396,6 +397,8 @@ class TestMiscellaneous(unittest.TestCase):
         # crasher from bug #7419
         self.assertRaises(locale.Error, locale.setlocale, 12345)
 
+    @unittest.skipIf(linux_distribution()[0] == 'Fedora', "Fedora setlocale() "
+                     "bug: https://bugzilla.redhat.com/show_bug.cgi?id=726536")
     def test_getsetlocale_issue1813(self):
         # Issue #1813: setting and getting the locale under a Turkish locale
         oldlocale = locale.getlocale()