Mailman 3 October 2003 - Python-checkins

python/dist/src/Tools/faqwiz faqconf.py, 1.24, 1.25
by loewis＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Tools/faqwiz In directory sc8-pr-cvs1:/tmp/cvs-serv25282/Tools/faqwiz Modified Files: faqconf.py Log Message: Patch #812378: Normalize white space. Index: faqconf.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/faqwiz/faqconf.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** faqconf.py 31 Mar 2000 00:55:54 -0000 1.24 --- faqconf.py 24 Oct 2003 20:09:23 -0000 1.25 *************** *** 16,33 **** # Parameters you definitely want to change ! SHORTNAME = "Generic" # FAQ name with "FAQ" omitted ! PASSWORD = "" # Password for editing ! OWNERNAME = "FAQ owner" # Name for feedback ! OWNEREMAIL = "nobody(a)anywhere.org" # Email for feedback ! HOMEURL = "http://www.python.org" # Related home page ! HOMENAME = "Python home" # Name of related home page ! RCSBINDIR = "/usr/local/bin/" # Directory containing RCS commands ! # (must end in a slash) # Parameters you can normally leave alone ! MAXHITS = 10 # Max #hits to be shown directly ! COOKIE_LIFETIME = 28*24*3600 # Cookie expiration in seconds ! # (28*24*3600 = 28 days = 4 weeks) PROCESS_PREFORMAT = 1 # toggle whether preformatted text # will replace urls and emails with --- 16,33 ---- # Parameters you definitely want to change ! SHORTNAME = "Generic" # FAQ name with "FAQ" omitted ! PASSWORD = "" # Password for editing ! OWNERNAME = "FAQ owner" # Name for feedback ! OWNEREMAIL = "nobody(a)anywhere.org" # Email for feedback ! HOMEURL = "http://www.python.org" # Related home page ! HOMENAME = "Python home" # Name of related home page ! RCSBINDIR = "/usr/local/bin/" # Directory containing RCS commands ! # (must end in a slash) # Parameters you can normally leave alone ! MAXHITS = 10 # Max #hits to be shown directly ! COOKIE_LIFETIME = 28*24*3600 # Cookie expiration in seconds ! # (28*24*3600 = 28 days = 4 weeks) PROCESS_PREFORMAT = 1 # toggle whether preformatted text # will replace urls and emails with *************** *** 37,44 **** # (may contain HTML, e.g. <IMG>); and corresponding ! MARK_VERY_RECENT = " **" # Changed very recently ! MARK_RECENT = " *" # Changed recently ! DT_VERY_RECENT = 24*3600 # 24 hours ! DT_RECENT = 7*24*3600 # 7 days EXPLAIN_MARKS = """ --- 37,44 ---- # (may contain HTML, e.g. <IMG>); and corresponding ! MARK_VERY_RECENT = " **" # Changed very recently ! MARK_RECENT = " *" # Changed recently ! DT_VERY_RECENT = 24*3600 # 24 hours ! DT_RECENT = 7*24*3600 # 7 days EXPLAIN_MARKS = """ *************** *** 50,54 **** # Version -- don't change unless you edit faqwiz.py ! WIZVERSION = "1.0.4" # FAQ Wizard version import os, sys --- 50,54 ---- # Version -- don't change unless you edit faqwiz.py ! WIZVERSION = "1.0.4" # FAQ Wizard version import os, sys *************** *** 56,65 **** # On NT we'll probably be running python from a batch file, # so sys.argv[0] is not helpful ! FAQCGI = 'faq.bat' # Relative URL of the FAQ cgi script # LOGNAME is not typically set on NT os.environ[ 'LOGNAME' ] = "FAQWizard" else: # This parameter is normally overwritten with a dynamic value ! FAQCGI = 'faqw.py' # Relative URL of the FAQ cgi script FAQCGI = os.path.basename(sys.argv[0]) or FAQCGI del os, sys --- 56,65 ---- # On NT we'll probably be running python from a batch file, # so sys.argv[0] is not helpful ! FAQCGI = 'faq.bat' # Relative URL of the FAQ cgi script # LOGNAME is not typically set on NT os.environ[ 'LOGNAME' ] = "FAQWizard" else: # This parameter is normally overwritten with a dynamic value ! FAQCGI = 'faqw.py' # Relative URL of the FAQ cgi script FAQCGI = os.path.basename(sys.argv[0]) or FAQCGI del os, sys *************** *** 85,90 **** # Calculated parameter names ! COOKIE_NAME = SHORTNAME + "-FAQ-Wizard" # Name used for Netscape cookie ! FAQNAME = SHORTNAME + " FAQ" # Name of the FAQ # ---------------------------------------------------------------------- --- 85,90 ---- # Calculated parameter names ! COOKIE_NAME = SHORTNAME + "-FAQ-Wizard" # Name used for Netscape cookie ! FAQNAME = SHORTNAME + " FAQ" # Name of the FAQ # ---------------------------------------------------------------------- *************** *** 176,195 **** <INPUT TYPE=radio NAME=querytype VALUE=simple CHECKED> Simple string ! / <INPUT TYPE=radio NAME=querytype VALUE=regex> Regular expression ! /<BR> <INPUT TYPE=radio NAME=querytype VALUE=anykeywords> Keywords (any) ! / <INPUT TYPE=radio NAME=querytype VALUE=allkeywords> Keywords (all) ! <BR> <INPUT TYPE=radio NAME=casefold VALUE=yes CHECKED> Fold case ! / <INPUT TYPE=radio NAME=casefold VALUE=no> Case sensitive ! <BR> <INPUT TYPE=hidden NAME=req VALUE=search> </FORM> --- 176,195 ---- <INPUT TYPE=radio NAME=querytype VALUE=simple CHECKED> Simple string ! / <INPUT TYPE=radio NAME=querytype VALUE=regex> Regular expression ! /<BR> <INPUT TYPE=radio NAME=querytype VALUE=anykeywords> Keywords (any) ! / <INPUT TYPE=radio NAME=querytype VALUE=allkeywords> Keywords (all) ! <BR> <INPUT TYPE=radio NAME=casefold VALUE=yes CHECKED> Fold case ! / <INPUT TYPE=radio NAME=casefold VALUE=no> Case sensitive ! <BR> <INPUT TYPE=hidden NAME=req VALUE=search> </FORM> *************** *** 363,374 **** <TABLE FRAME=none COLS=2> <TR> ! <TD>Name: ! <TD><INPUT TYPE=text SIZE=40 NAME=author VALUE="%(author)s"> <TR> ! <TD>Email: ! <TD><INPUT TYPE=text SIZE=40 NAME=email VALUE="%(email)s"> <TR> ! <TD>Password: ! <TD><INPUT TYPE=password SIZE=20 NAME=password VALUE="%(password)s"> </TABLE> --- 363,374 ---- <TABLE FRAME=none COLS=2> <TR> ! <TD>Name: ! <TD><INPUT TYPE=text SIZE=40 NAME=author VALUE="%(author)s"> <TR> ! <TD>Email: ! <TD><INPUT TYPE=text SIZE=40 NAME=email VALUE="%(email)s"> <TR> ! <TD>Password: ! <TD><INPUT TYPE=password SIZE=20 NAME=password VALUE="%(password)s"> </TABLE>

