Mailman 3 September 2003 - Python-checkins

python/dist/src/Tools/pynche Main.py, 2.22, 2.22.14.1
by bwarsaw＠users.sourceforge.net Sept. 3, 2003

Sept. 3, 2003

Update of /cvsroot/python/python/dist/src/Tools/pynche In directory sc8-pr-cvs1:/tmp/cvs-serv10250 Modified Files: Tag: release23-maint Main.py Log Message: Fix for SF bug #780996, crash when no .pynche file exists and -d option is not given. If dbfile isn't given and can't be retrieved from the optionsdb, just initialize it to the first element in RGB_TXT. (backported) Index: Main.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/pynche/Main.py,v retrieving revision 2.22 retrieving revision 2.22.14.1 diff -C2 -d -r2.22 -r2.22.14.1 *** Main.py 21 Oct 2002 14:23:48 -0000 2.22 --- Main.py 3 Sep 2003 03:23:44 -0000 2.22.14.1 *************** *** 47,51 **** """ ! __version__ = '1.4' import sys --- 47,51 ---- """ ! __version__ = '1.4.1' import sys *************** *** 128,135 **** # in the .pynche file. if dbfile is None: ! dbfile = s.optiondb()['DBFILE'] # find a parseable color database colordb = None files = RGB_TXT[:] while colordb is None: try: --- 128,137 ---- # in the .pynche file. if dbfile is None: ! dbfile = s.optiondb().get('DBFILE') # find a parseable color database colordb = None files = RGB_TXT[:] + if dbfile is None: + dbfile = files.pop() while colordb is None: try:

1 0

python/dist/src/Misc NEWS,1.848,1.849
by bwarsaw＠users.sourceforge.net Sept. 3, 2003

Sept. 3, 2003

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv9715 Modified Files: NEWS Log Message: Document the Pynche patch. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.848 retrieving revision 1.849 diff -C2 -d -r1.848 -r1.849 *** NEWS 27 Aug 2003 04:55:52 -0000 1.848 --- NEWS 3 Sep 2003 03:20:37 -0000 1.849 *************** *** 73,76 **** --- 73,79 ---- C-c C-h + - Pynche was fixed to not crash when there is no ~/.pynche file and no + -d option was given. + Build -----

1 0

python/dist/src/Tools/pynche Main.py,2.22,2.23
by bwarsaw＠users.sourceforge.net Sept. 3, 2003

Sept. 3, 2003

Update of /cvsroot/python/python/dist/src/Tools/pynche In directory sc8-pr-cvs1:/tmp/cvs-serv8837 Modified Files: Main.py Log Message: Fix for SF bug #780996, crash when no .pynche file exists and -d option is not given. If dbfile isn't given and can't be retrieved from the optionsdb, just initialize it to the first element in RGB_TXT. Backport candidate. Index: Main.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/pynche/Main.py,v retrieving revision 2.22 retrieving revision 2.23 diff -C2 -d -r2.22 -r2.23 *** Main.py 21 Oct 2002 14:23:48 -0000 2.22 --- Main.py 3 Sep 2003 03:15:50 -0000 2.23 *************** *** 47,51 **** """ ! __version__ = '1.4' import sys --- 47,51 ---- """ ! __version__ = '1.4.1' import sys *************** *** 128,135 **** # in the .pynche file. if dbfile is None: ! dbfile = s.optiondb()['DBFILE'] # find a parseable color database colordb = None files = RGB_TXT[:] while colordb is None: try: --- 128,137 ---- # in the .pynche file. if dbfile is None: ! dbfile = s.optiondb().get('DBFILE') # find a parseable color database colordb = None files = RGB_TXT[:] + if dbfile is None: + dbfile = files.pop() while colordb is None: try:

1 0

python/dist/src/Lib csv.py,1.7,1.8
by fdrake＠users.sourceforge.net Sept. 2, 2003

Sept. 2, 2003

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv15336 Modified Files: csv.py Log Message: use the long names for re compilation options; this makes it easier to figure out what the code is doing Index: csv.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/csv.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** csv.py 12 Jun 2003 04:05:00 -0000 1.7 --- csv.py 2 Sep 2003 16:01:07 -0000 1.8 *************** *** 208,212 **** '(?P<delim>>[^\w\n"\'])(?P<space> ?)(?P<quote>["\']).*?(?P=quote)(?:$|\n)', # ,".*?" '(?:^|\n)(?P<quote>["\']).*?(?P=quote)(?:$|\n)'): # ".*?" (no delim, no space) ! regexp = re.compile(restr, re.S | re.M) matches = regexp.findall(data) if matches: --- 208,212 ---- '(?P<delim>>[^\w\n"\'])(?P<space> ?)(?P<quote>["\']).*?(?P=quote)(?:$|\n)', # ,".*?" '(?:^|\n)(?P<quote>["\']).*?(?P=quote)(?:$|\n)'): # ".*?" (no delim, no space) ! regexp = re.compile(restr, re.DOTALL | re.MULTILINE) matches = regexp.findall(data) if matches:

