Mailman 3 April 2004 - Python-checkins

python/dist/src/Lib/test test_repr.py, 1.13.2.1, 1.13.2.2
by jhylton＠users.sourceforge.net 24 Apr '04

24 Apr '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14856 Modified Files: Tag: ast-branch test_repr.py Log Message: The repr() for lambda is different. Index: test_repr.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_repr.py,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -C2 -d -r1.13.2.1 -r1.13.2.2 *** test_repr.py 28 Apr 2003 17:28:14 -0000 1.13.2.1 --- test_repr.py 24 Apr 2004 03:44:00 -0000 1.13.2.2 *************** *** 106,110 **** def test_lambda(self): self.failUnless(repr(lambda x: x).startswith( ! "<function <lambda")) # XXX anonymous functions? see func_repr --- 106,110 ---- def test_lambda(self): self.failUnless(repr(lambda x: x).startswith( ! "<function lambda")) # XXX anonymous functions? see func_repr

1 0

python/dist/src/Python symtable.c, 2.10.8.27, 2.10.8.28
by jhylton＠users.sourceforge.net 24 Apr '04

24 Apr '04

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14786 Modified Files: Tag: ast-branch symtable.c Log Message: Issue warnings test by test_global.py. Index: symtable.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/symtable.c,v retrieving revision 2.10.8.27 retrieving revision 2.10.8.28 diff -C2 -d -r2.10.8.27 -r2.10.8.28 *** symtable.c 23 Apr 2004 18:32:59 -0000 2.10.8.27 --- symtable.c 24 Apr 2004 03:43:08 -0000 2.10.8.28 *************** *** 6,9 **** --- 6,16 ---- #include "structmember.h" + /* two error strings used for warnings */ + #define GLOBAL_AFTER_ASSIGN \ + "name '%.400s' is assigned to before global declaration" + + #define GLOBAL_AFTER_USE \ + "name '%.400s' is used prior to global declaration" + PySTEntryObject * PySTEntry_New(struct symtable *st, identifier name, block_ty block, *************** *** 144,147 **** --- 151,155 ---- static int symtable_analyze(struct symtable *st); + static int symtable_warn(struct symtable *st, char *msg); static int symtable_enter_block(struct symtable *st, identifier name, block_ty block, void *ast, int lineno); *************** *** 596,599 **** --- 604,622 ---- + static int + symtable_warn(struct symtable *st, char *msg) + { + if (PyErr_WarnExplicit(PyExc_SyntaxWarning, msg, st->st_filename, + st->st_cur->ste_lineno, NULL, NULL) < 0) { + if (PyErr_ExceptionMatches(PyExc_SyntaxWarning)) { + PyErr_SetString(PyExc_SyntaxError, msg); + PyErr_SyntaxLocation(st->st_filename, + st->st_cur->ste_lineno); + } + return 0; + } + return 1; + } + /* symtable_enter_block() gets a reference via PySTEntry_New(). This reference is released when the block is exited, via the DECREF *************** *** 645,648 **** --- 668,682 ---- static int + symtable_lookup(struct symtable *st, PyObject *name) + { + PyObject *o; + + o = PyDict_GetItem(st->st_cur->ste_symbols, name); + if (!o) + return 0; + return PyInt_AsLong(o); + } + + static int symtable_add_def(struct symtable *st, PyObject *name, int flag) { *************** *** 651,656 **** int val; - /* XXX must always be called with mangled names. */ - dict = st->st_cur->ste_symbols; if ((o = PyDict_GetItem(dict, name))) { --- 685,688 ---- *************** *** 829,836 **** int i; asdl_seq *seq = s->v.Global.names; ! for (i = 0; i < asdl_seq_LEN(seq); i++) ! if (!symtable_add_def(st, asdl_seq_GET(seq, i), ! DEF_GLOBAL)) return 0; break; --- 861,887 ---- int i; asdl_seq *seq = s->v.Global.names; ! for (i = 0; i < asdl_seq_LEN(seq); i++) { ! identifier name = asdl_seq_GET(seq, i); ! char *c_name = PyString_AS_STRING(name); ! int cur = symtable_lookup(st, name); ! if (cur < 0) ! return 0; ! if (cur & (DEF_LOCAL | USE)) { ! char buf[1000]; ! if (cur & DEF_LOCAL) ! PyOS_snprintf(buf, sizeof(buf), ! GLOBAL_AFTER_ASSIGN, ! c_name); ! else ! PyOS_snprintf(buf, sizeof(buf), ! GLOBAL_AFTER_USE, ! c_name); ! symtable_warn(st, buf); return 0; + } + if (!symtable_add_def(st, name, DEF_GLOBAL)) + return 0; + + } break;