1 0

python/dist/src/Tools/versioncheck _checkversion.py, 1.1, 1.2 checkversions.py, 1.3, 1.4 pyversioncheck.py, 1.4, 1.5
by loewis＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Tools/versioncheck In directory sc8-pr-cvs1:/tmp/cvs-serv25282/Tools/versioncheck Modified Files: _checkversion.py checkversions.py pyversioncheck.py Log Message: Patch #812378: Normalize white space. Index: _checkversion.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/versioncheck/_checkversion.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** _checkversion.py 23 Dec 1997 18:43:51 -0000 1.1 --- _checkversion.py 24 Oct 2003 20:09:23 -0000 1.2 *************** *** 10,16 **** try: ! _myverbose=VERBOSE except NameError: ! _myverbose=1 ! pyversioncheck.versioncheck(_PACKAGE, _URL, _VERSION, verbose=_myverbose) --- 10,16 ---- try: ! _myverbose=VERBOSE except NameError: ! _myverbose=1 ! pyversioncheck.versioncheck(_PACKAGE, _URL, _VERSION, verbose=_myverbose) Index: checkversions.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/versioncheck/checkversions.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** checkversions.py 11 Sep 2002 20:36:01 -0000 1.3 --- checkversions.py 24 Oct 2003 20:09:23 -0000 1.4 *************** *** 24,54 **** def check1dir(dummy, dir, files): ! if CHECKNAME in files: ! fullname = os.path.join(dir, CHECKNAME) ! try: ! execfile(fullname) ! except: ! print '** Exception in', fullname ! def walk1tree(tree): ! os.path.walk(tree, check1dir, None) ! def main(): ! global VERBOSE ! try: ! options, arguments = getopt.getopt(sys.argv[1:], 'v:') ! except getopt.error: ! print USAGE ! sys.exit(1) ! for o, a in options: ! if o == '-v': ! VERBOSE = int(a) ! if not arguments: ! arguments = [sys.prefix] ! for dir in arguments: ! walk1tree(dir) ! if __name__ == '__main__': ! main() ! ! --- 24,54 ---- def check1dir(dummy, dir, files): ! if CHECKNAME in files: ! fullname = os.path.join(dir, CHECKNAME) ! try: ! execfile(fullname) ! except: ! print '** Exception in', fullname ! def walk1tree(tree): ! os.path.walk(tree, check1dir, None) ! def main(): ! global VERBOSE ! try: ! options, arguments = getopt.getopt(sys.argv[1:], 'v:') ! except getopt.error: ! print USAGE ! sys.exit(1) ! for o, a in options: ! if o == '-v': ! VERBOSE = int(a) ! if not arguments: ! arguments = [sys.prefix] ! for dir in arguments: ! walk1tree(dir) ! if __name__ == '__main__': ! main() ! ! Index: pyversioncheck.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/versioncheck/pyversioncheck.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pyversioncheck.py 11 Sep 2002 20:36:01 -0000 1.4 --- pyversioncheck.py 24 Oct 2003 20:09:23 -0000 1.5 *************** *** 6,13 **** # Verbose options ! VERBOSE_SILENT=0 # Single-line reports per package ! VERBOSE_NORMAL=1 # Single-line reports per package, more info if outdated ! VERBOSE_EACHFILE=2 # Report on each URL checked ! VERBOSE_CHECKALL=3 # Check each URL for each package # Test directory --- 6,13 ---- # Verbose options ! VERBOSE_SILENT=0 # Single-line reports per package ! VERBOSE_NORMAL=1 # Single-line reports per package, more info if outdated ! VERBOSE_EACHFILE=2 # Report on each URL checked ! VERBOSE_CHECKALL=3 # Check each URL for each package # Test directory *************** *** 97,100 **** if __name__ == '__main__': _test() ! ! --- 97,99 ---- if __name__ == '__main__': _test() !

