Mailman 3 February 2005 - Python-checkins

python/dist/src/Tools/msi msisupport.c,1.1,1.2
by loewis＠users.sourceforge.net Feb. 18, 2005

Feb. 18, 2005

Update of /cvsroot/python/python/dist/src/Tools/msi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9213 Modified Files: msisupport.c Log Message: Avoid using *W functions on Win95. Backported to 2.4. Index: msisupport.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/msi/msisupport.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- msisupport.c 12 Dec 2004 15:29:21 -0000 1.1 +++ msisupport.c 18 Feb 2005 16:18:09 -0000 1.2 @@ -1,14 +1,16 @@ #include "windows.h" #include "msiquery.h" +int isWinNT; + /* Print a debug message to the installer log file. * To see the debug messages, install with * msiexec /i pythonxy.msi /l*v python.log */ -static UINT debug(MSIHANDLE hInstall, LPCWSTR msg) +static UINT debug(MSIHANDLE hInstall, LPCSTR msg) { MSIHANDLE hRec = MsiCreateRecord(1); - if (!hRec || MsiRecordSetStringW(hRec, 1, msg) != ERROR_SUCCESS) { + if (!hRec || MsiRecordSetStringA(hRec, 1, msg) != ERROR_SUCCESS) { return ERROR_INSTALL_FAILURE; } MsiProcessMessage(hInstall, INSTALLMESSAGE_INFO, hRec); @@ -21,23 +23,34 @@ */ UINT __declspec(dllexport) __stdcall CheckDir(MSIHANDLE hInstall) { - WCHAR path[1024]; +#define PSIZE 1024 + WCHAR wpath[PSIZE]; + char path[PSIZE]; UINT result; - DWORD size = sizeof(path)/sizeof(WCHAR); + DWORD size = PSIZE; DWORD attributes; + + isWinNT = (GetVersion() < 0x80000000) ? 1 : 0; - result = MsiGetPropertyW(hInstall, L"TARGETDIR", path, &size); + if (isWinNT) + result = MsiGetPropertyW(hInstall, L"TARGETDIR", wpath, &size); + else + result = MsiGetPropertyA(hInstall, "TARGETDIR", path, &size); if (result != ERROR_SUCCESS) return result; + wpath[size] = L'\0'; path[size] = L'\0'; - attributes = GetFileAttributesW(path); + if (isWinNT) + attributes = GetFileAttributesW(wpath); + else + attributes = GetFileAttributesA(path); if (attributes == INVALID_FILE_ATTRIBUTES || !(attributes & FILE_ATTRIBUTE_DIRECTORY)) { - return MsiSetPropertyW(hInstall, L"TargetExists", L"0"); + return MsiSetPropertyA(hInstall, "TargetExists", "0"); } else { - return MsiSetPropertyW(hInstall, L"TargetExists", L"1"); + return MsiSetPropertyA(hInstall, "TargetExists", "1"); } } @@ -50,10 +63,10 @@ INSTALLSTATE ext_old, ext_new, tcl_old, tcl_new, reg_new; UINT result; - result = MsiGetFeatureStateW(hInstall, L"Extensions", &ext_old, &ext_new); + result = MsiGetFeatureStateA(hInstall, "Extensions", &ext_old, &ext_new); if (result != ERROR_SUCCESS) return result; - result = MsiGetFeatureStateW(hInstall, L"TclTk", &tcl_old, &tcl_new); + result = MsiGetFeatureStateA(hInstall, "TclTk", &tcl_old, &tcl_new); if (result != ERROR_SUCCESS) return result; @@ -76,7 +89,7 @@ } else { reg_new = INSTALLSTATE_ABSENT; } - result = MsiSetComponentStateW(hInstall, L"REGISTRY.tcl", reg_new); + result = MsiSetComponentStateA(hInstall, "REGISTRY.tcl", reg_new); return result; }

1 0

python/dist/src/Tools/msi msisupport.c, 1.1.2.1, 1.1.2.2
by loewis＠users.sourceforge.net Feb. 18, 2005

Feb. 18, 2005

