Use ImportError; New class syntax.

gvanrossum · gvanrossum · commit 2f242582f7db · 1991-12-26T13:00:45.000Z
diff --git a/Lib/lib-stdwin/DirList.py b/Lib/lib-stdwin/DirList.py
@@ -5,7 +5,7 @@
 try:
 	import posix, path
 	os = posix
-except NameError:
+except ImportError:
 	import mac, macpath
 	os = mac
 	path = macpath
@@ -16,7 +16,7 @@
 from WindowParent import WindowParent
 from HVSplit import HSplit, VSplit
 
-class DirList() = VSplit():
+class DirList(VSplit):
 	#
 	def create(self, (parent, dirname)):
 		self = VSplit.create(self, parent)
@@ -32,7 +32,7 @@ def create(self, (parent, dirname)):
 		return self
 	#
 
-class DirListWindow() = WindowParent():
+class DirListWindow(WindowParent):
 	#
 	def create(self, dirname):
 		self = WindowParent.create(self, (dirname, (0, 0)))
@@ -41,7 +41,7 @@ def create(self, dirname):
 		return self
 	#
 
-class SubdirButton() = PushButton():
+class SubdirButton(PushButton):
 	#
 	def drawpict(self, d):
 		PushButton.drawpict(self, d)
@@ -51,13 +51,13 @@ def up_trigger(self):
 		window = DirListWindow().create(self.text)
 	#
 
-class FileButton() = PushButton():
+class FileButton(PushButton):
 	#
 	def up_trigger(self):
 		stdwin.fleep()
 	#
 
-class ModuleButton() = FileButton():
+class ModuleButton(FileButton):
 	#
 	def drawpict(self, d):
 		PushButton.drawpict(self, d)
diff --git a/Lib/stdwin/DirList.py b/Lib/stdwin/DirList.py
@@ -5,7 +5,7 @@
 try:
 	import posix, path
 	os = posix
-except NameError:
+except ImportError:
 	import mac, macpath
 	os = mac
 	path = macpath
@@ -16,7 +16,7 @@
 from WindowParent import WindowParent
 from HVSplit import HSplit, VSplit
 
-class DirList() = VSplit():
+class DirList(VSplit):
 	#
 	def create(self, (parent, dirname)):
 		self = VSplit.create(self, parent)
@@ -32,7 +32,7 @@ def create(self, (parent, dirname)):
 		return self
 	#
 
-class DirListWindow() = WindowParent():
+class DirListWindow(WindowParent):
 	#
 	def create(self, dirname):
 		self = WindowParent.create(self, (dirname, (0, 0)))
@@ -41,7 +41,7 @@ def create(self, dirname):
 		return self
 	#
 
-class SubdirButton() = PushButton():
+class SubdirButton(PushButton):
 	#
 	def drawpict(self, d):
 		PushButton.drawpict(self, d)
@@ -51,13 +51,13 @@ def up_trigger(self):
 		window = DirListWindow().create(self.text)
 	#
 
-class FileButton() = PushButton():
+class FileButton(PushButton):
 	#
 	def up_trigger(self):
 		stdwin.fleep()
 	#
 
-class ModuleButton() = FileButton():
+class ModuleButton(FileButton):
 	#
 	def drawpict(self, d):
 		PushButton.drawpict(self, d)

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`try:`
`6`	`6`	`import posix, path`
`7`	`7`	`os = posix`
`8`		`-except NameError:`
	`8`	`+except ImportError:`
`9`	`9`	`import mac, macpath`
`10`	`10`	`os = mac`
`11`	`11`	`path = macpath`
`@@ -16,7 +16,7 @@`
`16`	`16`	`from WindowParent import WindowParent`
`17`	`17`	`from HVSplit import HSplit, VSplit`
`18`	`18`
`19`		`-class DirList() = VSplit():`
	`19`	`+class DirList(VSplit):`
`20`	`20`	`#`
`21`	`21`	`def create(self, (parent, dirname)):`
`22`	`22`	`self = VSplit.create(self, parent)`
`@@ -32,7 +32,7 @@ def create(self, (parent, dirname)):`
`32`	`32`	`return self`
`33`	`33`	`#`
`34`	`34`
`35`		`-class DirListWindow() = WindowParent():`
	`35`	`+class DirListWindow(WindowParent):`
`36`	`36`	`#`
`37`	`37`	`def create(self, dirname):`
`38`	`38`	`self = WindowParent.create(self, (dirname, (0, 0)))`
`@@ -41,7 +41,7 @@ def create(self, dirname):`
`41`	`41`	`return self`
`42`	`42`	`#`
`43`	`43`
`44`		`-class SubdirButton() = PushButton():`
	`44`	`+class SubdirButton(PushButton):`
`45`	`45`	`#`
`46`	`46`	`def drawpict(self, d):`
`47`	`47`	`PushButton.drawpict(self, d)`
`@@ -51,13 +51,13 @@ def up_trigger(self):`
`51`	`51`	`window = DirListWindow().create(self.text)`
`52`	`52`	`#`
`53`	`53`
`54`		`-class FileButton() = PushButton():`
	`54`	`+class FileButton(PushButton):`
`55`	`55`	`#`
`56`	`56`	`def up_trigger(self):`
`57`	`57`	`stdwin.fleep()`
`58`	`58`	`#`
`59`	`59`
`60`		`-class ModuleButton() = FileButton():`
	`60`	`+class ModuleButton(FileButton):`
`61`	`61`	`#`
`62`	`62`	`def drawpict(self, d):`
`63`	`63`	`PushButton.drawpict(self, d)`