1 0

[Python-checkins] python/dist/src/Tools/pynche PyncheWidget.py, 2.27, 2.28 StripViewer.py, 2.15, 2.16
by loewis＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Tools/pynche In directory sc8-pr-cvs1:/tmp/cvs-serv25282/Tools/pynche Modified Files: PyncheWidget.py StripViewer.py Log Message: Patch #812378: Normalize white space. Index: PyncheWidget.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/pynche/PyncheWidget.py,v retrieving revision 2.27 retrieving revision 2.28 diff -C2 -d -r2.27 -r2.28 *** PyncheWidget.py 10 Jul 2001 21:43:43 -0000 2.27 --- PyncheWidget.py 24 Oct 2003 20:09:23 -0000 2.28 *************** *** 76,80 **** # helpmenu = Menu(menubar, name='help', tearoff=0) ! helpmenu.add_command(label='About Pynche...', command=self.__popup_about, underline=0) --- 76,80 ---- # helpmenu = Menu(menubar, name='help', tearoff=0) ! helpmenu.add_command(label='About Pynche...', command=self.__popup_about, underline=0) Index: StripViewer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/pynche/StripViewer.py,v retrieving revision 2.15 retrieving revision 2.16 diff -C2 -d -r2.15 -r2.16 *** StripViewer.py 10 Jul 2001 21:44:24 -0000 2.15 --- StripViewer.py 24 Oct 2003 20:09:23 -0000 2.16 *************** *** 36,40 **** foreach c $colors { $canv itemconfigure $i -fill $c -outline $c ! incr i } } --- 36,40 ---- foreach c $colors { $canv itemconfigure $i -fill $c -outline $c ! incr i } } *************** *** 55,61 **** seq = [] while numchips > 0: ! seq.append(int(start)) ! start = start + step ! numchips = numchips - 1 return seq --- 55,61 ---- seq = [] while numchips > 0: ! seq.append(int(start)) ! start = start + step ! numchips = numchips - 1 return seq *************** *** 100,133 **** def __init__(self, canvas, x): ! self._canvas = canvas ! self.__arrow, self.__text = self._create(x) ! self.move_to(x) def _create(self, x): ! arrow = self._canvas.create_line( ! x, self._ARROWHEIGHT + self._YOFFSET, ! x, self._YOFFSET, ! x + self._ARROWWIDTH, self._YOFFSET, ! arrow='first', ! width=3.0, ! tags=self._TAG) ! text = self._canvas.create_text( ! x + self._ARROWWIDTH + 13, ! self._ARROWHEIGHT - self._TEXTYOFFSET, ! tags=self._TAG, ! text='128') ! return arrow, text def _x(self): ! coords = self._canvas.coords(self._TAG) ! assert coords ! return coords[0] def move_to(self, x): ! deltax = x - self._x() ! self._canvas.move(self._TAG, deltax, 0) def set_text(self, text): ! self._canvas.itemconfigure(self.__text, text=text) --- 100,133 ---- def __init__(self, canvas, x): ! self._canvas = canvas ! self.__arrow, self.__text = self._create(x) ! self.move_to(x) def _create(self, x): ! arrow = self._canvas.create_line( ! x, self._ARROWHEIGHT + self._YOFFSET, ! x, self._YOFFSET, ! x + self._ARROWWIDTH, self._YOFFSET, ! arrow='first', ! width=3.0, ! tags=self._TAG) ! text = self._canvas.create_text( ! x + self._ARROWWIDTH + 13, ! self._ARROWHEIGHT - self._TEXTYOFFSET, ! tags=self._TAG, ! text='128') ! return arrow, text def _x(self): ! coords = self._canvas.coords(self._TAG) ! assert coords ! return coords[0] def move_to(self, x): ! deltax = x - self._x() ! self._canvas.move(self._TAG, deltax, 0) def set_text(self, text): ! self._canvas.itemconfigure(self.__text, text=text) *************** *** 136,158 **** def _create(self, x): ! arrow = self._canvas.create_line( ! x, self._YOFFSET, ! x + self._ARROWWIDTH, self._YOFFSET, ! x + self._ARROWWIDTH, self._ARROWHEIGHT + self._YOFFSET, ! arrow='last', ! width=3.0, ! tags=self._TAG) ! text = self._canvas.create_text( ! x - self._ARROWWIDTH + 15, # BAW: kludge ! self._ARROWHEIGHT - self._TEXTYOFFSET, justify=RIGHT, ! text='128', ! tags=self._TAG) ! return arrow, text def _x(self): ! coords = self._canvas.bbox(self._TAG) ! assert coords ! return coords[2] - 6 # BAW: kludge --- 136,158 ---- def _create(self, x): ! arrow = self._canvas.create_line( ! x, self._YOFFSET, ! x + self._ARROWWIDTH, self._YOFFSET, ! x + self._ARROWWIDTH, self._ARROWHEIGHT + self._YOFFSET, ! arrow='last', ! width=3.0, ! tags=self._TAG) ! text = self._canvas.create_text( ! x - self._ARROWWIDTH + 15, # BAW: kludge ! self._ARROWHEIGHT - self._TEXTYOFFSET, justify=RIGHT, ! text='128', ! tags=self._TAG) ! return arrow, text def _x(self): ! coords = self._canvas.bbox(self._TAG) ! assert coords ! return coords[2] - 6 # BAW: kludge *************** *** 174,182 **** hexvar = None): # instance variables ! self.__generator = generator ! self.__axis = axis self.__numchips = numchips ! assert self.__axis in (0, 1, 2) ! self.__uwd = uwdvar self.__hexp = hexvar # the last chip selected --- 174,182 ---- hexvar = None): # instance variables ! self.__generator = generator ! self.__axis = axis self.__numchips = numchips ! assert self.__axis in (0, 1, 2) ! self.__uwd = uwdvar self.__hexp = hexvar # the last chip selected *************** *** 184,192 **** self.__sb = switchboard ! canvaswidth = numchips * (chipwidth + 1) ! canvasheight = chipheight + 43 # BAW: Kludge ! # create the canvas and pack it ! canvas = self.__canvas = Canvas(master, width=canvaswidth, height=canvasheight, --- 184,192 ---- self.__sb = switchboard ! canvaswidth = numchips * (chipwidth + 1) ! canvasheight = chipheight + 43 # BAW: Kludge ! # create the canvas and pack it ! canvas = self.__canvas = Canvas(master, width=canvaswidth, height=canvasheight, *************** *** 195,239 **** ) ! canvas.pack() ! canvas.bind('<ButtonPress-1>', self.__select_chip) ! canvas.bind('<ButtonRelease-1>', self.__select_chip) ! canvas.bind('<B1-Motion>', self.__select_chip) ! # Load a proc into the Tcl interpreter. This is used in the ! # set_color() method to speed up setting the chip colors. ! canvas.tk.eval(TCLPROC) ! # create the color strip ! chips = self.__chips = [] ! x = 1 ! y = 30 ! tags = ('chip',) ! for c in range(self.__numchips): ! color = 'grey' ! canvas.create_rectangle( ! x, y, x+chipwidth, y+chipheight, ! fill=color, outline=color, ! tags=tags) ! x = x + chipwidth + 1 # for outline ! chips.append(color) ! # create the strip label ! self.__label = canvas.create_text( ! 3, y + chipheight + 8, ! text=label, ! anchor=W) ! # create the arrow and text item ! chipx = self.__arrow_x(0) ! self.__leftarrow = LeftArrow(canvas, chipx) ! chipx = self.__arrow_x(len(chips) - 1) ! self.__rightarrow = RightArrow(canvas, chipx) def __arrow_x(self, chipnum): ! coords = self.__canvas.coords(chipnum+1) ! assert coords ! x0, y0, x1, y1 = coords ! return (x1 + x0) / 2.0 # Invoked when one of the chips is clicked. This should just tell the --- 195,239 ---- ) ! canvas.pack() ! canvas.bind('<ButtonPress-1>', self.__select_chip) ! canvas.bind('<ButtonRelease-1>', self.__select_chip) ! canvas.bind('<B1-Motion>', self.__select_chip) ! # Load a proc into the Tcl interpreter. This is used in the ! # set_color() method to speed up setting the chip colors. ! canvas.tk.eval(TCLPROC) ! # create the color strip ! chips = self.__chips = [] ! x = 1 ! y = 30 ! tags = ('chip',) ! for c in range(self.__numchips): ! color = 'grey' ! canvas.create_rectangle( ! x, y, x+chipwidth, y+chipheight, ! fill=color, outline=color, ! tags=tags) ! x = x + chipwidth + 1 # for outline ! chips.append(color) ! # create the strip label ! self.__label = canvas.create_text( ! 3, y + chipheight + 8, ! text=label, ! anchor=W) ! # create the arrow and text item ! chipx = self.__arrow_x(0) ! self.__leftarrow = LeftArrow(canvas, chipx) ! chipx = self.__arrow_x(len(chips) - 1) ! self.__rightarrow = RightArrow(canvas, chipx) def __arrow_x(self, chipnum): ! coords = self.__canvas.coords(chipnum+1) ! assert coords ! x0, y0, x1, y1 = coords ! return (x1 + x0) / 2.0 # Invoked when one of the chips is clicked. This should just tell the *************** *** 261,266 **** self.__canvas.itemconfigure(self.__lastchip, outline=color) self.__lastchip = chip ! # get the arrow's text ! coloraxis = rgbtuple[self.__axis] if self.__hexp.get(): # hex --- 261,266 ---- self.__canvas.itemconfigure(self.__lastchip, outline=color) self.__lastchip = chip ! # get the arrow's text ! coloraxis = rgbtuple[self.__axis] if self.__hexp.get(): # hex *************** *** 269,298 **** # decimal text = repr(coloraxis) ! # move the arrow, and set it's text ! if coloraxis <= 128: ! # use the left arrow ! self.__leftarrow.set_text(text) ! self.__leftarrow.move_to(self.__arrow_x(chip-1)) ! self.__rightarrow.move_to(-100) ! else: ! # use the right arrow ! self.__rightarrow.set_text(text) ! self.__rightarrow.move_to(self.__arrow_x(chip-1)) ! self.__leftarrow.move_to(-100) ! # and set the chip's outline brightness = ColorDB.triplet_to_brightness(rgbtuple) ! if brightness <= 128: ! outline = 'white' ! else: ! outline = 'black' ! self.__canvas.itemconfigure(chip, outline=outline) def update_yourself(self, red, green, blue): ! assert self.__generator ! i = 1 ! chip = 0 ! chips = self.__chips = [] ! tk = self.__canvas.tk # get the red, green, and blue components for all chips for t in self.__generator(self.__numchips, red, green, blue): --- 269,298 ---- # decimal text = repr(coloraxis) ! # move the arrow, and set it's text ! if coloraxis <= 128: ! # use the left arrow ! self.__leftarrow.set_text(text) ! self.__leftarrow.move_to(self.__arrow_x(chip-1)) ! self.__rightarrow.move_to(-100) ! else: ! # use the right arrow ! self.__rightarrow.set_text(text) ! self.__rightarrow.move_to(self.__arrow_x(chip-1)) ! self.__leftarrow.move_to(-100) ! # and set the chip's outline brightness = ColorDB.triplet_to_brightness(rgbtuple) ! if brightness <= 128: ! outline = 'white' ! else: ! outline = 'black' ! self.__canvas.itemconfigure(chip, outline=outline) def update_yourself(self, red, green, blue): ! assert self.__generator ! i = 1 ! chip = 0 ! chips = self.__chips = [] ! tk = self.__canvas.tk # get the red, green, and blue components for all chips for t in self.__generator(self.__numchips, red, green, blue):