Update of /cvsroot/python/python/dist/src/Tools/msi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7824 Modified Files: Tag: release24-maint msisupport.c Log Message: Avoid using *W functions on Win95. Index: msisupport.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Tools/msi/msisupport.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- msisupport.c 22 Dec 2004 12:36:08 -0000 1.1.2.1 +++ msisupport.c 18 Feb 2005 16:13:06 -0000 1.1.2.2 @@ -1,14 +1,16 @@ #include "windows.h" #include "msiquery.h" +int isWinNT; + /* Print a debug message to the installer log file. * To see the debug messages, install with * msiexec /i pythonxy.msi /l*v python.log */ -static UINT debug(MSIHANDLE hInstall, LPCWSTR msg) +static UINT debug(MSIHANDLE hInstall, LPCSTR msg) { MSIHANDLE hRec = MsiCreateRecord(1); - if (!hRec || MsiRecordSetStringW(hRec, 1, msg) != ERROR_SUCCESS) { + if (!hRec || MsiRecordSetStringA(hRec, 1, msg) != ERROR_SUCCESS) { return ERROR_INSTALL_FAILURE; } MsiProcessMessage(hInstall, INSTALLMESSAGE_INFO, hRec); @@ -21,23 +23,34 @@ */ UINT __declspec(dllexport) __stdcall CheckDir(MSIHANDLE hInstall) { - WCHAR path[1024]; +#define PSIZE 1024 + WCHAR wpath[PSIZE]; + char path[PSIZE]; UINT result; - DWORD size = sizeof(path)/sizeof(WCHAR); + DWORD size = PSIZE; DWORD attributes; + + isWinNT = (GetVersion() < 0x80000000) ? 1 : 0; - result = MsiGetPropertyW(hInstall, L"TARGETDIR", path, &size); + if (isWinNT) + result = MsiGetPropertyW(hInstall, L"TARGETDIR", wpath, &size); + else + result = MsiGetPropertyA(hInstall, "TARGETDIR", path, &size); if (result != ERROR_SUCCESS) return result; + wpath[size] = L'\0'; path[size] = L'\0'; - attributes = GetFileAttributesW(path); + if (isWinNT) + attributes = GetFileAttributesW(wpath); + else + attributes = GetFileAttributesA(path); if (attributes == INVALID_FILE_ATTRIBUTES || !(attributes & FILE_ATTRIBUTE_DIRECTORY)) { - return MsiSetPropertyW(hInstall, L"TargetExists", L"0"); + return MsiSetPropertyA(hInstall, "TargetExists", "0"); } else { - return MsiSetPropertyW(hInstall, L"TargetExists", L"1"); + return MsiSetPropertyA(hInstall, "TargetExists", "1"); } } @@ -50,10 +63,10 @@ INSTALLSTATE ext_old, ext_new, tcl_old, tcl_new, reg_new; UINT result; - result = MsiGetFeatureStateW(hInstall, L"Extensions", &ext_old, &ext_new); + result = MsiGetFeatureStateA(hInstall, "Extensions", &ext_old, &ext_new); if (result != ERROR_SUCCESS) return result; - result = MsiGetFeatureStateW(hInstall, L"TclTk", &tcl_old, &tcl_new); + result = MsiGetFeatureStateA(hInstall, "TclTk", &tcl_old, &tcl_new); if (result != ERROR_SUCCESS) return result; @@ -76,7 +89,7 @@ } else { reg_new = INSTALLSTATE_ABSENT; } - result = MsiSetComponentStateW(hInstall, L"REGISTRY.tcl", reg_new); + result = MsiSetComponentStateA(hInstall, "REGISTRY.tcl", reg_new); return result; }

1 0

[Python-checkins] python/dist/src/Lib/test test_userstring.py, 1.16, 1.17
by doerwalter＠users.sourceforge.net Feb. 18, 2005

Feb. 18, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23548/Lib/test Modified Files: test_userstring.py Log Message: Add support for negative indices in UserString.MutableString.__setitem__ and UserString.MutableString.__delitem__. Index: test_userstring.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_userstring.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- test_userstring.py 17 Feb 2005 22:31:28 -0000 1.16 +++ test_userstring.py 18 Feb 2005 13:22:43 -0000 1.17 @@ -52,20 +52,20 @@ def test_setitem(self): s = self.type2test("foo") - self.assertRaises(IndexError, s.__setitem__, -1, "bar") + self.assertRaises(IndexError, s.__setitem__, -4, "bar") self.assertRaises(IndexError, s.__setitem__, 3, "bar") + s[-1] = "bar" + self.assertEqual(s, "fobar") s[0] = "bar" - self.assertEqual(s, "baroo") - s[4] = "foo" - self.assertEqual(s, "barofoo") + self.assertEqual(s, "barobar") def test_delitem(self): s = self.type2test("foo") - self.assertRaises(IndexError, s.__delitem__, -1) + self.assertRaises(IndexError, s.__delitem__, -4) self.assertRaises(IndexError, s.__delitem__, 3) + del s[-1] + self.assertEqual(s, "fo") del s[0] - self.assertEqual(s, "oo") - del s[1] self.assertEqual(s, "o") del s[0] self.assertEqual(s, "")

1 0

python/dist/src/Lib UserString.py,1.23,1.24
by doerwalter＠users.sourceforge.net Feb. 18, 2005

