[Python-checkins] cpython (merge 3.3 -> default): Issue #15116: merge from 3.3

[ned.deily]

http://hg.python.org/cpython/rev/6053e0e1f05b
changeset:   81908:6053e0e1f05b
parent:      81904:d8dcf87b8e49
parent:      81907:1b1f7ec5ddb8
user:        Ned Deily <nad at acm.org>
date:        Sat Feb 02 00:20:50 2013 -0800
summary:
  Issue #15116: merge from 3.3

files:
  Doc/using/mac.rst |  14 --------------
  Misc/NEWS         |   3 +++
  2 files changed, 3 insertions(+), 14 deletions(-)


diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
--- a/Doc/using/mac.rst
+++ b/Doc/using/mac.rst
@@ -169,20 +169,6 @@
 at http://undefined.org/python/#py2app.
 
 
-Application Scripting
-=====================
-
-Python can also be used to script other Mac applications via Apple's Open
-Scripting Architecture (OSA); see http://appscript.sourceforge.net. Appscript is
-a high-level, user-friendly Apple event bridge that allows you to control
-scriptable Mac OS X applications using ordinary Python scripts. Appscript makes
-Python a serious alternative to Apple's own *AppleScript* language for
-automating your Mac. A related package, *PyOSA*, is an OSA language component
-for the Python scripting language, allowing Python code to be executed by any
-OSA-enabled application (Script Editor, Mail, iTunes, etc.). PyOSA makes Python
-a full peer to AppleScript.
-
-
 Other Resources
 ===============
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -908,6 +908,9 @@
 - Issue #11964: Document a change in v3.2 to the behavior of the indent
   parameter of json encoding operations.
 
+- Issue #15116: Remove references to appscript as it is no longer being
+  supported.
+
 Tools/Demos
 -----------
 

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