1 0

python/dist/src/Tools/modulator EXAMPLE.py, 1.2, 1.3 ScrolledListbox.py, 1.1, 1.2
by loewis＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Tools/modulator In directory sc8-pr-cvs1:/tmp/cvs-serv25282/Tools/modulator Modified Files: EXAMPLE.py ScrolledListbox.py Log Message: Patch #812378: Normalize white space. Index: EXAMPLE.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/modulator/EXAMPLE.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EXAMPLE.py 16 May 1995 13:43:09 -0000 1.2 --- EXAMPLE.py 24 Oct 2003 20:09:23 -0000 1.3 *************** *** 35,39 **** o3.methodlist = ['method1', 'method2'] o3.funclist = ['new', 'tp_dealloc', 'tp_print', 'tp_getattr', 'tp_setattr', ! 'tp_compare', 'tp_repr', 'tp_hash'] o3.typelist = ['tp_as_sequence', 'structure'] --- 35,39 ---- o3.methodlist = ['method1', 'method2'] o3.funclist = ['new', 'tp_dealloc', 'tp_print', 'tp_getattr', 'tp_setattr', ! 'tp_compare', 'tp_repr', 'tp_hash'] o3.typelist = ['tp_as_sequence', 'structure'] Index: ScrolledListbox.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/modulator/ScrolledListbox.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScrolledListbox.py 2 Mar 1995 14:04:25 -0000 1.1 --- ScrolledListbox.py 24 Oct 2003 20:09:23 -0000 1.2 *************** *** 15,37 **** class ScrolledListbox(Listbox): ! def __init__(self, master=None, cnf={}): ! cnf = _cnfmerge(cnf) ! fcnf = {} ! vcnf = {'name': 'vbar', ! Pack: {'side': 'right', 'fill': 'y'},} ! for k in cnf.keys(): ! if type(k) == ClassType or k == 'name': ! fcnf[k] = cnf[k] ! del cnf[k] ! self.frame = Frame(master, fcnf) ! self.vbar = Scrollbar(self.frame, vcnf) ! cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'} ! cnf['name'] = 'list' ! Listbox.__init__(self, self.frame, cnf) ! self['yscrollcommand'] = (self.vbar, 'set') ! self.vbar['command'] = (self, 'yview') ! # Copy Pack methods of self.frame -- hack! ! for m in Pack.__dict__.keys(): ! if m[0] != '_' and m != 'config': ! setattr(self, m, getattr(self.frame, m)) --- 15,37 ---- class ScrolledListbox(Listbox): ! def __init__(self, master=None, cnf={}): ! cnf = _cnfmerge(cnf) ! fcnf = {} ! vcnf = {'name': 'vbar', ! Pack: {'side': 'right', 'fill': 'y'},} ! for k in cnf.keys(): ! if type(k) == ClassType or k == 'name': ! fcnf[k] = cnf[k] ! del cnf[k] ! self.frame = Frame(master, fcnf) ! self.vbar = Scrollbar(self.frame, vcnf) ! cnf[Pack] = {'side': 'left', 'fill': 'both', 'expand': 'yes'} ! cnf['name'] = 'list' ! Listbox.__init__(self, self.frame, cnf) ! self['yscrollcommand'] = (self.vbar, 'set') ! self.vbar['command'] = (self, 'yview') ! # Copy Pack methods of self.frame -- hack! ! for m in Pack.__dict__.keys(): ! if m[0] != '_' and m != 'config': ! setattr(self, m, getattr(self.frame, m))

