From 4b40bcb44dcd7ede557c44536f423d3a5e43d47d Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 19 May 2006 01:25:12 +0000 Subject: [PATCH] DeprecationWarning for the old wxPython package. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/docs/CHANGES.txt | 3 ++ wxPython/wxPython/__init__.py | 5 +++ wxPython/wxPython/_gdi.py | 74 +++++++++++++++++------------------ 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt index e281bded0c..368b5d312c 100644 --- 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 407e8706ec..a984cd13e2 100644 --- 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 420bc7d09e..9f188ca5b0 100644 --- 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 -- 2.45.2