#18705: merge with 3.3.

This commit is contained in:
Ezio Melotti 2013-08-17 15:53:55 +03:00
commit 9a3777e525
26 changed files with 49 additions and 49 deletions

View file

@ -19,7 +19,7 @@ except ImportError:
# Note regarding PEP 8 compliant names
# This threading model was originally inspired by Java, and inherited
# the convention of camelCase function and method names from that
# language. Those originaly names are not in any imminent danger of
# language. Those original names are not in any imminent danger of
# being deprecated (even for Py3k),so this module provides them as an
# alias for the PEP 8 compliant names
# Note that using the new PEP 8 compliant names facilitates substitution