Add warnings to and deprecated all those Mac modules
diff --git a/Doc/library/aepack.rst b/Doc/library/aepack.rst
index d8aef6b..798d603 100644
--- a/Doc/library/aepack.rst
+++ b/Doc/library/aepack.rst
@@ -5,6 +5,7 @@
.. module:: aepack
:platform: Mac
:synopsis: Conversion between Python variables and AppleEvent data containers.
+ :deprecated:
.. sectionauthor:: Vincent Marchetti <vincem@en.com>
.. moduleauthor:: Jack Jansen
@@ -13,6 +14,11 @@
AppleEvent descriptor is handled by Python objects of built-in type
:class:`AEDesc`, defined in module :mod:`Carbon.AE`.
+.. warning::
+
+ This module is removed in 3.0.
+
+
The :mod:`aepack` module defines the following functions:
diff --git a/Doc/library/aetools.rst b/Doc/library/aetools.rst
index da427eb..76b5e17 100644
--- a/Doc/library/aetools.rst
+++ b/Doc/library/aetools.rst
@@ -5,6 +5,7 @@
.. module:: aetools
:platform: Mac
:synopsis: Basic support for sending Apple Events
+ :deprecated:
.. sectionauthor:: Jack Jansen <Jack.Jansen@cwi.nl>
.. moduleauthor:: Jack Jansen
@@ -21,6 +22,11 @@
manager, see section :ref:`osx-gui-scripts` for details. This restriction may be
lifted in future releases.
+.. warning::
+
+ This module is removed in 3.0.
+
+
The :mod:`aetools` module defines the following functions:
diff --git a/Doc/library/aetypes.rst b/Doc/library/aetypes.rst
index c8c5d80..997203e 100644
--- a/Doc/library/aetypes.rst
+++ b/Doc/library/aetypes.rst
@@ -5,6 +5,7 @@
.. module:: aetypes
:platform: Mac
:synopsis: Python representation of the Apple Event Object Model.
+ :deprecated:
.. sectionauthor:: Vincent Marchetti <vincem@en.com>
.. moduleauthor:: Jack Jansen
@@ -30,6 +31,12 @@
contains object specifiers for a number of common OSA classes such as
``Document``, ``Window``, ``Character``, etc.
+.. warning::
+
+ This module is removed in 3.0.
+
+
+
The :mod:`AEObjects` module defines the following classes to represent Apple
Event descriptor data:
diff --git a/Doc/library/autogil.rst b/Doc/library/autogil.rst
index 7625be6..ca26226 100644
--- a/Doc/library/autogil.rst
+++ b/Doc/library/autogil.rst
@@ -5,6 +5,7 @@
.. module:: autoGIL
:platform: Mac
:synopsis: Global Interpreter Lock handling in event loops.
+ :deprecated:
.. moduleauthor:: Just van Rossum <just@letterror.com>
@@ -12,6 +13,10 @@
automatically locks and unlocks Python's :term:`Global Interpreter Lock` when
running an event loop.
+.. warning::
+
+ This module is removed in 3.0.
+
.. exception:: AutoGILError
diff --git a/Doc/library/binhex.rst b/Doc/library/binhex.rst
index 3b0485c..0049c70 100644
--- a/Doc/library/binhex.rst
+++ b/Doc/library/binhex.rst
@@ -11,6 +11,11 @@
file and the finder information are encoded (or decoded), on other platforms
only the data fork is handled.
+.. warning::
+
+ In 3.0, special Macintosh support is removed.
+
+
The :mod:`binhex` module defines the following functions:
diff --git a/Doc/library/carbon.rst b/Doc/library/carbon.rst
index 886fa82..94e0c9a 100644
--- a/Doc/library/carbon.rst
+++ b/Doc/library/carbon.rst
@@ -22,8 +22,9 @@
from Carbon import AE
-**Warning!** These modules are not yet documented. If you wish to contribute
-documentation of any of these modules, please get in touch with docs@python.org.
+.. warning::
+
+ The Carbon modules are removed in 3.0.
:mod:`Carbon.AE` --- Apple Events
@@ -32,6 +33,7 @@
.. module:: Carbon.AE
:platform: Mac
:synopsis: Interface to the Apple Events toolbox.
+ :deprecated:
@@ -41,6 +43,7 @@
.. module:: Carbon.AH
:platform: Mac
:synopsis: Interface to the Apple Help manager.
+ :deprecated:
@@ -50,6 +53,7 @@
.. module:: Carbon.App
:platform: Mac
:synopsis: Interface to the Appearance Manager.
+ :deprecated:
@@ -59,6 +63,7 @@
.. module:: Carbon.CF
:platform: Mac
:synopsis: Interface to the Core Foundation.
+ :deprecated:
The ``CFBase``, ``CFArray``, ``CFData``, ``CFDictionary``, ``CFString`` and
@@ -71,6 +76,7 @@
.. module:: Carbon.CG
:platform: Mac
:synopsis: Interface to Core Graphics.
+ :deprecated:
@@ -80,6 +86,7 @@
.. module:: Carbon.CarbonEvt
:platform: Mac
:synopsis: Interface to the Carbon Event Manager.
+ :deprecated:
@@ -89,6 +96,7 @@
.. module:: Carbon.Cm
:platform: Mac
:synopsis: Interface to the Component Manager.
+ :deprecated:
@@ -98,6 +106,7 @@
.. module:: Carbon.Ctl
:platform: Mac
:synopsis: Interface to the Control Manager.
+ :deprecated:
@@ -107,6 +116,7 @@
.. module:: Carbon.Dlg
:platform: Mac
:synopsis: Interface to the Dialog Manager.
+ :deprecated:
@@ -116,6 +126,7 @@
.. module:: Carbon.Evt
:platform: Mac
:synopsis: Interface to the classic Event Manager.
+ :deprecated:
@@ -125,6 +136,7 @@
.. module:: Carbon.Fm
:platform: Mac
:synopsis: Interface to the Font Manager.
+ :deprecated:
@@ -134,6 +146,7 @@
.. module:: Carbon.Folder
:platform: Mac
:synopsis: Interface to the Folder Manager.
+ :deprecated:
@@ -143,6 +156,7 @@
.. module:: Carbon.Help
:platform: Mac
:synopsis: Interface to the Carbon Help Manager.
+ :deprecated:
@@ -152,6 +166,7 @@
.. module:: Carbon.List
:platform: Mac
:synopsis: Interface to the List Manager.
+ :deprecated:
@@ -161,6 +176,7 @@
.. module:: Carbon.Menu
:platform: Mac
:synopsis: Interface to the Menu Manager.
+ :deprecated:
@@ -170,6 +186,7 @@
.. module:: Carbon.Mlte
:platform: Mac
:synopsis: Interface to the MultiLingual Text Editor.
+ :deprecated:
@@ -179,6 +196,7 @@
.. module:: Carbon.Qd
:platform: Mac
:synopsis: Interface to the QuickDraw toolbox.
+ :deprecated:
@@ -188,6 +206,7 @@
.. module:: Carbon.Qdoffs
:platform: Mac
:synopsis: Interface to the QuickDraw Offscreen APIs.
+ :deprecated:
@@ -197,6 +216,7 @@
.. module:: Carbon.Qt
:platform: Mac
:synopsis: Interface to the QuickTime toolbox.
+ :deprecated:
@@ -206,6 +226,7 @@
.. module:: Carbon.Res
:platform: Mac
:synopsis: Interface to the Resource Manager and Handles.
+ :deprecated:
@@ -216,6 +237,7 @@
:platform: Mac
:synopsis: The Scrap Manager provides basic services for implementing cut & paste and
clipboard operations.
+ :deprecated:
This module is only fully available on MacOS9 and earlier under classic PPC
@@ -266,6 +288,7 @@
.. module:: Carbon.Snd
:platform: Mac
:synopsis: Interface to the Sound Manager.
+ :deprecated:
@@ -275,6 +298,7 @@
.. module:: Carbon.TE
:platform: Mac
:synopsis: Interface to TextEdit.
+ :deprecated:
@@ -284,5 +308,4 @@
.. module:: Carbon.Win
:platform: Mac
:synopsis: Interface to the Window Manager.
-
-
+ :deprecated:
diff --git a/Doc/library/colorpicker.rst b/Doc/library/colorpicker.rst
index 4244104..e0771ac 100644
--- a/Doc/library/colorpicker.rst
+++ b/Doc/library/colorpicker.rst
@@ -5,6 +5,7 @@
.. module:: ColorPicker
:platform: Mac
:synopsis: Interface to the standard color selection dialog.
+ :deprecated:
.. moduleauthor:: Just van Rossum <just@letterror.com>
.. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org>
@@ -12,6 +13,10 @@
The :mod:`ColorPicker` module provides access to the standard color picker
dialog.
+.. warning::
+
+ This module is removed in 3.0.
+
.. function:: GetColor(prompt, rgb)
diff --git a/Doc/library/easydialogs.rst b/Doc/library/easydialogs.rst
index 50b312f..dbda57f 100644
--- a/Doc/library/easydialogs.rst
+++ b/Doc/library/easydialogs.rst
@@ -5,6 +5,7 @@
.. module:: EasyDialogs
:platform: Mac
:synopsis: Basic Macintosh dialogs.
+ :deprecated:
The :mod:`EasyDialogs` module contains some simple dialogs for the Macintosh.
@@ -13,6 +14,11 @@
dialog items correspond (both type and item number) to those in the default
:const:`DLOG` resource. See source code for details.
+.. warning::
+
+ This module is removed in 3.0.
+
+
The :mod:`EasyDialogs` module defines the following functions:
diff --git a/Doc/library/framework.rst b/Doc/library/framework.rst
index c665fb7..71a07c1 100644
--- a/Doc/library/framework.rst
+++ b/Doc/library/framework.rst
@@ -5,6 +5,7 @@
.. module:: FrameWork
:platform: Mac
:synopsis: Interactive application framework.
+ :deprecated:
The :mod:`FrameWork` module contains classes that together provide a framework
@@ -15,6 +16,10 @@
dialog window in a non-standard way it is not necessary to override the complete
event handling.
+.. warning::
+
+ This module is removed in 3.0.
+
Work on the :mod:`FrameWork` has pretty much stopped, now that :mod:`PyObjC` is
available for full Cocoa access from Python, and the documentation describes
only the most important functionality, and not in the most logical manner at
diff --git a/Doc/library/ic.rst b/Doc/library/ic.rst
index d5e03bd..88d4eee 100644
--- a/Doc/library/ic.rst
+++ b/Doc/library/ic.rst
@@ -5,11 +5,17 @@
.. module:: ic
:platform: Mac
:synopsis: Access to the Mac OS X Internet Config.
+ :deprecated:
This module provides access to various internet-related preferences set through
:program:`System Preferences` or the :program:`Finder`.
+.. warning::
+
+ This module is removed in 3.0.
+
+
.. index:: module: icglue
There is a low-level companion module :mod:`icglue` which provides the basic
diff --git a/Doc/library/mac.rst b/Doc/library/mac.rst
index 791eb81..6d81d74 100644
--- a/Doc/library/mac.rst
+++ b/Doc/library/mac.rst
@@ -10,6 +10,10 @@
modules, and the HOWTO :ref:`using-on-mac` for a general introduction to
Mac-specific Python programming.
+.. warning::
+
+ These modules are deprecated and are removed in 3.0
+
.. toctree::
diff --git a/Doc/library/macos.rst b/Doc/library/macos.rst
index 543f868..832dacb 100644
--- a/Doc/library/macos.rst
+++ b/Doc/library/macos.rst
@@ -5,12 +5,17 @@
.. module:: MacOS
:platform: Mac
:synopsis: Access to Mac OS-specific interpreter features.
+ :deprecated:
This module provides access to MacOS specific functionality in the Python
interpreter, such as how the interpreter eventloop functions and the like. Use
with care.
+.. warning::
+
+ This module is removed in 3.0.
+
Note the capitalization of the module name; this is a historical artifact.
diff --git a/Doc/library/macostools.rst b/Doc/library/macostools.rst
index 275100e..eae867d 100644
--- a/Doc/library/macostools.rst
+++ b/Doc/library/macostools.rst
@@ -5,6 +5,7 @@
.. module:: macostools
:platform: Mac
:synopsis: Convenience routines for file manipulation.
+ :deprecated:
This module contains some convenience routines for file-manipulation on the
@@ -12,6 +13,10 @@
:class:`FSSpec` objects. This module expects a filesystem which supports forked
files, so it should not be used on UFS partitions.
+.. warning::
+
+ This module is removed in 3.0.
+
The :mod:`macostools` module defines the following functions:
diff --git a/Doc/library/plistlib.rst b/Doc/library/plistlib.rst
index 508f8e8..b987a5f 100644
--- a/Doc/library/plistlib.rst
+++ b/Doc/library/plistlib.rst
@@ -75,12 +75,22 @@
Read a plist from the resource with type *restype* from the resource fork of
*path*. Availability: MacOS X.
+ .. warning::
+
+ In 3.0, this function is removed.
+
+
.. function:: writePlistToResource(rootObject, path[, restype='plst'[, resid=0]])
Write *rootObject* as a resource with type *restype* to the resource fork of
*path*. Availability: MacOS X.
+ .. warning::
+
+ In 3.0, this function is removed.
+
+
The following class is available:
diff --git a/Doc/library/undoc.rst b/Doc/library/undoc.rst
index 9875a07..a1b4b25 100644
--- a/Doc/library/undoc.rst
+++ b/Doc/library/undoc.rst
@@ -80,7 +80,9 @@
.. module:: applesingle
:platform: Mac
:synopsis: Rudimentary decoder for AppleSingle format files.
+ :deprecated:
+.. deprecated:: 2.6
:mod:`buildtools` --- Helper module for BuildApplet and Friends
@@ -89,6 +91,7 @@
.. module:: buildtools
:platform: Mac
:synopsis: Helper module for BuildApplet, BuildApplication and macfreeze.
+ :deprecated:
.. deprecated:: 2.4
@@ -99,6 +102,7 @@
.. module:: cfmfile
:platform: Mac
:synopsis: Code Fragment Resource module.
+ :deprecated:
:mod:`cfmfile` is a module that understands Code Fragments and the accompanying
@@ -113,11 +117,14 @@
.. module:: icopen
:platform: Mac
:synopsis: Internet Config replacement for open().
+ :deprecated:
Importing :mod:`icopen` will replace the builtin :meth:`open` with a version
that uses Internet Config to set file type and creator for new files.
+.. deprecated:: 2.6
+
:mod:`macerrors` --- Mac OS Errors
----------------------------------
@@ -125,10 +132,13 @@
.. module:: macerrors
:platform: Mac
:synopsis: Constant definitions for many Mac OS error codes.
+ :deprecated:
:mod:`macerrors` contains constant definitions for many Mac OS error codes.
+.. deprecated:: 2.6
+
:mod:`macresource` --- Locate script resources
----------------------------------------------
@@ -136,12 +146,15 @@
.. module:: macresource
:platform: Mac
:synopsis: Locate script resources.
+ :deprecated:
:mod:`macresource` helps scripts finding their resources, such as dialogs and
menus, without requiring special case code for when the script is run under
MacPython, as a MacPython applet or under OSX Python.
+.. deprecated:: 2.6
+
:mod:`Nav` --- NavServices calls
--------------------------------
@@ -149,10 +162,13 @@
.. module:: Nav
:platform: Mac
:synopsis: Interface to Navigation Services.
+ :deprecated:
A low-level interface to Navigation Services.
+.. deprecated:: 2.6
+
:mod:`PixMapWrapper` --- Wrapper for PixMap objects
---------------------------------------------------
@@ -160,12 +176,15 @@
.. module:: PixMapWrapper
:platform: Mac
:synopsis: Wrapper for PixMap objects.
+ :deprecated:
:mod:`PixMapWrapper` wraps a PixMap object with a Python object that allows
access to the fields by name. It also has methods to convert to and from
:mod:`PIL` images.
+.. deprecated:: 2.6
+
:mod:`videoreader` --- Read QuickTime movies
--------------------------------------------
@@ -173,11 +192,14 @@
.. module:: videoreader
:platform: Mac
:synopsis: Read QuickTime movies frame by frame for further processing.
+ :deprecated:
:mod:`videoreader` reads and decodes QuickTime movies and passes a stream of
images to your program. It also provides some support for audio tracks.
+.. deprecated:: 2.6
+
:mod:`W` --- Widgets built on :mod:`FrameWork`
----------------------------------------------
@@ -185,10 +207,13 @@
.. module:: W
:platform: Mac
:synopsis: Widgets for the Mac, built on top of FrameWork.
+ :deprecated:
The :mod:`W` widgets are used extensively in the :program:`IDE`.
+.. deprecated:: 2.6
+
.. _obsolete-modules:
diff --git a/Lib/plat-mac/Audio_mac.py b/Lib/plat-mac/Audio_mac.py
index fd96095..3c8a74c 100644
--- a/Lib/plat-mac/Audio_mac.py
+++ b/Lib/plat-mac/Audio_mac.py
@@ -1,6 +1,9 @@
QSIZE = 100000
error='Audio_mac.error'
+from warnings import warnpy3k
+warnpy3k("In 3.x, the Play_Audio_mac module is removed.")
+
class Play_Audio_mac:
def __init__(self, qsize=QSIZE):
diff --git a/Lib/plat-mac/Carbon/__init__.py b/Lib/plat-mac/Carbon/__init__.py
index 8018c18..664dcec 100644
--- a/Lib/plat-mac/Carbon/__init__.py
+++ b/Lib/plat-mac/Carbon/__init__.py
@@ -2,3 +2,6 @@
import warnings
warnings.filterwarnings("ignore", "", FutureWarning, ".*Controls")
warnings.filterwarnings("ignore", "", FutureWarning, ".*MacTextEditor")
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, Carbon is removed.")
diff --git a/Lib/plat-mac/EasyDialogs.py b/Lib/plat-mac/EasyDialogs.py
index 3cafbb7..f3d7e78 100644
--- a/Lib/plat-mac/EasyDialogs.py
+++ b/Lib/plat-mac/EasyDialogs.py
@@ -18,6 +18,9 @@
Based upon STDWIN dialogs with the same names and functions.
"""
+from warnings import warnpy3k
+warnpy3k("In 3.x, the EasyDialogs module is removed.")
+
from Carbon.Dlg import GetNewDialog, SetDialogItemText, GetDialogItemText, ModalDialog
from Carbon import Qd
from Carbon import QuickDraw
diff --git a/Lib/plat-mac/FrameWork.py b/Lib/plat-mac/FrameWork.py
index 4437cf8..75588a6 100644
--- a/Lib/plat-mac/FrameWork.py
+++ b/Lib/plat-mac/FrameWork.py
@@ -2,6 +2,9 @@
DEBUG=0
+from warnings import warnpy3k
+warnpy3k("In 3.x, the FrameWork module is removed.")
+
import MacOS
import traceback
diff --git a/Lib/plat-mac/MiniAEFrame.py b/Lib/plat-mac/MiniAEFrame.py
index 506c5cb..7d2d5f5 100644
--- a/Lib/plat-mac/MiniAEFrame.py
+++ b/Lib/plat-mac/MiniAEFrame.py
@@ -6,6 +6,9 @@
only suitable for the simplest of AppleEvent servers.
"""
+from warnings import warnpy3k
+warnpy3k("In 3.x, the MiniAEFrame module is removed.")
+
import traceback
import MacOS
from Carbon import AE
diff --git a/Lib/plat-mac/PixMapWrapper.py b/Lib/plat-mac/PixMapWrapper.py
index 62297b3..45cb5f9 100644
--- a/Lib/plat-mac/PixMapWrapper.py
+++ b/Lib/plat-mac/PixMapWrapper.py
@@ -5,6 +5,10 @@
J. Strout <joe@strout.net> February 1999"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the PixMapWrapper module is removed.")
+
from Carbon import Qd
from Carbon import QuickDraw
import struct
diff --git a/Lib/plat-mac/aepack.py b/Lib/plat-mac/aepack.py
index d69534f..b849c9d 100644
--- a/Lib/plat-mac/aepack.py
+++ b/Lib/plat-mac/aepack.py
@@ -12,6 +12,9 @@
# Apple Event Registry, chapter 9.
#
+from warnings import warnpy3k
+warnpy3k("In 3.x, the aepack module is removed.")
+
import struct
import types
from types import *
diff --git a/Lib/plat-mac/aetools.py b/Lib/plat-mac/aetools.py
index c277b52..9618b81 100644
--- a/Lib/plat-mac/aetools.py
+++ b/Lib/plat-mac/aetools.py
@@ -21,6 +21,9 @@
"""
+from warnings import warnpy3k
+warnpy3k("In 3.x, the aetools module is removed.")
+
from types import *
from Carbon import AE
from Carbon import Evt
diff --git a/Lib/plat-mac/aetypes.py b/Lib/plat-mac/aetypes.py
index 65b59ad..c6c9026 100644
--- a/Lib/plat-mac/aetypes.py
+++ b/Lib/plat-mac/aetypes.py
@@ -1,5 +1,8 @@
"""aetypes - Python objects representing various AE types."""
+from warnings import warnpy3k
+warnpy3k("In 3.x, the aetypes module is removed.")
+
from Carbon.AppleEvents import *
import struct
from types import *
diff --git a/Lib/plat-mac/applesingle.py b/Lib/plat-mac/applesingle.py
index 76bdb06..0e2cf91 100644
--- a/Lib/plat-mac/applesingle.py
+++ b/Lib/plat-mac/applesingle.py
@@ -1,5 +1,9 @@
r"""Routines to decode AppleSingle files
"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the applesingle module is removed.")
+
import struct
import sys
try:
diff --git a/Lib/plat-mac/appletrawmain.py b/Lib/plat-mac/appletrawmain.py
index 1be9187..7fc51d8 100644
--- a/Lib/plat-mac/appletrawmain.py
+++ b/Lib/plat-mac/appletrawmain.py
@@ -4,6 +4,10 @@
# This script is put into __rawmain__.pyc for applets that need argv
# emulation, by BuildApplet and friends.
#
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the appletrawmain module is removed.")
+
import argvemulator
import os
import sys
diff --git a/Lib/plat-mac/appletrunner.py b/Lib/plat-mac/appletrunner.py
index 8d46c2a..b47fa42 100755
--- a/Lib/plat-mac/appletrunner.py
+++ b/Lib/plat-mac/appletrunner.py
@@ -3,6 +3,9 @@
# BuildApplet will use it as the main executable in the .app bundle if
# we are not running in a framework build.
+from warnings import warnpy3k
+warnpy3k("In 3.x, appletrunner is removed.")
+
import os
import sys
for name in ["__rawmain__.py", "__rawmain__.pyc", "__main__.py", "__main__.pyc"]:
diff --git a/Lib/plat-mac/argvemulator.py b/Lib/plat-mac/argvemulator.py
index 2d66f1c..1bc5da6 100644
--- a/Lib/plat-mac/argvemulator.py
+++ b/Lib/plat-mac/argvemulator.py
@@ -2,6 +2,9 @@
want unix-style arguments.
"""
+from warnings import warnpy3k
+warnpy3k("In 3.x, the argvemulator module is removed.")
+
import sys
import traceback
from Carbon import AE
diff --git a/Lib/plat-mac/bgenlocations.py b/Lib/plat-mac/bgenlocations.py
index 271eb3e..7643e4b 100644
--- a/Lib/plat-mac/bgenlocations.py
+++ b/Lib/plat-mac/bgenlocations.py
@@ -7,6 +7,9 @@
import os
+from warnings import warnpy3k
+warnpy3k("In 3.x, the bgenlocations module is removed.")
+
Error = "bgenlocations.Error"
#
# Where bgen is. For unix-Python bgen isn't installed, so you have to refer to
diff --git a/Lib/plat-mac/buildtools.py b/Lib/plat-mac/buildtools.py
index 7462d95..0081e65 100644
--- a/Lib/plat-mac/buildtools.py
+++ b/Lib/plat-mac/buildtools.py
@@ -1,5 +1,9 @@
"""tools for BuildApplet and BuildApplication"""
+import warnings
+warnings.warn("the buildtools module is deprecated and is removed in 3.0",
+ DeprecationWarning, 2)
+
import sys
import os
import string
@@ -14,9 +18,6 @@
import EasyDialogs
import shutil
-import warnings
-warnings.warn("the buildtools module is deprecated", DeprecationWarning, 2)
-
BuildError = "BuildError"
diff --git a/Lib/plat-mac/bundlebuilder.py b/Lib/plat-mac/bundlebuilder.py
index 266b845..46c17df 100755
--- a/Lib/plat-mac/bundlebuilder.py
+++ b/Lib/plat-mac/bundlebuilder.py
@@ -28,6 +28,9 @@
__all__ = ["BundleBuilder", "BundleBuilderError", "AppBuilder", "buildapp"]
+from warnings import warnpy3k
+warnpy3k("In 3.x, the bundlebuilder module is removed.")
+
import sys
import os, errno, shutil
import imp, marshal
diff --git a/Lib/plat-mac/cfmfile.py b/Lib/plat-mac/cfmfile.py
index 91ab0a6..309af87 100644
--- a/Lib/plat-mac/cfmfile.py
+++ b/Lib/plat-mac/cfmfile.py
@@ -5,15 +5,16 @@
__version__ = "0.8b3"
__author__ = "jvr"
+import warnings
+warnings.warn("the cfmfile module is deprecated and is removed in 3,0",
+ DeprecationWarning, 2)
+
import Carbon.File
import struct
from Carbon import Res
import os
import sys
-import warnings
-warnings.warn("the cfmfile module is deprecated", DeprecationWarning, 2)
-
DEBUG = 0
error = "cfm.error"
diff --git a/Lib/plat-mac/findertools.py b/Lib/plat-mac/findertools.py
index 34dde9a..038ee09 100644
--- a/Lib/plat-mac/findertools.py
+++ b/Lib/plat-mac/findertools.py
@@ -14,6 +14,10 @@
Mostly written by erik@letterror.com
"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the findertools module is removed.")
+
import Finder
from Carbon import AppleEvents
import aetools
diff --git a/Lib/plat-mac/gensuitemodule.py b/Lib/plat-mac/gensuitemodule.py
index 033bf9e..c92d1eb 100644
--- a/Lib/plat-mac/gensuitemodule.py
+++ b/Lib/plat-mac/gensuitemodule.py
@@ -6,6 +6,9 @@
Reading and understanding this code is left as an exercise to the reader.
"""
+from warnings import warnpy3k
+warnpy3k("In 3.x, the gensuitemodule module is removed.")
+
import MacOS
import EasyDialogs
import os
diff --git a/Lib/plat-mac/ic.py b/Lib/plat-mac/ic.py
index 46788c9..beb8226 100644
--- a/Lib/plat-mac/ic.py
+++ b/Lib/plat-mac/ic.py
@@ -1,5 +1,8 @@
"""IC wrapper module, based on Internet Config 1.3"""
+from warnings import warnpy3k
+warnpy3k("In 3.x, the ic module is removed.")
+
import icglue
import string
import sys
diff --git a/Lib/plat-mac/icopen.py b/Lib/plat-mac/icopen.py
index eea6083..7b8e8f3 100644
--- a/Lib/plat-mac/icopen.py
+++ b/Lib/plat-mac/icopen.py
@@ -37,6 +37,9 @@
effect.
"""
+from warnings import warnpy3k
+warnpy3k("In 3.x, the icopen module is removed.")
+
import __builtin__
_builtin_open = globals().get('_builtin_open', __builtin__.open)
diff --git a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
index 5ef7ca9..89583d3 100644
--- a/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/CodeWarrior/__init__.py
@@ -1,6 +1,10 @@
"""
Package generated from /Volumes/Sap/Applications (Mac OS 9)/Metrowerks CodeWarrior 7.0/Metrowerks CodeWarrior/CodeWarrior IDE 4.2.5
"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the CodeWarrior package is removed.")
+
import aetools
Error = aetools.Error
import CodeWarrior_suite
diff --git a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
index a9b09b0..8e9438a 100644
--- a/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Explorer/__init__.py
@@ -1,6 +1,10 @@
"""
Package generated from /Applications/Internet Explorer.app
"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the Explorer module is removed.")
+
import aetools
Error = aetools.Error
import Standard_Suite
diff --git a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
index 8782a4f..8c9b026 100644
--- a/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Finder/__init__.py
@@ -1,6 +1,10 @@
"""
Package generated from /System/Library/CoreServices/Finder.app
"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the Finder package is removed.")
+
import aetools
Error = aetools.Error
import Standard_Suite
diff --git a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
index 0dc5398..7f0dfe2 100644
--- a/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Netscape/__init__.py
@@ -1,6 +1,10 @@
"""
Package generated from /Volumes/Sap/Applications (Mac OS 9)/Netscape Communicator\xe2\x84\xa2 Folder/Netscape Communicator\xe2\x84\xa2
"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the Netscape package is removed.")
+
import aetools
Error = aetools.Error
import Standard_Suite
diff --git a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
index b80e3ba..15e03ec 100644
--- a/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/StdSuites/__init__.py
@@ -2,6 +2,10 @@
Package generated from /Volumes/Sap/System Folder/Extensions/AppleScript
Resource aeut resid 0 Standard Event Suites for English
"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the StdSuites package is removed.")
+
import aetools
Error = aetools.Error
import Text_Suite
diff --git a/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py b/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
index 95f985c..8029224 100644
--- a/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/SystemEvents/__init__.py
@@ -1,6 +1,10 @@
"""
Package generated from /System/Library/CoreServices/System Events.app
"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the SystemEvents package is removed.")
+
import aetools
Error = aetools.Error
import Standard_Suite
diff --git a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
index 47b75f2..5aa8a1e 100644
--- a/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/Terminal/__init__.py
@@ -1,6 +1,10 @@
"""
Package generated from /Applications/Utilities/Terminal.app
"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the Terminal module is removed.")
+
import aetools
Error = aetools.Error
import Standard_Suite
diff --git a/Lib/plat-mac/lib-scriptpackages/_builtinSuites/__init__.py b/Lib/plat-mac/lib-scriptpackages/_builtinSuites/__init__.py
index 2c722d9..5061204 100644
--- a/Lib/plat-mac/lib-scriptpackages/_builtinSuites/__init__.py
+++ b/Lib/plat-mac/lib-scriptpackages/_builtinSuites/__init__.py
@@ -4,6 +4,10 @@
in the Required suite according to the Apple docs, but they often seem to be
in the Standard suite.
"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the _builtinSuites module is removed.")
+
import aetools
import builtin_Suite
diff --git a/Lib/plat-mac/macerrors.py b/Lib/plat-mac/macerrors.py
index a7b3fee..9629a0f 100644
--- a/Lib/plat-mac/macerrors.py
+++ b/Lib/plat-mac/macerrors.py
@@ -1,4 +1,8 @@
# -coding=latin1-
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the macerrors module is removed.")
+
svTempDisable = -32768 #svTempDisable
svDisabled = -32640 #Reserve range -32640 to -32768 for Apple temp disables.
fontNotOutlineErr = -32615 #bitmap font passed to routine that does outlines only
diff --git a/Lib/plat-mac/macostools.py b/Lib/plat-mac/macostools.py
index 67bb497..643ba67 100644
--- a/Lib/plat-mac/macostools.py
+++ b/Lib/plat-mac/macostools.py
@@ -4,6 +4,9 @@
copy(src, dst) - Full copy of 'src' to 'dst'
"""
+from warnings import warnpy3k
+warnpy3k("In 3.x, the macostools module is removed.")
+
from Carbon import Res
from Carbon import File, Files
import os
diff --git a/Lib/plat-mac/macresource.py b/Lib/plat-mac/macresource.py
index f68ecdc..0a66d76 100644
--- a/Lib/plat-mac/macresource.py
+++ b/Lib/plat-mac/macresource.py
@@ -1,5 +1,8 @@
"""macresource - Locate and open the resources needed for a script."""
+from warnings import warnpy3k
+warnpy3k("In 3.x, the macresource module is removed.")
+
from Carbon import Res
import os
import sys
diff --git a/Lib/plat-mac/pimp.py b/Lib/plat-mac/pimp.py
index e58f36d..b3138bd 100644
--- a/Lib/plat-mac/pimp.py
+++ b/Lib/plat-mac/pimp.py
@@ -12,6 +12,10 @@
There is a minimal main program that works as a command line tool, but the
intention is that the end user will use this through a GUI.
"""
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the pimp module is removed.")
+
import sys
import os
import subprocess
diff --git a/Lib/plat-mac/terminalcommand.py b/Lib/plat-mac/terminalcommand.py
index 480797b..238781a 100644
--- a/Lib/plat-mac/terminalcommand.py
+++ b/Lib/plat-mac/terminalcommand.py
@@ -14,6 +14,9 @@
# Mac/OSX/PythonLauncher/doscript.m.
#
+from warnings import warnpy3k
+warnpy3k("In 3.x, the terminalcommand module is removed.")
+
import time
import os
from Carbon import AE
diff --git a/Lib/plat-mac/videoreader.py b/Lib/plat-mac/videoreader.py
index 952b919..43027d4 100644
--- a/Lib/plat-mac/videoreader.py
+++ b/Lib/plat-mac/videoreader.py
@@ -5,6 +5,11 @@
#
# Jack Jansen, August 2000
#
+
+from warnings import warnpy3k
+warnpy3k("In 3.x, the videoreader module is removed.")
+
+
import sys
from Carbon import Qt
from Carbon import QuickTime
diff --git a/Lib/plistlib.py b/Lib/plistlib.py
index 0ce5333..31d1e75 100644
--- a/Lib/plistlib.py
+++ b/Lib/plistlib.py
@@ -62,6 +62,7 @@
import datetime
from cStringIO import StringIO
import re
+import warnings
def readPlist(pathOrFile):
@@ -113,6 +114,7 @@
def readPlistFromResource(path, restype='plst', resid=0):
"""Read plst resource from the resource fork of path.
"""
+ warnings.warnpy3k("In 3.x, readPlistFromResource is removed.")
from Carbon.File import FSRef, FSGetResourceForkName
from Carbon.Files import fsRdPerm
from Carbon import Res
@@ -127,6 +129,7 @@
def writePlistToResource(rootObject, path, restype='plst', resid=0):
"""Write 'rootObject' as a plst resource to the resource fork of path.
"""
+ warnings.warnpy3k("In 3.x, writePlistToResource is removed.")
from Carbon.File import FSRef, FSGetResourceForkName
from Carbon.Files import fsRdWrPerm
from Carbon import Res
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 3fa16db..39086e9 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -131,7 +131,19 @@
all_platforms = ('audiodev', 'imputil', 'mutex', 'user', 'new', 'rexec',
'Bastion', 'compiler', 'dircache', 'fpformat',
'ihooks', 'mhlib')
- inclusive_platforms = {'irix':('pure',)}
+ inclusive_platforms = {'irix' : ('pure',),
+ 'darwin' : ('autoGIL', 'Carbon', 'OSATerminology',
+ 'icglue', 'Nav', 'MacOS', 'aepack', 'aetools'
+ 'aetypes', 'applesingle', 'appletrawmain',
+ 'appletrunner', 'argvemulator', 'bgenlocations',
+ 'EasyDialogs', 'macerrors', 'macostools',
+ 'findertools', 'FrameWork', 'ic',
+ 'gensuitemodule', 'icopen', 'macresource',
+ 'MiniAEFrame', 'pimp', 'PixMapWrapper',
+ 'terminalcommand', 'videoreader', '_builtinSuites',
+ 'CodeWarrior', 'Explorer', 'Finder', 'Netscape',
+ 'StdSuites', 'SystemEvents', 'Terminal', 'cfmfile',
+ 'bundlebuilder', 'buildtools', 'ColorPicker')}
optional_modules = ('bsddb185', 'Canvas', 'dl', 'linuxaudiodev', 'imageop',
'sv')
diff --git a/Mac/Modules/ColorPickermodule.c b/Mac/Modules/ColorPickermodule.c
index 62b4d5f..c29e0a4 100644
--- a/Mac/Modules/ColorPickermodule.c
+++ b/Mac/Modules/ColorPickermodule.c
@@ -64,6 +64,9 @@
void initColorPicker(void)
{
PyObject *m;
+
+ if (PyErr_WarnPy3k("In 3.x, ColorPicker is removed.", 1) < 0)
+ return;
/* Create the module and add the functions */
m = Py_InitModule4("ColorPicker", cp_methods,
diff --git a/Mac/Modules/MacOS.c b/Mac/Modules/MacOS.c
index 3fe6e0d..becb4b1 100644
--- a/Mac/Modules/MacOS.c
+++ b/Mac/Modules/MacOS.c
@@ -603,6 +603,9 @@
{
PyObject *m, *d;
+ if (PyErr_WarnPy3k("In 3.x, MacOS is removed.", 1))
+ return;
+
m = Py_InitModule("MacOS", MacOS_Methods);
d = PyModule_GetDict(m);
diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
index 6786ea0..3d3914f 100644
--- a/Mac/Modules/Nav.c
+++ b/Mac/Modules/Nav.c
@@ -916,6 +916,9 @@
initNav(void)
{
PyObject *m, *d;
+
+ if (PyErr_WarnPy3k("In 3.x, Nav is removed.", 1))
+ return;
/* Test that we have NavServices */
if ( !NavServicesAvailable() ) {
diff --git a/Mac/Modules/OSATerminology.c b/Mac/Modules/OSATerminology.c
index 85ad425..66fb969 100644
--- a/Mac/Modules/OSATerminology.c
+++ b/Mac/Modules/OSATerminology.c
@@ -89,5 +89,7 @@
void
initOSATerminology(void)
{
+ if (PyErr_WarnPy3k("In 3.x, OSATerminology is removed.", 1) < 0)
+ return;
Py_InitModule("OSATerminology", OSATerminology_methods);
}
\ No newline at end of file
diff --git a/Mac/Modules/autoGIL.c b/Mac/Modules/autoGIL.c
index 3108816..af2e699 100644
--- a/Mac/Modules/autoGIL.c
+++ b/Mac/Modules/autoGIL.c
@@ -134,6 +134,9 @@
{
PyObject *mod;
+ if (PyErr_WarnPy3k("In 3.x, the autoGIL module is removed.", 1) < 0)
+ return;
+
mod = Py_InitModule4("autoGIL", autoGIL_methods, autoGIL_docs,
NULL, PYTHON_API_VERSION);
if (mod == NULL)
diff --git a/Mac/Modules/icgluemodule.c b/Mac/Modules/icgluemodule.c
index fa50f0d..d995f16 100644
--- a/Mac/Modules/icgluemodule.c
+++ b/Mac/Modules/icgluemodule.c
@@ -453,6 +453,9 @@
initicglue(void)
{
PyObject *m, *d;
+
+ if (PyErr_WarnPy3k("In 3.x, icglue is removed.", 1))
+ return;
/* Create the module and add the functions */
m = Py_InitModule4("icglue", ic_methods,
diff --git a/Misc/NEWS b/Misc/NEWS
index d250f70..123e2dc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -91,6 +91,9 @@
- pdb gained the "until" command.
+- The Mac Modules (including Carbon) have been deprecated for removal in
+ 3.0.
+
Build
-----