[Python-checkins] cpython (merge 3.3 -> default): Issue #19504: Used American spelling for 'customize'.

vinay.sajip python-checkins at python.org
Fri Nov 15 21:59:05 CET 2013


http://hg.python.org/cpython/rev/08c7bc4266e6
changeset:   87125:08c7bc4266e6
parent:      87122:a3640822c3e6
parent:      87124:1c714c35c02a
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Fri Nov 15 20:58:47 2013 +0000
summary:
  Issue #19504: Used American spelling for 'customize'.

files:
  Doc/howto/logging-cookbook.rst   |  10 +++++-----
  Doc/library/logging.handlers.rst |   2 +-
  Doc/library/logging.rst          |   4 ++--
  Lib/venv/__init__.py             |   2 +-
  PC/launcher.c                    |   4 ++--
  5 files changed, 11 insertions(+), 11 deletions(-)


diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -1096,7 +1096,7 @@
 
 .. _custom-logrecord:
 
-Customising ``LogRecord``
+Customizing ``LogRecord``
 -------------------------
 
 Every logging event is represented by a :class:`LogRecord` instance.
@@ -1313,7 +1313,7 @@
 
 .. _cookbook-rotator-namer:
 
-Using a rotator and namer to customise log rotation processing
+Using a rotator and namer to customize log rotation processing
 --------------------------------------------------------------
 
 An example of how you can define a namer and rotator is given in the following
@@ -1694,14 +1694,14 @@
 
 .. currentmodule:: logging.config
 
-Customising handlers with :func:`dictConfig`
+Customizing handlers with :func:`dictConfig`
 --------------------------------------------
 
-There are times when you want to customise logging handlers in particular ways,
+There are times when you want to customize logging handlers in particular ways,
 and if you use :func:`dictConfig` you may be able to do this without
 subclassing. As an example, consider that you may want to set the ownership of a
 log file. On POSIX, this is easily done using :func:`shutil.chown`, but the file
-handlers in the stdlib don't offer built-in support. You can customise handler
+handlers in the stdlib don't offer built-in support. You can customize handler
 creation using a plain function such as::
 
     def owned_file_handler(filename, mode='a', encoding=None, owner=None):
diff --git a/Doc/library/logging.handlers.rst b/Doc/library/logging.handlers.rst
--- a/Doc/library/logging.handlers.rst
+++ b/Doc/library/logging.handlers.rst
@@ -904,7 +904,7 @@
 
       Enqueues the record on the queue using ``put_nowait()``; you may
       want to override this if you want to use blocking behaviour, or a
-      timeout, or a customised queue implementation.
+      timeout, or a customized queue implementation.
 
 
 
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -845,8 +845,8 @@
 
    Return either the standard :class:`Logger` class, or the last class passed to
    :func:`setLoggerClass`. This function may be called from within a new class
-   definition, to ensure that installing a customised :class:`Logger` class will
-   not undo customisations already applied by other code. For example::
+   definition, to ensure that installing a customized :class:`Logger` class will
+   not undo customizations already applied by other code. For example::
 
       class MyLogger(logging.getLoggerClass()):
           # ... override behaviour here
diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py
--- a/Lib/venv/__init__.py
+++ b/Lib/venv/__init__.py
@@ -38,7 +38,7 @@
 class EnvBuilder:
     """
     This class exists to allow virtual environment creation to be
-    customised. The constructor parameters determine the builder's
+    customized. The constructor parameters determine the builder's
     behaviour when called upon to create a virtual environment.
 
     By default, the builder makes the system (global) site-packages dir
diff --git a/PC/launcher.c b/PC/launcher.c
--- a/PC/launcher.c
+++ b/PC/launcher.c
@@ -878,10 +878,10 @@
             }
             if (vpp->shebang == NULL) {
                 /*
-                 * Not found in builtins - look in customised commands.
+                 * Not found in builtins - look in customized commands.
                  *
                  * We can't permanently modify the shebang line in case
-                 * it's not a customised command, but we can temporarily
+                 * it's not a customized command, but we can temporarily
                  * stick a NUL after the command while searching for it,
                  * then put back the char we zapped.
                  */

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list