Tweak unicode --> string conversion helper so UnicodeDecodeError is

[wxWidgets.git] / wxPython / wxPython / _misc.py

diff --git a/wxPython/wxPython/_misc.py b/wxPython/wxPython/_misc.py
index 6154e06b648e7140f0cf6b334729df1d93b47094..d9a4334a78d471955becba04c4ed22a62a09dc5d 100644 (file)
--- a/wxPython/wxPython/_misc.py
+++ b/wxPython/wxPython/_misc.py
@@ -1,7 +1,7 @@
 ## This file reverse renames symbols in the wx package to give
 ## them their wx prefix again, for backwards compatibility.
 ##
 ## This file reverse renames symbols in the wx package to give
 ## them their wx prefix again, for backwards compatibility.
 ##

-## Generated by ./distrib/build_renamers.py
+## Generated by BuildRenamers in config.py

 
 # This silly stuff here is so the wxPython.wx module doesn't conflict
 # with the wx package.  We need to import modules from the wx package
 
 # This silly stuff here is so the wxPython.wx module doesn't conflict
 # with the wx package.  We need to import modules from the wx package


@@ -118,6 +118,7 @@ wxSystemSettings_GetMetric = wx._misc.SystemSettings_GetMetric
 wxSystemSettings_HasFeature = wx._misc.SystemSettings_HasFeature
 wxSystemSettings_GetScreenType = wx._misc.SystemSettings_GetScreenType
 wxSystemSettings_SetScreenType = wx._misc.SystemSettings_SetScreenType
 wxSystemSettings_HasFeature = wx._misc.SystemSettings_HasFeature
 wxSystemSettings_GetScreenType = wx._misc.SystemSettings_GetScreenType
 wxSystemSettings_SetScreenType = wx._misc.SystemSettings_SetScreenType

+wxWINDOW_DEFAULT_VARIANT = wx._misc.WINDOW_DEFAULT_VARIANT

 wxSystemOptions = wx._misc.SystemOptions
 wxSystemOptionsPtr = wx._misc.SystemOptionsPtr
 wxSystemOptions_SetOption = wx._misc.SystemOptions_SetOption
 wxSystemOptions = wx._misc.SystemOptions
 wxSystemOptionsPtr = wx._misc.SystemOptionsPtr
 wxSystemOptions_SetOption = wx._misc.SystemOptions_SetOption


@@ -131,6 +132,9 @@ wxDirSelectorPromptStr = wx._misc.DirSelectorPromptStr
 wxNewId = wx._misc.NewId
 wxRegisterId = wx._misc.RegisterId
 wxGetCurrentId = wx._misc.GetCurrentId
 wxNewId = wx._misc.NewId
 wxRegisterId = wx._misc.RegisterId
 wxGetCurrentId = wx._misc.GetCurrentId

+wxIsStockID = wx._misc.IsStockID
+wxIsStockLabel = wx._misc.IsStockLabel
+wxGetStockLabel = wx._misc.GetStockLabel

 wxBell = wx._misc.Bell
 wxEndBusyCursor = wx._misc.EndBusyCursor
 wxGetElapsedTime = wx._misc.GetElapsedTime
 wxBell = wx._misc.Bell
 wxEndBusyCursor = wx._misc.EndBusyCursor
 wxGetElapsedTime = wx._misc.GetElapsedTime


@@ -146,7 +150,8 @@ wxSHUTDOWN_POWEROFF = wx._misc.SHUTDOWN_POWEROFF
 wxSHUTDOWN_REBOOT = wx._misc.SHUTDOWN_REBOOT
 wxShutdown = wx._misc.Shutdown
 wxSleep = wx._misc.Sleep
 wxSHUTDOWN_REBOOT = wx._misc.SHUTDOWN_REBOOT
 wxShutdown = wx._misc.Shutdown
 wxSleep = wx._misc.Sleep

-wxUsleep = wx._misc.Usleep
+wxMilliSleep = wx._misc.MilliSleep
+wxMicroSleep = wx._misc.MicroSleep

 wxEnableTopLevelWindows = wx._misc.EnableTopLevelWindows
 wxStripMenuCodes = wx._misc.StripMenuCodes
 wxGetEmailAddress = wx._misc.GetEmailAddress
 wxEnableTopLevelWindows = wx._misc.EnableTopLevelWindows
 wxStripMenuCodes = wx._misc.StripMenuCodes
 wxGetEmailAddress = wx._misc.GetEmailAddress