Feb. 18, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23548/Lib Modified Files: UserString.py Log Message: Add support for negative indices in UserString.MutableString.__setitem__ and UserString.MutableString.__delitem__. Index: UserString.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/UserString.py,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- UserString.py 4 Aug 2004 08:01:06 -0000 1.23 +++ UserString.py 18 Feb 2005 13:22:43 -0000 1.24 @@ -146,9 +146,13 @@ def __hash__(self): raise TypeError, "unhashable type (it is mutable)" def __setitem__(self, index, sub): + if index < 0: + index += len(self.data) if index < 0 or index >= len(self.data): raise IndexError self.data = self.data[:index] + sub + self.data[index+1:] def __delitem__(self, index): + if index < 0: + index += len(self.data) if index < 0 or index >= len(self.data): raise IndexError self.data = self.data[:index] + self.data[index+1:] def __setslice__(self, start, end, sub):

1 0

python/dist/src/Misc NEWS,1.1243,1.1244
by doerwalter＠users.sourceforge.net Feb. 18, 2005

Feb. 18, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23548/Misc Modified Files: NEWS Log Message: Add support for negative indices in UserString.MutableString.__setitem__ and UserString.MutableString.__delitem__. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1243 retrieving revision 1.1244 diff -u -d -r1.1243 -r1.1244 --- NEWS 17 Feb 2005 14:55:21 -0000 1.1243 +++ NEWS 18 Feb 2005 13:22:43 -0000 1.1244 @@ -152,6 +152,9 @@ - The reconvert.quote function can now emit triple-quoted strings. The reconvert module now has some simple documentation. +- ``UserString.MutableString`` now supports negative indices in + ``__setitem__`` and ``__delitem__`` + Build -----

1 0

python/dist/src/Lib/logging config.py,1.10,1.11
by vsajip＠users.sourceforge.net Feb. 18, 2005

Feb. 18, 2005

Update of /cvsroot/python/python/dist/src/Lib/logging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28658 Modified Files: config.py Log Message: Handle errors in imports of thread, threading Index: config.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/logging/config.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- config.py 24 Sep 2004 11:45:13 -0000 1.10 +++ config.py 18 Feb 2005 11:54:46 -0000 1.11 @@ -27,7 +27,13 @@ To use, simply 'import logging' and log away! """ -import sys, logging, logging.handlers, string, thread, threading, socket, struct, os +import sys, logging, logging.handlers, string, socket, struct, os + +try: + import thread + import threading +except ImportError: + thread = None from SocketServer import ThreadingTCPServer, StreamRequestHandler

1 0

python/dist/src/Lib/logging __init__.py, 1.24, 1.25
by vsajip＠users.sourceforge.net Feb. 18, 2005

Feb. 18, 2005

Update of /cvsroot/python/python/dist/src/Lib/logging In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28274 Modified Files: __init__.py Log Message: Improved frame handling for 1.5.2, and now return func from findCaller (not actually used yet) Index: __init__.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/logging/__init__.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- __init__.py 21 Oct 2004 21:24:27 -0000 1.24 +++ __init__.py 18 Feb 2005 11:53:32 -0000 1.25 @@ -37,14 +37,14 @@ __author__ = "Vinay Sajip <vinay_sajip(a)red-dove.com>" __status__ = "beta" __version__ = "0.4.9.6" -__date__ = "20 October 2004" +__date__ = "03 February 2005" #--------------------------------------------------------------------------- # Miscellaneous module data #--------------------------------------------------------------------------- # -#_srcfile is used when walking the stack to check when we've got the first +# _srcfile is used when walking the stack to check when we've got the first # caller stack frame. # if string.lower(__file__[-4:]) in ['.pyc', '.pyo']: @@ -53,12 +53,23 @@ _srcfile = __file__ _srcfile = os.path.normcase(_srcfile) +# next bit filched from 1.5.2's inspect.py +def currentframe(): + """Return the frame object for the caller's stack frame.""" + try: + raise 'catch me' + except: + return sys.exc_traceback.tb_frame.f_back + +if hasattr(sys, '_getframe'): currentframe = sys._getframe +# done filching + # _srcfile is only used in conjunction with sys._getframe(). # To provide compatibility with older versions of Python, set _srcfile # to None if _getframe() is not available; this value will prevent # findCaller() from being called. -if not hasattr(sys, "_getframe"): - _srcfile = None +#if not hasattr(sys, "_getframe"): +# _srcfile = None # #_startTime is used as the base when calculating the relative time of events @@ -1005,16 +1016,16 @@ def findCaller(self): """ Find the stack frame of the caller so that we can note the source - file name and line number. + file name, line number and function name. """ - f = sys._getframe(1) + f = currentframe().f_back while 1: co = f.f_code filename = os.path.normcase(co.co_filename) if filename == _srcfile: f = f.f_back continue - return filename, f.f_lineno + return filename, f.f_lineno, co.co_name def makeRecord(self, name, level, fn, lno, msg, args, exc_info): """ @@ -1029,9 +1040,9 @@ all the handlers of this logger to handle the record. """ if _srcfile: - fn, lno = self.findCaller() + fn, lno, func = self.findCaller() else: - fn, lno = "<unknown file>", 0 + fn, lno, func = "(unknown file)", 0, "(unknown function)" if exc_info: if type(exc_info) != types.TupleType: exc_info = sys.exc_info()