1 0

python/dist/src/Lib/curses has_key.py,1.3,1.4
by akuchling＠users.sourceforge.net Sept. 2, 2003

Sept. 2, 2003

Update of /cvsroot/python/python/dist/src/Lib/curses In directory sc8-pr-cvs1:/tmp/cvs-serv5574 Modified Files: has_key.py Log Message: Modernize code a bit: use isinstance instead of type(); return True/False Index: has_key.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/curses/has_key.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** has_key.py 2 Sep 2003 11:44:44 -0000 1.3 --- has_key.py 2 Sep 2003 11:52:06 -0000 1.4 *************** *** 161,175 **** def has_key(ch): ! if type(ch) == type( '' ): ch = ord(ch) # Figure out the correct capability name for the keycode. capability_name = _capability_names.get(ch) if capability_name is None: ! return 0 #Check the current terminal description for that capability; #if present, return true, else return false. ! if _curses.tigetstr( capability_name ): return 1 ! else: return 0 if __name__ == '__main__': --- 161,178 ---- def has_key(ch): ! if isinstance(ch, str): ! ch = ord(ch) # Figure out the correct capability name for the keycode. capability_name = _capability_names.get(ch) if capability_name is None: ! return False #Check the current terminal description for that capability; #if present, return true, else return false. ! if _curses.tigetstr( capability_name ): ! return True ! else: ! return False if __name__ == '__main__':

1 0

python/dist/src/Lib/curses has_key.py, 1.2, 1.2.30.1
by akuchling＠users.sourceforge.net Sept. 2, 2003

Sept. 2, 2003