@@ -385,6 +390,7 @@ wxART_FRAME_ICON = wx._misc.ART_FRAME_ICON
 wxART_CMN_DIALOG = wx._misc.ART_CMN_DIALOG
 wxART_HELP_BROWSER = wx._misc.ART_HELP_BROWSER
 wxART_MESSAGE_BOX = wx._misc.ART_MESSAGE_BOX
 wxART_CMN_DIALOG = wx._misc.ART_CMN_DIALOG
 wxART_HELP_BROWSER = wx._misc.ART_HELP_BROWSER
 wxART_MESSAGE_BOX = wx._misc.ART_MESSAGE_BOX

+wxART_BUTTON = wx._misc.ART_BUTTON

 wxART_OTHER = wx._misc.ART_OTHER
 wxART_ADD_BOOKMARK = wx._misc.ART_ADD_BOOKMARK
 wxART_DEL_BOOKMARK = wx._misc.ART_DEL_BOOKMARK
 wxART_OTHER = wx._misc.ART_OTHER
 wxART_ADD_BOOKMARK = wx._misc.ART_ADD_BOOKMARK
 wxART_DEL_BOOKMARK = wx._misc.ART_DEL_BOOKMARK


@@ -468,6 +474,7 @@ wxDateTimeFromTimeT = wx._misc.DateTimeFromTimeT
 wxDateTimeFromJDN = wx._misc.DateTimeFromJDN
 wxDateTimeFromHMS = wx._misc.DateTimeFromHMS
 wxDateTimeFromDMY = wx._misc.DateTimeFromDMY
 wxDateTimeFromJDN = wx._misc.DateTimeFromJDN
 wxDateTimeFromHMS = wx._misc.DateTimeFromHMS
 wxDateTimeFromDMY = wx._misc.DateTimeFromDMY

+wxDateTime_SetToWeekOfYear = wx._misc.DateTime_SetToWeekOfYear

 wxTimeSpan = wx._misc.TimeSpan
 wxTimeSpanPtr = wx._misc.TimeSpanPtr
 wxTimeSpan_Seconds = wx._misc.TimeSpan_Seconds
 wxTimeSpan = wx._misc.TimeSpan
 wxTimeSpanPtr = wx._misc.TimeSpanPtr
 wxTimeSpan_Seconds = wx._misc.TimeSpan_Seconds


@@ -563,7 +570,7 @@ wxFileDropTarget = wx._misc.FileDropTarget
 wxFileDropTargetPtr = wx._misc.FileDropTargetPtr
 wxClipboard = wx._misc.Clipboard
 wxClipboardPtr = wx._misc.ClipboardPtr
 wxFileDropTargetPtr = wx._misc.FileDropTargetPtr
 wxClipboard = wx._misc.Clipboard
 wxClipboardPtr = wx._misc.ClipboardPtr

-wxTheClipboard = wx._misc.TheClipboard
+wxClipboard_Get = wx._misc.Clipboard_Get

 wxClipboardLocker = wx._misc.ClipboardLocker
 wxClipboardLockerPtr = wx._misc.ClipboardLockerPtr
 wxVideoMode = wx._misc.VideoMode
 wxClipboardLocker = wx._misc.ClipboardLocker
 wxClipboardLockerPtr = wx._misc.ClipboardLockerPtr
 wxVideoMode = wx._misc.VideoMode


@@ -576,5 +583,6 @@ wxDisplay_GetFromPoint = wx._misc.Display_GetFromPoint
 wxDisplay_GetFromWindow = wx._misc.Display_GetFromWindow
 wxPyTimer = wx._misc.PyTimer
 wxPyDropTarget = wx._misc.PyDropTarget
 wxDisplay_GetFromWindow = wx._misc.Display_GetFromWindow
 wxPyTimer = wx._misc.PyTimer
 wxPyDropTarget = wx._misc.PyDropTarget

+wxTheClipboard = wx._misc.TheClipboard