1 0

python/dist/src/Python modsupport.c,2.68,2.69
by loewis＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1:/tmp/cvs-serv24423 Modified Files: modsupport.c Log Message: Patch #828384: Don't discard nested exception in AddObject. Index: modsupport.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/modsupport.c,v retrieving revision 2.68 retrieving revision 2.69 diff -C2 -d -r2.68 -r2.69 *** modsupport.c 21 Jun 2003 21:35:25 -0000 2.68 --- modsupport.c 24 Oct 2003 20:05:32 -0000 2.69 *************** *** 521,526 **** } if (!o) { ! PyErr_SetString(PyExc_TypeError, ! "PyModule_AddObject() needs non-NULL value"); return -1; } --- 521,527 ---- } if (!o) { ! if (!PyErr_Occurred()) ! PyErr_SetString(PyExc_TypeError, ! "PyModule_AddObject() needs non-NULL value"); return -1; }

1 0

distutils setup.cfg,1.3,1.4
by akuchling＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/distutils In directory sc8-pr-cvs1:/tmp/cvs-serv5420 Modified Files: setup.cfg Log Message: Updated file Index: setup.cfg =================================================================== RCS file: /cvsroot/python/distutils/setup.cfg,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** setup.cfg 30 Jun 2000 03:45:44 -0000 1.3 --- setup.cfg 24 Oct 2003 18:50:38 -0000 1.4 *************** *** 11,16 **** # basis, rather than in the config file for each module distribution.) # - # created 2000/05/31, Greg Ward - # # $Id$ # --- 11,14 ---- *************** *** 21,32 **** [bdist_rpm] release = 1 ! packager = Greg Ward <gward(a)python.net> doc_files = CHANGES.txt README.txt - USAGE.txt doc/ examples/ changelog = * Thu Jun 29 2000 Greg Ward <gward(a)python.net> 0.9 - Made myself the packager, since I can now create the RPM on my own --- 19,32 ---- [bdist_rpm] release = 1 ! packager = A.M. Kuchling <amk(a)amk.ca> doc_files = CHANGES.txt README.txt doc/ examples/ changelog = + * Fri Oct 24 2003 A.M. Kuchling <amk(a)amk.ca> 1.1 + - Updated for the Distutils 1.1 code base. + * Thu Jun 29 2000 Greg Ward <gward(a)python.net> 0.9 - Made myself the packager, since I can now create the RPM on my own