1 0

China World Trade Corp making major breakthroughs
by Brittany Heard 24 Apr '04

24 Apr '04

1 0

python/dist/src/Lib/idlelib CodeContext.py, 1.1, 1.2 config-extensions.def, 1.13, 1.14 help.txt, 1.11, 1.12
by kbk＠users.sourceforge.net 24 Apr '04

24 Apr '04

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9339 Modified Files: CodeContext.py config-extensions.def help.txt Log Message: 1. Add an Options menu entry: Code Context 2. Add a <<toggle-code-context>> envent to the [CodeContext] section of config-extensions.def and also a default-on variable, set to 0. 3. Update the help file to include Code Context. M CodeContext.py M config-extensions.def M help.txt Index: CodeContext.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/CodeContext.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CodeContext.py 21 Apr 2004 20:06:19 -0000 1.1 --- CodeContext.py 24 Apr 2004 03:08:13 -0000 1.2 *************** *** 14,18 **** from configHandler import idleConf from PyShell import PyShell - from string import whitespace import re --- 14,17 ---- *************** *** 21,31 **** "try", "while")]) INFINITY = 1 << 30 ! UPDATEINTERVAL = 100 #ms ! FONTUPDATEINTERVAL = 1000 #ms getspacesfirstword = lambda s, c=re.compile(r"^(\s*)(\w*)"): c.match(s).groups() class CodeContext: ! menudefs = [] numlines = idleConf.GetOption("extensions", "CodeContext", "numlines", type="int", default=3) --- 20,31 ---- "try", "while")]) INFINITY = 1 << 30 ! UPDATEINTERVAL = 100 # millisec ! FONTUPDATEINTERVAL = 1000 # millisec getspacesfirstword = lambda s, c=re.compile(r"^(\s*)(\w*)"): c.match(s).groups() class CodeContext: ! menudefs = [('options', [('!Code Conte_xt', '<<toggle-code-context>>')])] ! numlines = idleConf.GetOption("extensions", "CodeContext", "numlines", type="int", default=3) *************** *** 34,37 **** --- 34,39 ---- fgcolor = idleConf.GetOption("extensions", "CodeContext", "fgcolor", type="str", default="Black") + default_on = idleConf.GetOption("extensions", "CodeContext", + "default_on", type="int", default=0) def __init__(self, editwin): if isinstance(editwin, PyShell): *************** *** 40,60 **** self.text = editwin.text self.textfont = self.text["font"] ! self.label = Tkinter.Label(self.editwin.top, ! text="\n" * (self.numlines - 1), ! anchor="w", justify="left", ! font=self.textfont, ! bg=self.bgcolor, fg=self.fgcolor, ! relief="sunken", ! width=1, # Don't request more than we get ! ) ! self.label.pack(side="top", fill="x", expand=0, ! after=self.editwin.status_bar) # Dummy line, which starts the "block" of the whole document: self.info = list(self.interesting_lines(1)) self.lastfirstline = 1 # Start two update cycles, one for context lines, one for font changes. self.text.after(UPDATEINTERVAL, self.timer_event) self.text.after(FONTUPDATEINTERVAL, self.font_timer_event) def get_line_info(self, linenum): """Get the line indent value, text, and any block start keyword --- 42,72 ---- self.text = editwin.text self.textfont = self.text["font"] ! self.label = None # Dummy line, which starts the "block" of the whole document: self.info = list(self.interesting_lines(1)) self.lastfirstline = 1 + if self.default_on: + self.toggle_code_context_event() + self.editwin.setvar('<<toggle-code-context>>', True) # Start two update cycles, one for context lines, one for font changes. self.text.after(UPDATEINTERVAL, self.timer_event) self.text.after(FONTUPDATEINTERVAL, self.font_timer_event) + def toggle_code_context_event(self, event=None): + if not self.label: + self.label = Tkinter.Label(self.editwin.top, + text="\n" * (self.numlines - 1), + anchor="w", justify="left", + font=self.textfont, + bg=self.bgcolor, fg=self.fgcolor, + relief="sunken", + width=1, # Don't request more than we get + ) + self.label.pack(side="top", fill="x", expand=0, + after=self.editwin.status_bar) + else: + self.label.destroy() + self.label = None + def get_line_info(self, linenum): """Get the line indent value, text, and any block start keyword *************** *** 108,112 **** if self.info[-1][0] == line_index: break - # Add the block starting line info to tmpstack tmpstack.append((line_index, text)) while tmpstack: --- 120,123 ---- *************** *** 117,126 **** def timer_event(self): ! self.update_label() self.text.after(UPDATEINTERVAL, self.timer_event) def font_timer_event(self): newtextfont = self.text["font"] ! if newtextfont != self.textfont: self.textfont = newtextfont self.label["font"] = self.textfont --- 128,138 ---- def timer_event(self): ! if self.label: ! self.update_label() self.text.after(UPDATEINTERVAL, self.timer_event) def font_timer_event(self): newtextfont = self.text["font"] ! if self.label and newtextfont != self.textfont: self.textfont = newtextfont self.label["font"] = self.textfont Index: config-extensions.def =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/config-extensions.def,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** config-extensions.def 21 Apr 2004 20:06:26 -0000 1.13 --- config-extensions.def 24 Apr 2004 03:08:13 -0000 1.14 *************** *** 4,14 **** # Each extension must have at least one section, named after the extension # module. This section must contain an 'enable' item (=1 to enable the ! # extension, =0 to disable it) and also contain any other general ! # configuration items for the extension. Each extension may also define up to ! # two optional sections named ExtensionName_bindings and ! # ExtensionName_cfgBindings. If present, ExtensionName_bindings defines virtual ! # event bindings for the extension that are not sensibly re-configurable. If ! # present, ExtensionName_cfgBindings defines virtual event bindings for the ! # extension that may be sensibly re-configured. # Currently it is necessary to manually modify this file to change extension --- 4,15 ---- # Each extension must have at least one section, named after the extension # module. This section must contain an 'enable' item (=1 to enable the ! # extension, =0 to disable it) and also contain any other general configuration ! # items for the extension. Each extension must define at least one section ! # named ExtensionName_bindings or ExtensionName_cfgBindings. If present, ! # ExtensionName_bindings defines virtual event bindings for the extension that ! # are not user re-configurable. If present, ExtensionName_cfgBindings ! # defines virtual event bindings for the extension that may be sensibly ! # re-configured. If there are no keybindings for a menus' virtual events, ! # include lines like <<toggle-code-context>>= (See [CodeContext], below.) # Currently it is necessary to manually modify this file to change extension *************** *** 66,69 **** --- 67,73 ---- enable=1 numlines=3 + default_on=0 bgcolor=LightGray fgcolor=Black + [CodeContext_bindings] + toggle-code-context= Index: help.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/help.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** help.txt 16 Mar 2004 03:36:41 -0000 1.11 --- help.txt 24 Apr 2004 03:08:13 -0000 1.12 *************** *** 89,95 **** Souces can be specified. --- ! Revert to Default Settings -- Restore original settings. Not ! currently implemented - simply delete ! your .idlerc file. Windows Menu: --- 89,95 ---- Souces can be specified. --- ! Code Context -- Open a pane at the top of the edit window which ! shows the block context of the section of code ! which is scrolling off the top or the window. Windows Menu:

