* Mass change: get rid of all init() methods, in favor of __init__()
constructors. There is no backward compatibility. Not everything has
been tested.
* aiff.{py,doc}: deleted in favor of aifc.py (which contains its docs as
comments)
diff --git a/Lib/irix5/flp.py b/Lib/irix5/flp.py
index ced5598..c3f6f3b 100755
--- a/Lib/irix5/flp.py
+++ b/Lib/irix5/flp.py
@@ -92,11 +92,11 @@
forms = {}
for name in altforms.keys():
altobj, altlist = altforms[name]
- obj = _newobj().init()
+ obj = _newobj()
obj.make(altobj)
list = []
for altobj in altlist:
- nobj = _newobj().init()
+ nobj = _newobj()
nobj.make(altobj)
list.append(nobj)
forms[name] = obj, list
@@ -235,8 +235,6 @@
# Internal class: a convient place to store object info fields
#
class _newobj:
- def init(self):
- return self
def add(self, name, value):
self.__dict__[name] = value
def make(self, dict):
@@ -320,7 +318,7 @@
file.seek(pos)
def _parse_object(file):
- obj = _newobj().init()
+ obj = _newobj()
while 1:
pos = file.tell()
datum = _parse_1_line(file)
diff --git a/Lib/irix5/readcd.py b/Lib/irix5/readcd.py
index 7af6882..fffb6fe 100755
--- a/Lib/irix5/readcd.py
+++ b/Lib/irix5/readcd.py
@@ -30,7 +30,7 @@
elif len(arg) == 2:
self.player = cd.open(arg[0], arg[1])
else:
- raise Error, 'bad init call'
+ raise Error, 'bad __init__ call'
self.list = []
self.callbacks = [(None, None)] * 8
self.parser = cd.createparser()
diff --git a/Lib/irix5/torgb.py b/Lib/irix5/torgb.py
index 61297d0..f283063 100755
--- a/Lib/irix5/torgb.py
+++ b/Lib/irix5/torgb.py
@@ -13,40 +13,40 @@
table = {}
-t = pipes.Template().init()
+t = pipes.Template()
t.append('fromppm $IN $OUT', 'ff')
table['ppm'] = t
-t = pipes.Template().init()
+t = pipes.Template()
t.append('(PATH=$PATH:/ufs/guido/bin/sgi; exec pnmtoppm)', '--')
t.append('fromppm $IN $OUT', 'ff')
table['pnm'] = t
table['pgm'] = t
table['pbm'] = t
-t = pipes.Template().init()
+t = pipes.Template()
t.append('fromgif $IN $OUT', 'ff')
table['gif'] = t
-t = pipes.Template().init()
+t = pipes.Template()
t.append('tifftopnm', '--')
t.append('(PATH=$PATH:/ufs/guido/bin/sgi; exec pnmtoppm)', '--')
t.append('fromppm $IN $OUT', 'ff')
table['tiff'] = t
-t = pipes.Template().init()
+t = pipes.Template()
t.append('rasttopnm', '--')
t.append('(PATH=$PATH:/ufs/guido/bin/sgi; exec pnmtoppm)', '--')
t.append('fromppm $IN $OUT', 'ff')
table['rast'] = t
-t = pipes.Template().init()
+t = pipes.Template()
t.append('djpeg', '--')
t.append('(PATH=$PATH:/ufs/guido/bin/sgi; exec pnmtoppm)', '--')
t.append('fromppm $IN $OUT', 'ff')
table['jpeg'] = t
-uncompress = pipes.Template().init()
+uncompress = pipes.Template()
uncompress.append('uncompress', '--')