diff --git a/wxPython/wx/py/PyAlaCarte.py b/wxPython/wx/py/PyAlaCarte.py index 0f71bd447b..c665e4f4b6 100644 --- a/wxPython/wx/py/PyAlaCarte.py +++ b/wxPython/wx/py/PyAlaCarte.py @@ -11,12 +11,6 @@ import sys import editor -try: - True -except NameError: - True = 1==1 - False = 1==0 - class App(wx.App): """PyAlaCarte standalone application.""" diff --git a/wxPython/wx/py/PyAlaMode.py b/wxPython/wx/py/PyAlaMode.py index d33243a36a..06d1583657 100644 --- a/wxPython/wx/py/PyAlaMode.py +++ b/wxPython/wx/py/PyAlaMode.py @@ -11,12 +11,6 @@ import sys import editor -try: - True -except NameError: - True = 1==1 - False = 1==0 - class App(wx.App): """PyAlaMode standalone application.""" diff --git a/wxPython/wx/py/PyAlaModeTest.py b/wxPython/wx/py/PyAlaModeTest.py index 57b52e4524..3ae9cb600a 100755 --- a/wxPython/wx/py/PyAlaModeTest.py +++ b/wxPython/wx/py/PyAlaModeTest.py @@ -11,12 +11,6 @@ import sys import editor -try: - True -except NameError: - True = 1==1 - False = 1==0 - class App(wx.App): """PyAlaModeTest standalone application.""" diff --git a/wxPython/wx/py/PyCrust.py b/wxPython/wx/py/PyCrust.py index c48cb344df..4bd5637050 100644 --- a/wxPython/wx/py/PyCrust.py +++ b/wxPython/wx/py/PyCrust.py @@ -13,12 +13,6 @@ __revision__ = "$Revision$"[11:-2] import wx -try: - True -except NameError: - True = 1==1 - False = 1==0 - class App(wx.App): """PyCrust standalone application.""" diff --git a/wxPython/wx/py/PyFilling.py b/wxPython/wx/py/PyFilling.py index 5331791f33..df8d1ca621 100644 --- a/wxPython/wx/py/PyFilling.py +++ b/wxPython/wx/py/PyFilling.py @@ -18,13 +18,6 @@ import shell import sys import wx -try: - True -except NameError: - True = 1==1 - False = 1==0 - - class App(filling.App): def OnInit(self): filling.App.OnInit(self) @@ -38,6 +31,5 @@ def main(): app.fillingFrame.filling.tree.Expand(app.root) app.MainLoop() - if __name__ == '__main__': main() diff --git a/wxPython/wx/py/PyShell.py b/wxPython/wx/py/PyShell.py index 39f3c103f9..954ebed4c3 100644 --- a/wxPython/wx/py/PyShell.py +++ b/wxPython/wx/py/PyShell.py @@ -13,13 +13,6 @@ __revision__ = "$Revision$"[11:-2] import wx -try: - True -except NameError: - True = 1==1 - False = 1==0 - - class App(wx.App): """PyShell standalone application.""" diff --git a/wxPython/wx/py/PyWrap.py b/wxPython/wx/py/PyWrap.py index 4911be1ae1..333ad8d064 100644 --- a/wxPython/wx/py/PyWrap.py +++ b/wxPython/wx/py/PyWrap.py @@ -8,24 +8,16 @@ __revision__ = "$Revision$"[11:-2] import os import sys import wx -from crust import CrustFrame as Frame - -try: - True -except NameError: - True = 1==1 - False = 1==0 - +from wx.py.crust import CrustFrame def wrap(app): wx.InitAllImageHandlers() - frame = Frame() + frame = CrustFrame() frame.SetSize((750, 525)) frame.Show(True) frame.shell.interp.locals['app'] = app app.MainLoop() - def main(modulename=None): sys.path.insert(0, os.curdir) if not modulename: @@ -46,11 +38,10 @@ def main(modulename=None): except (NameError, TypeError): pass if App is None: - print "No App class found." + print "No App class was found." raise SystemExit app = App() wrap(app) - if __name__ == '__main__': main() diff --git a/wxPython/wx/py/buffer.py b/wxPython/wx/py/buffer.py index ebb04cc920..0139ce8663 100644 --- a/wxPython/wx/py/buffer.py +++ b/wxPython/wx/py/buffer.py @@ -11,12 +11,6 @@ import sys import document -try: - True -except NameError: - True = 1==1 - False = 1==0 - class Buffer: """Buffer class.""" diff --git a/wxPython/wx/py/crust.py b/wxPython/wx/py/crust.py index ef9d235804..21a71cc680 100644 --- a/wxPython/wx/py/crust.py +++ b/wxPython/wx/py/crust.py @@ -17,12 +17,6 @@ import frame from shell import Shell from version import VERSION -try: - True -except NameError: - True = 1==1 - False = 1==0 - class Crust(wx.SplitterWindow): """Crust based on SplitterWindow.""" diff --git a/wxPython/wx/py/dispatcher.py b/wxPython/wx/py/dispatcher.py index 9509d1eddd..4242179884 100644 --- a/wxPython/wx/py/dispatcher.py +++ b/wxPython/wx/py/dispatcher.py @@ -8,12 +8,6 @@ import exceptions import types import weakref -try: - True -except NameError: - True = 1==1 - False = 1==0 - class DispatcherError(exceptions.Exception): def __init__(self, args=None): diff --git a/wxPython/wx/py/document.py b/wxPython/wx/py/document.py index 7bba48cb54..ab00ca0490 100644 --- a/wxPython/wx/py/document.py +++ b/wxPython/wx/py/document.py @@ -6,12 +6,6 @@ __revision__ = "$Revision$"[11:-2] import os -try: - True -except NameError: - True = 1==1 - False = 1==0 - class Document: """Document class.""" diff --git a/wxPython/wx/py/editor.py b/wxPython/wx/py/editor.py index 6a547188f7..6a6293ca22 100644 --- a/wxPython/wx/py/editor.py +++ b/wxPython/wx/py/editor.py @@ -14,12 +14,6 @@ import frame from shell import Shell import version -try: - True -except NameError: - True = 1==1 - False = 1==0 - class EditorFrame(frame.Frame): """Frame containing one editor.""" diff --git a/wxPython/wx/py/editwindow.py b/wxPython/wx/py/editwindow.py index 1d44f1d863..e95ba17218 100644 --- a/wxPython/wx/py/editwindow.py +++ b/wxPython/wx/py/editwindow.py @@ -15,11 +15,6 @@ import time import dispatcher from version import VERSION -try: - True -except NameError: - True = 1==1 - False = 1==0 if wx.Platform == '__WXMSW__': FACES = { 'times' : 'Times New Roman', diff --git a/wxPython/wx/py/filling.py b/wxPython/wx/py/filling.py index 0a4b701465..f34bbf0153 100644 --- a/wxPython/wx/py/filling.py +++ b/wxPython/wx/py/filling.py @@ -16,11 +16,6 @@ import sys import types from version import VERSION -try: - True -except NameError: - True = 1==1 - False = 1==0 COMMONTYPES = [getattr(types, t) for t in dir(types) \ if not t.startswith('_') \ diff --git a/wxPython/wx/py/frame.py b/wxPython/wx/py/frame.py index 006818d309..ddcfa688e3 100644 --- a/wxPython/wx/py/frame.py +++ b/wxPython/wx/py/frame.py @@ -7,11 +7,6 @@ __revision__ = "$Revision$"[11:-2] import wx from version import VERSION -try: - True -except NameError: - True = 1==1 - False = 1==0 ID_NEW = wx.ID_NEW ID_OPEN = wx.ID_OPEN diff --git a/wxPython/wx/py/interpreter.py b/wxPython/wx/py/interpreter.py index 426b0b966f..fe95d5e80b 100644 --- a/wxPython/wx/py/interpreter.py +++ b/wxPython/wx/py/interpreter.py @@ -10,12 +10,6 @@ from code import InteractiveInterpreter import dispatcher import introspect -try: - True -except NameError: - True = 1==1 - False = 1==0 - class Interpreter(InteractiveInterpreter): """Interpreter based on code.InteractiveInterpreter.""" diff --git a/wxPython/wx/py/introspect.py b/wxPython/wx/py/introspect.py index a6df887ea2..e948296ed8 100644 --- a/wxPython/wx/py/introspect.py +++ b/wxPython/wx/py/introspect.py @@ -13,12 +13,6 @@ import sys import tokenize import types -try: - True -except NameError: - True = 1==1 - False = 1==0 - def getAutoCompleteList(command='', locals=None, includeMagic=1, includeSingle=1, includeDouble=1): """Return list of auto-completion options for command. diff --git a/wxPython/wx/py/pseudo.py b/wxPython/wx/py/pseudo.py index 583854809a..482be6c4cc 100644 --- a/wxPython/wx/py/pseudo.py +++ b/wxPython/wx/py/pseudo.py @@ -4,12 +4,6 @@ __author__ = "Patrick K. O'Brien " __cvsid__ = "$Id$" __revision__ = "$Revision$"[11:-2] -try: - True -except NameError: - True = 1==1 - False = 1==0 - class PseudoKeyword: """A callable class that calls a method passed as a parameter. diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py index 722b59649a..841a0e47e6 100644 --- a/wxPython/wx/py/shell.py +++ b/wxPython/wx/py/shell.py @@ -25,12 +25,6 @@ from pseudo import PseudoFileOut from pseudo import PseudoFileErr from version import VERSION -try: - True -except NameError: - True = 1==1 - False = 1==0 - sys.ps3 = '<-- ' # Input prompt. NAVKEYS = (wx.WXK_END, wx.WXK_LEFT, wx.WXK_RIGHT,