1 0

python/dist/src/Python newcompile.c, 1.1.2.98, 1.1.2.99
by jhylton＠users.sourceforge.net 24 Apr '04

24 Apr '04

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8572 Modified Files: Tag: ast-branch newcompile.c Log Message: Report syntax errors tested by test_generators. Index: newcompile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/newcompile.c,v retrieving revision 1.1.2.98 retrieving revision 1.1.2.99 diff -C2 -d -r1.1.2.98 -r1.1.2.99 *** newcompile.c 23 Apr 2004 18:35:13 -0000 1.1.2.98 --- newcompile.c 24 Apr 2004 03:01:54 -0000 1.1.2.99 *************** *** 1833,1838 **** if (c->c_nestlevel <= 1) return compiler_error(c, "'return' outside function"); ! if (s->v.Return.value) ! VISIT(c, expr, s->v.Return.value) else ADDOP_O(c, LOAD_CONST, Py_None, consts); --- 1833,1843 ---- if (c->c_nestlevel <= 1) return compiler_error(c, "'return' outside function"); ! if (s->v.Return.value) { ! if (c->u->u_ste->ste_generator) { ! return compiler_error(c, ! "'return' with argument inside generator"); ! } ! VISIT(c, expr, s->v.Return.value); ! } else ADDOP_O(c, LOAD_CONST, Py_None, consts); *************** *** 1842,1845 **** --- 1847,1856 ---- if (c->c_nestlevel <= 1) return compiler_error(c, "'yield' outside function"); + for (i = 0; i < c->u->u_nfblocks; i++) { + if (c->u->u_fblock[i].fb_type == FINALLY_TRY) + return compiler_error( + c, "'yield' not allowed in a 'try' " + "block with a 'finally' clause"); + } VISIT(c, expr, s->v.Yield.value); ADDOP(c, YIELD_VALUE);