Update of /cvsroot/python/python/dist/src/Lib/curses In directory sc8-pr-cvs1:/tmp/cvs-serv4705 Modified Files: Tag: release23-branch has_key.py Log Message: [Patch #759208] Fix has_key emulation to not raise KeyError Index: has_key.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/curses/has_key.py,v retrieving revision 1.2 retrieving revision 1.2.30.1 diff -C2 -d -r1.2 -r1.2.30.1 *** has_key.py 13 Aug 2001 13:45:22 -0000 1.2 --- has_key.py 2 Sep 2003 11:46:32 -0000 1.2.30.1 *************** *** 164,168 **** # Figure out the correct capability name for the keycode. ! capability_name = _capability_names[ch] #Check the current terminal description for that capability; --- 164,170 ---- # Figure out the correct capability name for the keycode. ! capability_name = _capability_names.get(ch) ! if capability_name is None: ! return 0 #Check the current terminal description for that capability;

1 0

python/dist/src/Lib/curses has_key.py,1.2,1.3
by akuchling＠users.sourceforge.net Sept. 2, 2003

Sept. 2, 2003

Update of /cvsroot/python/python/dist/src/Lib/curses In directory sc8-pr-cvs1:/tmp/cvs-serv4371 Modified Files: has_key.py Log Message: [Patch #759208] Fix has_key emulation to not raise KeyError Index: has_key.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/curses/has_key.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** has_key.py 13 Aug 2001 13:45:22 -0000 1.2 --- has_key.py 2 Sep 2003 11:44:44 -0000 1.3 *************** *** 164,168 **** # Figure out the correct capability name for the keycode. ! capability_name = _capability_names[ch] #Check the current terminal description for that capability; --- 164,170 ---- # Figure out the correct capability name for the keycode. ! capability_name = _capability_names.get(ch) ! if capability_name is None: ! return 0 #Check the current terminal description for that capability;

1 0

[Python-checkins] python/dist/src/Lib/test test_filecmp.py, 1.2.8.1, 1.2.8.2
by rhettinger＠users.sourceforge.net Sept. 2, 2003

Sept. 2, 2003

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv26169 Modified Files: Tag: release23-maint test_filecmp.py Log Message: Only apply case-insensitivity test on appropriate platforms.' test_filecmp.py Index: test_filecmp.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_filecmp.py,v retrieving revision 1.2.8.1 retrieving revision 1.2.8.2 diff -C2 -d -r1.2.8.1 -r1.2.8.2 *** test_filecmp.py 2 Sep 2003 05:47:17 -0000 1.2.8.1 --- test_filecmp.py 2 Sep 2003 07:01:11 -0000 1.2.8.2 *************** *** 47,54 **** self.dir_same = os.path.join(tmpdir, 'dir-same') self.dir_diff = os.path.join(tmpdir, 'dir-diff') data = 'Contents of file go here.\n' for dir in [self.dir, self.dir_same, self.dir_diff]: os.mkdir(dir) ! if dir is self.dir_same: fn = 'FiLe' # Verify case-insensitive comparison else: --- 47,55 ---- self.dir_same = os.path.join(tmpdir, 'dir-same') self.dir_diff = os.path.join(tmpdir, 'dir-diff') + self.caseinsensitive = os.path.normcase('A') == os.path.normcase('a') data = 'Contents of file go here.\n' for dir in [self.dir, self.dir_same, self.dir_diff]: os.mkdir(dir) ! if self.caseinsensitive and dir is self.dir_same: fn = 'FiLe' # Verify case-insensitive comparison else: *************** *** 98,102 **** # Check attributes for comparison of two identical directories d = filecmp.dircmp(self.dir, self.dir_same) ! self.assertEqual([d.left_list, d.right_list],[['file'], ['FiLe']]) self.failUnless(d.common == ['file']) self.failUnless(d.left_only == d.right_only == []) --- 99,106 ---- # Check attributes for comparison of two identical directories d = filecmp.dircmp(self.dir, self.dir_same) ! if self.caseinsensitive: ! self.assertEqual([d.left_list, d.right_list],[['file'], ['FiLe']]) ! else: ! self.assertEqual([d.left_list, d.right_list],[['file'], ['file']]) self.failUnless(d.common == ['file']) self.failUnless(d.left_only == d.right_only == [])

1 0

python/dist/src/Lib/test test_filecmp.py,1.3,1.4
by rhettinger＠users.sourceforge.net Sept. 2, 2003

Sept. 2, 2003

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv25797 Modified Files: test_filecmp.py Log Message: Only apply case-insensitivity test on appropriate platforms.' test_filecmp.py Index: test_filecmp.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_filecmp.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** test_filecmp.py 2 Sep 2003 05:42:02 -0000 1.3 --- test_filecmp.py 2 Sep 2003 06:59:21 -0000 1.4 *************** *** 47,54 **** self.dir_same = os.path.join(tmpdir, 'dir-same') self.dir_diff = os.path.join(tmpdir, 'dir-diff') data = 'Contents of file go here.\n' for dir in [self.dir, self.dir_same, self.dir_diff]: os.mkdir(dir) ! if dir is self.dir_same: fn = 'FiLe' # Verify case-insensitive comparison else: --- 47,55 ---- self.dir_same = os.path.join(tmpdir, 'dir-same') self.dir_diff = os.path.join(tmpdir, 'dir-diff') + self.caseinsensitive = os.path.normcase('A') == os.path.normcase('a') data = 'Contents of file go here.\n' for dir in [self.dir, self.dir_same, self.dir_diff]: os.mkdir(dir) ! if self.caseinsensitive and dir is self.dir_same: fn = 'FiLe' # Verify case-insensitive comparison else: *************** *** 98,102 **** # Check attributes for comparison of two identical directories d = filecmp.dircmp(self.dir, self.dir_same) ! self.assertEqual([d.left_list, d.right_list],[['file'], ['FiLe']]) self.failUnless(d.common == ['file']) self.failUnless(d.left_only == d.right_only == []) --- 99,106 ---- # Check attributes for comparison of two identical directories d = filecmp.dircmp(self.dir, self.dir_same) ! if self.caseinsensitive: ! self.assertEqual([d.left_list, d.right_list],[['file'], ['FiLe']]) ! else: ! self.assertEqual([d.left_list, d.right_list],[['file'], ['file']]) self.failUnless(d.common == ['file']) self.failUnless(d.left_only == d.right_only == [])

1 0

python/dist/src/Lib filecmp.py,1.16,1.16.10.1
by rhettinger＠users.sourceforge.net Sept. 2, 2003

Sept. 2, 2003

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv17023/Lib Modified Files: Tag: release23-maint filecmp.py Log Message: SF bug #453515: filecmp.dircmp case sensitivity bug Index: filecmp.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/filecmp.py,v retrieving revision 1.16 retrieving revision 1.16.10.1 diff -C2 -d -r1.16 -r1.16.10.1 *** filecmp.py 27 Feb 2003 00:05:31 -0000 1.16 --- filecmp.py 2 Sep 2003 05:47:17 -0000 1.16.10.1 *************** *** 13,17 **** import stat import warnings ! from itertools import ifilter, ifilterfalse __all__ = ["cmp","dircmp","cmpfiles"] --- 13,17 ---- import stat import warnings ! from itertools import ifilter, ifilterfalse, imap, izip __all__ = ["cmp","dircmp","cmpfiles"] *************** *** 136,144 **** def phase1(self): # Compute common names ! b = dict.fromkeys(self.right_list) ! common = dict.fromkeys(ifilter(b.has_key, self.left_list)) ! self.left_only = list(ifilterfalse(common.has_key, self.left_list)) ! self.right_only = list(ifilterfalse(common.has_key, self.right_list)) ! self.common = common.keys() def phase2(self): # Distinguish files, directories, funnies --- 136,144 ---- def phase1(self): # Compute common names ! a = dict(izip(imap(os.path.normcase, self.left_list), self.left_list)) ! b = dict(izip(imap(os.path.normcase, self.right_list), self.right_list)) ! self.common = map(a.__getitem__, ifilter(b.has_key, a)) ! self.left_only = map(a.__getitem__, ifilterfalse(b.has_key, a)) ! self.right_only = map(b.__getitem__, ifilterfalse(a.has_key, b)) def phase2(self): # Distinguish files, directories, funnies

1 0