Merge branch 'master' into update-wx

buildtools/backports/pathlib2/scandir.py

@@ -168,7 +168,7 @@ if sys.platform == 'win32':
         ERROR_NO_MORE_FILES = 18
         IO_REPARSE_TAG_SYMLINK = 0xA000000C
 
-        # Numer of seconds between 1601-01-01 and 1970-01-01
+        # Number of seconds between 1601-01-01 and 1970-01-01
         SECONDS_BETWEEN_EPOCHS = 11644473600
 
         kernel32 = ctypes.windll.kernel32

buildtools/config.py

@@ -938,7 +938,7 @@ def textfile_open(filename, mode='rt'):
 
 def getSipFiles(names):
     """
-    Returns a list of the coresponding .sip files for each of the names in names.
+    Returns a list of the corresponding .sip files for each of the names in names.
     """
     files = list()
     for template in ['sip/gen/%s.sip', 'src/%s.sip']:

buildtools/distutils_hacks.py

@@ -267,7 +267,7 @@ def _setup_compile(self, outdir, macros, incdirs, sources, depends, extra):
           _orig_setup_compile(self, outdir, macros, incdirs, sources, depends, extra)
 
     # Remove items from the build collection that don't need to be built
-    # because their obj file is newer than the source fle and any other
+    # because their obj file is newer than the source file and any other
     # dependencies.
     for obj in objects:
         src, ext = build[obj]

buildtools/sipdistutils.py

@@ -1,4 +1,4 @@
-# Subclasses disutils.command.build_ext,
+# Subclasses distutils.command.build_ext,
 # replacing it with a SIP version that compiles .sip -> .cpp
 # before calling the original build_ext command.
 # Written by Giovanni Bajo <rasky at develer dot com>