1 0

python/dist/src/Lib/idlelib Bindings.py, 1.19, 1.20 EditorWindow.py, 1.57, 1.58 extend.txt, 1.4, 1.5
by kbk＠users.sourceforge.net 24 Apr '04

24 Apr '04

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8492 Modified Files: Bindings.py EditorWindow.py extend.txt Log Message: 1. Polish variables in EditorWindow extension loading and Tkinter variable code. 2. Add exception handling to EditorWindow Tkinter variable setvar() and getvar() fcns. 3. EditorWindow: remove some unneeded comments. 4. Add a separator to the Options menu 5. extend.txt: describe how to create a menu entry which has no keybinding. M Bindings.py M EditorWindow.py M extend.txt Index: Bindings.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/Bindings.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Bindings.py 12 Jun 2003 04:03:48 -0000 1.19 --- Bindings.py 24 Apr 2004 03:01:48 -0000 1.20 *************** *** 71,74 **** --- 71,75 ---- ('options', [ ('_Configure IDLE...', '<<open-config-dialog>>'), + None, ]), ('help', [ Index: EditorWindow.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/EditorWindow.py,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** EditorWindow.py 11 Apr 2004 03:16:07 -0000 1.57 --- EditorWindow.py 24 Apr 2004 03:01:48 -0000 1.58 *************** *** 47,51 **** from MultiStatusBar import MultiStatusBar - vars = {} help_url = None --- 47,50 ---- *************** *** 79,86 **** self.top = top = self.Toplevel(root, menu=self.menubar) if flist: ! self.vars = flist.vars #self.top.instance_dict makes flist.inversedict avalable to #configDialog.py so it can access all EditorWindow instaces self.top.instance_dict=flist.inversedict self.recent_files_path=os.path.join(idleConf.GetUserCfgDir(), 'recent-files.lst') --- 78,88 ---- self.top = top = self.Toplevel(root, menu=self.menubar) if flist: ! self.tkinter_vars = flist.vars #self.top.instance_dict makes flist.inversedict avalable to #configDialog.py so it can access all EditorWindow instaces self.top.instance_dict=flist.inversedict + else: + self.tkinter_vars = {} # keys: Tkinter event names + # values: Tkinter variable instances self.recent_files_path=os.path.join(idleConf.GetUserCfgDir(), 'recent-files.lst') *************** *** 554,561 **** event=menuEventDict[menubarItem][itemName] if event: - #print 'accel was:',accel accel=get_accelerator(keydefs, event) menu.entryconfig(index,accelerator=accel) - #print 'accel now:',accel,'\n' def reset_help_menu_entries(self): --- 556,561 ---- *************** *** 712,716 **** def _close(self): - #print self.io.filename if self.io.filename: self.update_recent_files_list(new_file=self.io.filename) --- 712,715 ---- *************** *** 728,732 **** self.color.close(doh) # Cancel colorization self.text = None ! self.vars = None self.per.close(); self.per = None if not colorizing: --- 727,731 ---- self.color.close(doh) # Cancel colorization self.text = None ! self.tkinter_vars = None self.per.close(); self.per = None if not colorizing: *************** *** 785,817 **** text.event_add(event, *keylist) ! def fill_menus(self, defs=None, keydefs=None): """Add appropriate entries to the menus and submenus Menus that are absent or None in self.menudict are ignored. """ ! if defs is None: ! defs = self.Bindings.menudefs if keydefs is None: keydefs = self.Bindings.default_keydefs menudict = self.menudict text = self.text ! for mname, itemlist in defs: menu = menudict.get(mname) if not menu: continue ! for item in itemlist: ! if not item: menu.add_separator() else: ! label, event = item checkbutton = (label[:1] == '!') if checkbutton: label = label[1:] underline, label = prepstr(label) ! accelerator = get_accelerator(keydefs, event) ! def command(text=text, event=event): ! text.event_generate(event) if checkbutton: ! var = self.getrawvar(event, BooleanVar) menu.add_checkbutton(label=label, underline=underline, command=command, accelerator=accelerator, --- 784,816 ---- text.event_add(event, *keylist) ! def fill_menus(self, menudefs=None, keydefs=None): """Add appropriate entries to the menus and submenus Menus that are absent or None in self.menudict are ignored. """ ! if menudefs is None: ! menudefs = self.Bindings.menudefs if keydefs is None: keydefs = self.Bindings.default_keydefs menudict = self.menudict text = self.text ! for mname, entrylist in menudefs: menu = menudict.get(mname) if not menu: continue ! for entry in entrylist: ! if not entry: menu.add_separator() else: ! label, eventname = entry checkbutton = (label[:1] == '!') if checkbutton: label = label[1:] underline, label = prepstr(label) ! accelerator = get_accelerator(keydefs, eventname) ! def command(text=text, eventname=eventname): ! text.event_generate(eventname) if checkbutton: ! var = self.get_var_obj(eventname, BooleanVar) menu.add_checkbutton(label=label, underline=underline, command=command, accelerator=accelerator, *************** *** 823,839 **** def getvar(self, name): ! var = self.getrawvar(name) if var: ! return var.get() def setvar(self, name, value, vartype=None): ! var = self.getrawvar(name, vartype) if var: var.set(value) ! def getrawvar(self, name, vartype=None): ! var = self.vars.get(name) if not var and vartype: ! self.vars[name] = var = vartype(self.text) return var --- 822,844 ---- def getvar(self, name): ! var = self.get_var_obj(name) if var: ! value = var.get() ! return value ! else: ! raise NameError, name def setvar(self, name, value, vartype=None): ! var = self.get_var_obj(name, vartype) if var: var.set(value) + else: + raise NameError, name ! def get_var_obj(self, name, vartype=None): ! var = self.tkinter_vars.get(name) if not var and vartype: ! # create a Tkinter variable object with self.text as master: ! self.tkinter_vars[name] = var = vartype(self.text) return var *************** *** 1368,1373 **** } ! def get_accelerator(keydefs, event): ! keylist = keydefs.get(event) if not keylist: return "" --- 1373,1378 ---- } ! def get_accelerator(keydefs, eventname): ! keylist = keydefs.get(eventname) if not keylist: return "" Index: extend.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/extend.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** extend.txt 16 Jul 2003 03:10:43 -0000 1.4 --- extend.txt 24 Apr 2004 03:01:48 -0000 1.5 *************** *** 52,57 **** Extensions are not required to define menu entries for all the events they ! implement. (XXX KBK 15Jul03: But it appears they must have keybindings for each ! virtual event?) Here is a complete example example: --- 52,57 ---- Extensions are not required to define menu entries for all the events they ! implement. (They are also not required to create keybindings, but in that ! case there must be empty bindings in cofig-extensions.def) Here is a complete example example:

1 0

python/dist/src/Lib/test test_eof.py, 1.1.10.1, 1.1.10.2
by jhylton＠users.sourceforge.net 24 Apr '04

24 Apr '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3915 Modified Files: Tag: ast-branch test_eof.py Log Message: Revise test to reflect the new "<string>" part of the error message. Index: test_eof.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_eof.py,v retrieving revision 1.1.10.1 retrieving revision 1.1.10.2 diff -C2 -d -r1.1.10.1 -r1.1.10.2 *** test_eof.py 28 Apr 2003 17:28:51 -0000 1.1.10.1 --- test_eof.py 24 Apr 2004 02:31:35 -0000 1.1.10.2 *************** *** 8,26 **** class EOFTestCase(unittest.TestCase): def test_EOFC(self): try: eval("""'this is a test\ """) except SyntaxError, msg: ! self.assertEqual(str(msg), ! "EOL while scanning single-quoted string (line 1)") else: raise test_support.TestFailed def test_EOFS(self): try: eval("""'''this is a test""") except SyntaxError, msg: ! self.assertEqual(str(msg), ! "EOF while scanning triple-quoted string (line 1)") else: raise test_support.TestFailed --- 8,26 ---- class EOFTestCase(unittest.TestCase): def test_EOFC(self): + expect = "EOL while scanning single-quoted string (<string>, line 1)" try: eval("""'this is a test\ """) except SyntaxError, msg: ! self.assertEqual(str(msg), expect) else: raise test_support.TestFailed def test_EOFS(self): + expect = "EOF while scanning triple-quoted string (<string>, line 1)" try: eval("""'''this is a test""") except SyntaxError, msg: ! self.assertEqual(str(msg), expect) else: raise test_support.TestFailed

1 0

python/nondist/peps pep-0754.txt,1.3,1.4
by goodger＠users.sourceforge.net 23 Apr '04

23 Apr '04

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8258 Modified Files: pep-0754.txt Log Message: updated URL Index: pep-0754.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0754.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pep-0754.txt 5 Oct 2003 23:34:56 -0000 1.3 --- pep-0754.txt 23 Apr 2004 23:42:47 -0000 1.4 *************** *** 172,176 **** .. [1] Further information on the reference package is available at ! http://www.analytics.washington.edu/Zope/projects/fpconst/ --- 172,176 ---- .. [1] Further information on the reference package is available at ! http://www.analytics.washington.edu/statcomp/projects/rzope/fpconst/

1 0

[Python-checkins] python/dist/src/Lib/test test_grammar.py, 1.40.8.1, 1.40.8.2
by jhylton＠users.sourceforge.net 23 Apr '04

23 Apr '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7227/test Modified Files: Tag: ast-branch test_grammar.py Log Message: The new compiler generates sequential temp ids (0, 1, 2), not even (0, 2, 4). Also, replace a bunch of verify() calls with vereq(). Index: test_grammar.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_grammar.py,v retrieving revision 1.40.8.1 retrieving revision 1.40.8.2 diff -C2 -d -r1.40.8.1 -r1.40.8.2 *** test_grammar.py 28 Apr 2003 17:28:44 -0000 1.40.8.1 --- test_grammar.py 23 Apr 2004 18:36:55 -0000 1.40.8.2 *************** *** 9,13 **** # regrtest.py. ! from test.test_support import TestFailed, verify, check_syntax import sys --- 9,13 ---- # regrtest.py. ! from test.test_support import TestFailed, verify, vereq, check_syntax import sys *************** *** 158,173 **** def f4(two, (compound, (argument, list))): pass def f5((compound, first), two): pass ! verify(f2.func_code.co_varnames == ('one_argument',)) ! verify(f3.func_code.co_varnames == ('two', 'arguments')) if sys.platform.startswith('java'): ! verify(f4.func_code.co_varnames == ('two', '(compound, (argument, list))', 'compound', 'argument', 'list',)) ! verify(f5.func_code.co_varnames == ('(compound, first)', 'two', 'compound', 'first')) else: ! verify(f4.func_code.co_varnames == ('two', '.2', 'compound', ! 'argument', 'list')) ! verify(f5.func_code.co_varnames == ('.0', 'two', 'compound', 'first')) def a1(one_arg,): pass def a2(two, args,): pass --- 158,174 ---- def f4(two, (compound, (argument, list))): pass def f5((compound, first), two): pass ! vereq(f2.func_code.co_varnames, ('one_argument',)) ! vereq(f3.func_code.co_varnames, ('two', 'arguments')) if sys.platform.startswith('java'): ! vereq(f4.func_code.co_varnames, ('two', '(compound, (argument, list))', 'compound', 'argument', 'list',)) ! vereq(f5.func_code.co_varnames, ('(compound, first)', 'two', 'compound', 'first')) else: ! vereq(f4.func_code.co_varnames, ! ('two', '.1', 'compound', 'argument', 'list')) ! vereq(f5.func_code.co_varnames, ! ('.0', 'two', 'compound', 'first')) def a1(one_arg,): pass def a2(two, args,): pass *************** *** 176,183 **** def v2(a, b, *rest): pass def v3(a, (b, c), *rest): return a, b, c, rest if sys.platform.startswith('java'): verify(v3.func_code.co_varnames == ('a', '(b, c)', 'rest', 'b', 'c')) else: ! verify(v3.func_code.co_varnames == ('a', '.2', 'rest', 'b', 'c')) verify(v3(1, (2, 3), 4) == (1, 2, 3, (4,))) def d01(a=1): pass --- 177,186 ---- def v2(a, b, *rest): pass def v3(a, (b, c), *rest): return a, b, c, rest + # ceval unpacks the formal arguments into the first argcount names; + # thus, the names nested inside tuples must appear after these names. if sys.platform.startswith('java'): verify(v3.func_code.co_varnames == ('a', '(b, c)', 'rest', 'b', 'c')) else: ! vereq(v3.func_code.co_varnames, ('a', '.1', 'rest', 'b', 'c')) verify(v3(1, (2, 3), 4) == (1, 2, 3, (4,))) def d01(a=1): pass

1 0

python/dist/src/Python newcompile.c, 1.1.2.97, 1.1.2.98
by jhylton＠users.sourceforge.net 23 Apr '04

23 Apr '04

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6996 Modified Files: Tag: ast-branch newcompile.c Log Message: Be sure to decref the temp name generated for a nested argument tuple. Index: newcompile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/newcompile.c,v retrieving revision 1.1.2.97 retrieving revision 1.1.2.98 diff -C2 -d -r1.1.2.97 -r1.1.2.98 *** newcompile.c 23 Apr 2004 15:32:26 -0000 1.1.2.97 --- newcompile.c 23 Apr 2004 18:35:13 -0000 1.1.2.98 *************** *** 1253,1262 **** /* unpack nested arguments */ ! for (i = 0; i < asdl_seq_LEN(args->args); i++) { expr_ty arg = asdl_seq_GET(args->args, i); if (arg->kind == Tuple_kind) { PyObject *id = PyString_FromFormat(".%d", i); ! if (id == NULL || !compiler_nameop(c, id, Load)) ! return 0; VISIT(c, expr, arg); } --- 1253,1268 ---- /* unpack nested arguments */ ! n = asdl_seq_LEN(args->args); ! for (i = 0; i < n; i++) { expr_ty arg = asdl_seq_GET(args->args, i); if (arg->kind == Tuple_kind) { PyObject *id = PyString_FromFormat(".%d", i); ! if (id == NULL) ! return 0; ! if (!compiler_nameop(c, id, Load)) { ! Py_DECREF(id); ! return 0; ! } ! Py_DECREF(id); VISIT(c, expr, arg); }

1 0