1 0

distutils/examples template_setup.py,1.2,1.3
by akuchling＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/distutils/examples In directory sc8-pr-cvs1:/tmp/cvs-serv5011 Modified Files: template_setup.py Log Message: Use current location for docs; modernize template a bit Index: template_setup.py =================================================================== RCS file: /cvsroot/python/distutils/examples/template_setup.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** template_setup.py 31 May 2000 02:29:52 -0000 1.2 --- template_setup.py 24 Oct 2003 18:48:58 -0000 1.3 *************** *** 1,7 **** #!/usr/bin/env python ! # Template for creating your own setup.py. See the USAGE file in ! # the Distutils source distribution for descriptions of all the ! # options shown below. Brief instructions on what to do: # - change XXX to the name of your module distribution; note that # this will be used to generate a filename, so keep it short and --- 1,9 ---- #!/usr/bin/env python ! # Template for creating your own setup.py. See the "Distributing ! # Python Modules" manual at http://www.python.org/doc/current/dist/ ! # for descriptions of all the options shown below. ! # ! # Brief instructions on what to do: # - change XXX to the name of your module distribution; note that # this will be used to generate a filename, so keep it short and *************** *** 28,36 **** name = "XXX", version = "", ! description = "", author = "", author_email = "", url = "", ! # Description of the modules and packages in the distribution packages = [''], --- 30,46 ---- name = "XXX", version = "", ! description = "XXX Single-line explanation of package", ! long_description = """XXX multi-paragraph explanation of package""", author = "", author_email = "", url = "", ! license = "XXX", ! classifiers = [ ! # Include appropriate classifiers from the output of ! # "setup.py register --list-classifiers" ! "XXX :: XXX", ! "XXX :: XXX", ! ], ! # Description of the modules and packages in the distribution packages = [''],

