[Python-checkins] CVS: python/dist/src/Lib/plat-irix5 FL.py,1.7,1.8 cdplayer.py,1.6,1.7 flp.py,1.19,1.20 jpeg.py,1.3,1.4 panel.py,1.5,1.6 panelparser.py,1.2,1.3 readcd.py,1.11,1.12 torgb.py,1.5,1.6
Fred L. Drake
python-dev@python.org
Tue, 12 Dec 2000 15:11:44 -0800
- Previous message: [Python-checkins] CVS: python/dist/src/Lib/lib-old Para.py,1.6,1.7 cmp.py,1.1,1.2 cmpcache.py,1.1,1.2 dircmp.py,1.1,1.2 fmt.py,1.5,1.6 grep.py,1.7,1.8 packmail.py,1.7,1.8 tb.py,1.7,1.8 zmod.py,1.1,1.2
- Next message: [Python-checkins] CVS: python/dist/src/Lib/plat-irix6 FL.py,1.1,1.2 cdplayer.py,1.3,1.4 flp.py,1.6,1.7 jpeg.py,1.3,1.4 panel.py,1.2,1.3 panelparser.py,1.1,1.2 readcd.py,1.2,1.3 torgb.py,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Lib/plat-irix5
In directory slayer.i.sourceforge.net:/tmp/cvs-serv18670/plat-irix5
Modified Files:
FL.py cdplayer.py flp.py jpeg.py panel.py panelparser.py
readcd.py torgb.py
Log Message:
Update the code to better reflect recommended style:
Use != instead of <> since <> is documented as "obsolescent".
Use "is" and "is not" when comparing with None or type objects.
Index: FL.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-irix5/FL.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** FL.py 1993/07/06 15:19:33 1.7
--- FL.py 2000/12/12 23:11:41 1.8
***************
*** 8,12 ****
##import fl
##try:
! ## _v20 = (fl.get_rgbmode <> None)
##except:
## _v20 = 0
--- 8,12 ----
##import fl
##try:
! ## _v20 = (fl.get_rgbmode is not None)
##except:
## _v20 = 0
Index: cdplayer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-irix5/cdplayer.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** cdplayer.py 2000/07/16 11:57:19 1.6
--- cdplayer.py 2000/12/12 23:11:42 1.7
***************
*** 78,82 ****
if line == '':
break
! if line[:l] <> s:
new.write(line)
new.write(self.id + '.title:\t' + self.title + '\n')
--- 78,82 ----
if line == '':
break
! if line[:l] != s:
new.write(line)
new.write(self.id + '.title:\t' + self.title + '\n')
Index: flp.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-irix5/flp.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** flp.py 2000/08/18 14:57:26 1.19
--- flp.py 2000/12/12 23:11:42 1.20
***************
*** 37,41 ****
def parse_forms(filename):
forms = checkcache(filename)
! if forms != None: return forms
fp = _open_formfile(filename)
nforms = _parse_fd_header(fp)
--- 37,41 ----
def parse_forms(filename):
forms = checkcache(filename)
! if forms is not None: return forms
fp = _open_formfile(filename)
nforms = _parse_fd_header(fp)
***************
*** 169,173 ****
def _open_formfile2(filename):
! if filename[-3:] <> '.fd':
filename = filename + '.fd'
if filename[0] == '/':
--- 169,173 ----
def _open_formfile2(filename):
! if filename[-3:] != '.fd':
filename = filename + '.fd'
if filename[0] == '/':
***************
*** 185,189 ****
except IOError:
fp = None
! if fp == None:
raise error, 'Cannot find forms file ' + filename
return fp, filename
--- 185,189 ----
except IOError:
fp = None
! if fp is None:
raise error, 'Cannot find forms file ' + filename
return fp, filename
***************
*** 195,199 ****
# First read the magic header line
datum = _parse_1_line(file)
! if datum <> ('Magic', 12321):
raise error, 'Not a forms definition file'
# Now skip until we know number of forms
--- 195,199 ----
# First read the magic header line
datum = _parse_1_line(file)
! if datum != ('Magic', 12321):
raise error, 'Not a forms definition file'
# Now skip until we know number of forms
***************
*** 209,216 ****
def _parse_fd_form(file, name):
datum = _parse_1_line(file)
! if datum <> FORMLINE:
raise error, 'Missing === FORM === line'
form = _parse_object(file)
! if form.Name == name or name == None:
objs = []
for j in range(form.Numberofobjects):
--- 209,216 ----
def _parse_fd_form(file, name):
datum = _parse_1_line(file)
! if datum != FORMLINE:
raise error, 'Missing === FORM === line'
form = _parse_object(file)
! if form.Name == name or name is None:
objs = []
for j in range(form.Numberofobjects):
***************
*** 317,321 ****
file.seek(pos)
return obj
! if type(datum) <> type(()) or len(datum) <> 2:
raise error, 'Parse error, illegal line in object: '+datum
obj.add(datum[0], datum[1])
--- 317,321 ----
file.seek(pos)
return obj
! if type(datum) is not type(()) or len(datum) != 2:
raise error, 'Parse error, illegal line in object: '+datum
obj.add(datum[0], datum[1])
***************
*** 340,344 ****
def merge_full_form(inst, form, (fdata, odatalist)):
exec 'inst.'+fdata.Name+' = form\n'
! if odatalist[0].Class <> FL.BOX:
raise error, 'merge_full_form() expects FL.BOX as first obj'
for odata in odatalist[1:]:
--- 340,344 ----
def merge_full_form(inst, form, (fdata, odatalist)):
exec 'inst.'+fdata.Name+' = form\n'
! if odatalist[0].Class != FL.BOX:
raise error, 'merge_full_form() expects FL.BOX as first obj'
for odata in odatalist[1:]:
Index: jpeg.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-irix5/jpeg.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** jpeg.py 2000/08/18 14:57:26 1.3
--- jpeg.py 2000/12/12 23:11:42 1.4
***************
*** 60,64 ****
def setoption(name, value):
! if type(value) <> type(0):
raise TypeError, 'jpeg.setoption: numeric options only'
if name == 'forcegrey':
--- 60,64 ----
def setoption(name, value):
! if type(value) is not type(0):
raise TypeError, 'jpeg.setoption: numeric options only'
if name == 'forcegrey':
Index: panel.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-irix5/panel.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** panel.py 2000/06/28 14:48:01 1.5
--- panel.py 2000/12/12 23:11:42 1.6
***************
*** 208,212 ****
# Sanity check
#
! if (not descr) or descr[0] <> 'panel':
raise panel_error, 'panel description must start with "panel"'
#
--- 208,212 ----
# Sanity check
#
! if (not descr) or descr[0] != 'panel':
raise panel_error, 'panel description must start with "panel"'
#
Index: panelparser.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-irix5/panelparser.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** panelparser.py 1992/01/01 19:32:09 1.2
--- panelparser.py 2000/12/12 23:11:42 1.3
***************
*** 72,76 ****
#
def parse_expr(tokens):
! if (not tokens) or tokens[0] <> '(':
raise syntax_error, 'expected "("'
tokens = tokens[1:]
--- 72,76 ----
#
def parse_expr(tokens):
! if (not tokens) or tokens[0] != '(':
raise syntax_error, 'expected "("'
tokens = tokens[1:]
Index: readcd.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-irix5/readcd.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** readcd.py 2000/08/18 14:57:26 1.11
--- readcd.py 2000/12/12 23:11:42 1.12
***************
*** 94,98 ****
raise Error, 'range error'
end = self.pmsf2msf(prog, min, sec, frame)
! elif l <> 3:
raise Error, 'syntax error'
if type(start) == type(0):
--- 94,98 ----
raise Error, 'range error'
end = self.pmsf2msf(prog, min, sec, frame)
! elif l != 3:
raise Error, 'syntax error'
if type(start) == type(0):
***************
*** 112,116 ****
raise Error, 'range error'
start = self.pmsf2msf(prog, min, sec, frame)
! elif l <> 3:
raise Error, 'syntax error'
self.list.append((start, end))
--- 112,116 ----
raise Error, 'range error'
start = self.pmsf2msf(prog, min, sec, frame)
! elif l != 3:
raise Error, 'syntax error'
self.list.append((start, end))
***************
*** 128,135 ****
start, end = self.list[self.listindex]
if type(end) == type(0):
! if cb_type <> CD.PNUM:
self.parser.setcallback(cb_type, func, arg)
else:
! if cb_type <> CD.ATIME:
self.parser.setcallback(cb_type, func, arg)
--- 128,135 ----
start, end = self.list[self.listindex]
if type(end) == type(0):
! if cb_type != CD.PNUM:
self.parser.setcallback(cb_type, func, arg)
else:
! if cb_type != CD.ATIME:
self.parser.setcallback(cb_type, func, arg)
***************
*** 141,148 ****
start, end = self.list[self.listindex]
if type(end) == type(0):
! if cb_type <> CD.PNUM:
self.parser.removecallback(cb_type)
else:
! if cb_type <> CD.ATIME:
self.parser.removecallback(cb_type)
--- 141,148 ----
start, end = self.list[self.listindex]
if type(end) == type(0):
! if cb_type != CD.PNUM:
self.parser.removecallback(cb_type)
else:
! if cb_type != CD.ATIME:
self.parser.removecallback(cb_type)
Index: torgb.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/plat-irix5/torgb.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** torgb.py 2000/08/18 14:57:26 1.5
--- torgb.py 2000/12/12 23:11:42 1.6
***************
*** 61,65 ****
finally:
for temp in temps[:]:
! if temp <> ret:
try:
os.unlink(temp)
--- 61,65 ----
finally:
for temp in temps[:]:
! if temp != ret:
try:
os.unlink(temp)
***************
*** 84,93 ****
type(msg[0]) == type(0) and type(msg[1]) == type(''):
msg = msg[1]
! if type(msg) <> type(''):
msg = `msg`
raise error, filename + ': ' + msg
if ftype == 'rgb':
return fname
! if ftype == None or not table.has_key(ftype):
raise error, \
filename + ': unsupported image file type ' + `ftype`
--- 84,93 ----
type(msg[0]) == type(0) and type(msg[1]) == type(''):
msg = msg[1]
! if type(msg) is not type(''):
msg = `msg`
raise error, filename + ': ' + msg
if ftype == 'rgb':
return fname
! if ftype is None or not table.has_key(ftype):
raise error, \
filename + ': unsupported image file type ' + `ftype`
- Previous message: [Python-checkins] CVS: python/dist/src/Lib/lib-old Para.py,1.6,1.7 cmp.py,1.1,1.2 cmpcache.py,1.1,1.2 dircmp.py,1.1,1.2 fmt.py,1.5,1.6 grep.py,1.7,1.8 packmail.py,1.7,1.8 tb.py,1.7,1.8 zmod.py,1.1,1.2
- Next message: [Python-checkins] CVS: python/dist/src/Lib/plat-irix6 FL.py,1.1,1.2 cdplayer.py,1.3,1.4 flp.py,1.6,1.7 jpeg.py,1.3,1.4 panel.py,1.2,1.3 panelparser.py,1.1,1.2 readcd.py,1.2,1.3 torgb.py,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]