1 0

python/dist/src/Doc/lib liblogging.tex,1.34,1.35
by vsajip＠users.sourceforge.net Feb. 18, 2005

Feb. 18, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27496/lib Modified Files: liblogging.tex Log Message: Fixed documentation for SMTPHandler Index: liblogging.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liblogging.tex,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- liblogging.tex 2 Dec 2004 21:27:42 -0000 1.34 +++ liblogging.tex 18 Feb 2005 11:50:11 -0000 1.35 @@ -1133,8 +1133,7 @@ \begin{classdesc}{SMTPHandler}{mailhost, fromaddr, toaddrs, subject} Returns a new instance of the \class{SMTPHandler} class. The instance is initialized with the from and to addresses and subject -line of the email. The \var{toaddrs} should be a list of strings without -domain names (That's what the \var{mailhost} is for). To specify a +line of the email. The \var{toaddrs} should be a list of strings. To specify a non-standard SMTP port, use the (host, port) tuple format for the \var{mailhost} argument. If you use a string, the standard SMTP port is used.

1 0

[Python-checkins] python/dist/src/Lib/test test_userstring.py, 1.15, 1.16
by doerwalter＠users.sourceforge.net Feb. 17, 2005

Feb. 17, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20918/Lib/test Modified Files: test_userstring.py Log Message: Fix copy & paste error. Index: test_userstring.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_userstring.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- test_userstring.py 17 Feb 2005 22:03:31 -0000 1.15 +++ test_userstring.py 17 Feb 2005 22:31:28 -0000 1.16 @@ -61,8 +61,8 @@ def test_delitem(self): s = self.type2test("foo") - self.assertRaises(IndexError, s.__setitem__, -1, "bar") - self.assertRaises(IndexError, s.__setitem__, 3, "bar") + self.assertRaises(IndexError, s.__delitem__, -1) + self.assertRaises(IndexError, s.__delitem__, 3) del s[0] self.assertEqual(s, "oo") del s[1]

1 0

[Python-checkins] python/dist/src/Lib/test test_userstring.py, 1.14, 1.15
by doerwalter＠users.sourceforge.net Feb. 17, 2005

Feb. 17, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11375/Lib/test Modified Files: test_userstring.py Log Message: Add tests for the methods added by UserString.MutableString. Index: test_userstring.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_userstring.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- test_userstring.py 17 Feb 2005 18:51:48 -0000 1.14 +++ test_userstring.py 17 Feb 2005 22:03:31 -0000 1.15 @@ -50,6 +50,68 @@ def test_hash(self): pass + def test_setitem(self): + s = self.type2test("foo") + self.assertRaises(IndexError, s.__setitem__, -1, "bar") + self.assertRaises(IndexError, s.__setitem__, 3, "bar") + s[0] = "bar" + self.assertEqual(s, "baroo") + s[4] = "foo" + self.assertEqual(s, "barofoo") + + def test_delitem(self): + s = self.type2test("foo") + self.assertRaises(IndexError, s.__setitem__, -1, "bar") + self.assertRaises(IndexError, s.__setitem__, 3, "bar") + del s[0] + self.assertEqual(s, "oo") + del s[1] + self.assertEqual(s, "o") + del s[0] + self.assertEqual(s, "") + + def test_setslice(self): + s = self.type2test("foo") + s[:] = "bar" + self.assertEqual(s, "bar") + s[1:2] = "foo" + self.assertEqual(s, "bfoor") + s[1:-1] = UserString("a") + self.assertEqual(s, "bar") + s[0:10] = 42 + self.assertEqual(s, "42") + + def test_delslice(self): + s = self.type2test("foobar") + del s[3:10] + self.assertEqual(s, "foo") + del s[-1:10] + self.assertEqual(s, "fo") + + def test_immutable(self): + s = self.type2test("foobar") + s2 = s.immutable() + self.assertEqual(s, s2) + self.assert_(isinstance(s2, UserString)) + + def test_iadd(self): + s = self.type2test("foo") + s += "bar" + self.assertEqual(s, "foobar") + s += UserString("baz") + self.assertEqual(s, "foobarbaz") + s += 42 + self.assertEqual(s, "foobarbaz42") + + def test_imul(self): + s = self.type2test("foo") + s *= 1 + self.assertEqual(s, "foo") + s *= 2 + self.assertEqual(s, "foofoo") + s *= -1 + self.assertEqual(s, "") + def test_main(): test_support.run_unittest(UserStringTest, MutableStringTest)

1 0