1 0

distutils/examples/sample3 setup.py,1.1,1.2
by akuchling＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/distutils/examples/sample3 In directory sc8-pr-cvs1:/tmp/cvs-serv3777 Modified Files: setup.py Log Message: Fix example Index: setup.py =================================================================== RCS file: /cvsroot/python/distutils/examples/sample3/setup.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setup.py 22 Apr 2000 02:45:02 -0000 1.1 --- setup.py 24 Oct 2003 18:43:28 -0000 1.2 *************** *** 11,15 **** def run (self): ! self.run_peer ('greet') build.run (self) --- 11,15 ---- def run (self): ! self.run_command ('greet') build.run (self)

1 0

python/dist/src setup.py,1.174,1.175
by akuchling＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1:/tmp/cvs-serv443 Modified Files: setup.py Log Message: [Patch #772077 from Tim Rice] Fix for compiling the readline module on UnixWare; fix goofy comment indent. 2.3 bugfix candidate Index: setup.py =================================================================== RCS file: /cvsroot/python/python/dist/src/setup.py,v retrieving revision 1.174 retrieving revision 1.175 diff -C2 -d -r1.174 -r1.175 *** setup.py 21 Oct 2003 15:41:15 -0000 1.174 --- setup.py 24 Oct 2003 18:26:26 -0000 1.175 *************** *** 279,284 **** inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) ! # OSF/1 has some stuff in /usr/ccs/lib (like -ldb) ! if platform == 'osf1': lib_dirs += ['/usr/ccs/lib'] --- 279,284 ---- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) ! # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) ! if platform in ['osf1', 'unixware7', 'openunix8']: lib_dirs += ['/usr/ccs/lib'] *************** *** 421,425 **** libraries=readline_libs) ) if platform not in ['mac']: ! # crypt module. if self.compiler.find_library_file(lib_dirs, 'crypt'): --- 421,425 ---- libraries=readline_libs) ) if platform not in ['mac']: ! # crypt module. if self.compiler.find_library_file(lib_dirs, 'crypt'):

1 0

distutils snapshot_setup.py,1.1,1.2
by akuchling＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/distutils In directory sc8-pr-cvs1:/tmp/cvs-serv32342 Modified Files: snapshot_setup.py Log Message: Add current maintainer; fix old option name Index: snapshot_setup.py =================================================================== RCS file: /cvsroot/python/distutils/snapshot_setup.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** snapshot_setup.py 8 Jun 2000 01:18:36 -0000 1.1 --- snapshot_setup.py 24 Oct 2003 18:23:31 -0000 1.2 *************** *** 16,21 **** author = "Greg Ward", author_email = "gward(a)python.net", url = "http://www.python.org/sigs/distutils-sig/", ! licence = "Python", packages = ['distutils', 'distutils.command'], --- 16,23 ---- author = "Greg Ward", author_email = "gward(a)python.net", + maintainer = "A.M. Kuchling", + maintainer_email = 'amk(a)amk.ca', url = "http://www.python.org/sigs/distutils-sig/", ! license = "Python", packages = ['distutils', 'distutils.command'],

1 0