summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2012-01-26 23:36:08 (GMT)
committerBrett Cannon <brett@python.org>2012-01-26 23:36:08 (GMT)
commit722db7bdba74c3c82ecd8b2d44daf1e2508b6734 (patch)
treecc2215535a5615fdf713b76667ae0344169e41df
parent65992c1c01115166375e1c6d8484f053919e30da (diff)
parent1740afded1fa54f9083e1cfa104f5a661ee06c7e (diff)
downloadcpython-722db7bdba74c3c82ecd8b2d44daf1e2508b6734.zip
cpython-722db7bdba74c3c82ecd8b2d44daf1e2508b6734.tar.gz
cpython-722db7bdba74c3c82ecd8b2d44daf1e2508b6734.tar.bz2
merge
-rw-r--r--Doc/using/cmdline.rst2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 9274d8e..c386fb4 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -448,7 +448,7 @@ These environment variables influence Python's behavior.
.. envvar:: PYTHONCASEOK
If this is set, Python ignores case in :keyword:`import` statements. This
- only works on Windows.
+ only works on Windows, OS X, and OS/2.
.. envvar:: PYTHONDONTWRITEBYTECODE
diff --git a/Misc/NEWS b/Misc/NEWS
index 7005518..5a52b9f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -435,6 +435,8 @@ Extension Modules
Documentation
-------------
+- Issue #13883: PYTHONCASEOK also used on OS X and OS/2.
+
- Issue #12949: Document the kwonlyargcount argument for the PyCode_New
C API function.