DeprecationWarning for the old wxPython package.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index e281bded0cafdbae89c8261c91a71a04478da62d..368b5d312c9b6f11816711db063d2c8657e2c93a 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -138,6 +138,9 @@ flag.  If the dialog has the wx.PD_CAN_SKIP flag and if the Skip
 button is clicked, then the skip flag is set to True the next time
 Update is called.
 
+A DeprecationWarning is now issued when the old wxPython package is
+imported.  If you are still using the old namespace please convert
+your code to use the new wx package instead.
 
 
 

diff --git a/wxPython/wxPython/__init__.py b/wxPython/wxPython/__init__.py
index 407e8706ecb257a91a9776cc81022c77e92ae80b..a984cd13e2b3b5dad2e7690e7d325d1f1fb9873d 100644 (file)
--- a/wxPython/wxPython/__init__.py
+++ b/wxPython/wxPython/__init__.py
@@ -1,5 +1,10 @@
 # The "old" wxPython package
 
+import warnings
+warnings.warn(
+    "The wxPython compatibility package is no longer automatically generated "
+    "or activly maintained.  Please switch to the wx package as soon as possible.",
+    DeprecationWarning, stacklevel=2)
 
 # We need to be able to import from the wx package, but there is also
 # a wxPython.wx module and that would normally be chosen first by

diff --git a/wxPython/wxPython/_gdi.py b/wxPython/wxPython/_gdi.py
index 420bc7d09e7a78e5d47a01e1b672befa221c8a0f..9f188ca5b038666a29cb7725ee661cafbf512af6 100644 (file)
--- a/wxPython/wxPython/_gdi.py
+++ b/wxPython/wxPython/_gdi.py
@@ -540,42 +540,42 @@ wxRendererNative_GetGeneric = wx._gdi.RendererNative_GetGeneric
 wxRendererNative_GetDefault = wx._gdi.RendererNative_GetDefault
 wxRendererNative_Set = wx._gdi.RendererNative_Set
 wxMaskColour = wx._gdi.MaskColour
-wxNORMAL_FONT = wx._gdi.NORMAL_FONT
-wxSMALL_FONT = wx._gdi.SMALL_FONT
-wxITALIC_FONT = wx._gdi.ITALIC_FONT
-wxSWISS_FONT = wx._gdi.SWISS_FONT
-wxRED_PEN = wx._gdi.RED_PEN
-wxCYAN_PEN = wx._gdi.CYAN_PEN
-wxGREEN_PEN = wx._gdi.GREEN_PEN
-wxBLACK_PEN = wx._gdi.BLACK_PEN
-wxWHITE_PEN = wx._gdi.WHITE_PEN
-wxTRANSPARENT_PEN = wx._gdi.TRANSPARENT_PEN
-wxBLACK_DASHED_PEN = wx._gdi.BLACK_DASHED_PEN
-wxGREY_PEN = wx._gdi.GREY_PEN
-wxMEDIUM_GREY_PEN = wx._gdi.MEDIUM_GREY_PEN
-wxLIGHT_GREY_PEN = wx._gdi.LIGHT_GREY_PEN
-wxBLUE_BRUSH = wx._gdi.BLUE_BRUSH
-wxGREEN_BRUSH = wx._gdi.GREEN_BRUSH
-wxWHITE_BRUSH = wx._gdi.WHITE_BRUSH
-wxBLACK_BRUSH = wx._gdi.BLACK_BRUSH
-wxTRANSPARENT_BRUSH = wx._gdi.TRANSPARENT_BRUSH
-wxCYAN_BRUSH = wx._gdi.CYAN_BRUSH
-wxRED_BRUSH = wx._gdi.RED_BRUSH
-wxGREY_BRUSH = wx._gdi.GREY_BRUSH
-wxMEDIUM_GREY_BRUSH = wx._gdi.MEDIUM_GREY_BRUSH
-wxLIGHT_GREY_BRUSH = wx._gdi.LIGHT_GREY_BRUSH
-wxBLACK = wx._gdi.BLACK
-wxWHITE = wx._gdi.WHITE
-wxRED = wx._gdi.RED
-wxBLUE = wx._gdi.BLUE
-wxGREEN = wx._gdi.GREEN
-wxCYAN = wx._gdi.CYAN
-wxLIGHT_GREY = wx._gdi.LIGHT_GREY
-wxSTANDARD_CURSOR = wx._gdi.STANDARD_CURSOR
-wxHOURGLASS_CURSOR = wx._gdi.HOURGLASS_CURSOR
-wxCROSS_CURSOR = wx._gdi.CROSS_CURSOR
-wxTheFontList = wx._gdi.wxTheFontList
-wxTheBrushList = wx._gdi.wxTheBrushList
-wxTheColourDatabase = wx._gdi.wxTheColourDatabase
+## wxNORMAL_FONT = wx._gdi.NORMAL_FONT
+## wxSMALL_FONT = wx._gdi.SMALL_FONT
+## wxITALIC_FONT = wx._gdi.ITALIC_FONT
+## wxSWISS_FONT = wx._gdi.SWISS_FONT
+## wxRED_PEN = wx._gdi.RED_PEN
+## wxCYAN_PEN = wx._gdi.CYAN_PEN
+## wxGREEN_PEN = wx._gdi.GREEN_PEN
+## wxBLACK_PEN = wx._gdi.BLACK_PEN
+## wxWHITE_PEN = wx._gdi.WHITE_PEN
+## wxTRANSPARENT_PEN = wx._gdi.TRANSPARENT_PEN
+## wxBLACK_DASHED_PEN = wx._gdi.BLACK_DASHED_PEN
+## wxGREY_PEN = wx._gdi.GREY_PEN
+## wxMEDIUM_GREY_PEN = wx._gdi.MEDIUM_GREY_PEN
+## wxLIGHT_GREY_PEN = wx._gdi.LIGHT_GREY_PEN
+## wxBLUE_BRUSH = wx._gdi.BLUE_BRUSH
+## wxGREEN_BRUSH = wx._gdi.GREEN_BRUSH
+## wxWHITE_BRUSH = wx._gdi.WHITE_BRUSH
+## wxBLACK_BRUSH = wx._gdi.BLACK_BRUSH
+## wxTRANSPARENT_BRUSH = wx._gdi.TRANSPARENT_BRUSH
+## wxCYAN_BRUSH = wx._gdi.CYAN_BRUSH
+## wxRED_BRUSH = wx._gdi.RED_BRUSH
+## wxGREY_BRUSH = wx._gdi.GREY_BRUSH
+## wxMEDIUM_GREY_BRUSH = wx._gdi.MEDIUM_GREY_BRUSH
+## wxLIGHT_GREY_BRUSH = wx._gdi.LIGHT_GREY_BRUSH
+## wxBLACK = wx._gdi.BLACK
+## wxWHITE = wx._gdi.WHITE
+## wxRED = wx._gdi.RED
+## wxBLUE = wx._gdi.BLUE
+## wxGREEN = wx._gdi.GREEN
+## wxCYAN = wx._gdi.CYAN
+## wxLIGHT_GREY = wx._gdi.LIGHT_GREY
+## wxSTANDARD_CURSOR = wx._gdi.STANDARD_CURSOR
+## wxHOURGLASS_CURSOR = wx._gdi.HOURGLASS_CURSOR
+## wxCROSS_CURSOR = wx._gdi.CROSS_CURSOR
+## wxTheFontList = wx._gdi.wxTheFontList
+## wxTheBrushList = wx._gdi.wxTheBrushList
+## wxTheColourDatabase = wx._gdi.wxTheColourDatabase