|
From: Mark H. <mha...@us...> - 2008-11-26 08:39:41
|
Update of /cvsroot/pywin32/pywin32/isapi In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18639/isapi Modified Files: install.py simple.py threaded_extension.py Log Message: various syntax modernizations Index: threaded_extension.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/isapi/threaded_extension.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** threaded_extension.py 17 Feb 2006 04:04:24 -0000 1.4 --- threaded_extension.py 26 Nov 2008 08:39:33 -0000 1.5 *************** *** 44,48 **** dispatcher = self.extension.dispatch_map.get(key) if dispatcher is None: ! raise RuntimeError, "Bad request '%s'" % (key,) dispatcher(errCode, bytes, key, overlapped) --- 44,48 ---- dispatcher = self.extension.dispatch_map.get(key) if dispatcher is None: ! raise RuntimeError("Bad request '%s'" % (key,)) dispatcher(errCode, bytes, key, overlapped) *************** *** 129,133 **** There is no default implementation - sub-classes must implement this. """ ! raise NotImplementedError, "sub-classes should override Dispatch" def HandleDispatchError(self, ecb): --- 129,133 ---- There is no default implementation - sub-classes must implement this. """ ! raise NotImplementedError("sub-classes should override Dispatch") def HandleDispatchError(self, ecb): Index: simple.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/isapi/simple.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** simple.py 17 Feb 2006 04:05:23 -0000 1.3 --- simple.py 26 Nov 2008 08:39:33 -0000 1.4 *************** *** 28,32 **** sub-classes must provide an implementation for this method. """ ! raise NotImplementedError, "sub-classes should override HttpExtensionProc" def TerminateExtension(self, status): --- 28,32 ---- sub-classes must provide an implementation for this method. """ ! raise NotImplementedError("sub-classes should override HttpExtensionProc") def TerminateExtension(self, status): *************** *** 50,54 **** """ if self.filter_flags is None: ! raise RuntimeError, "You must specify the filter flags" # nod to our reload capability - fv is None when we are reloaded. if fv is not None: --- 50,54 ---- """ if self.filter_flags is None: ! raise RuntimeError("You must specify the filter flags") # nod to our reload capability - fv is None when we are reloaded. if fv is not None: *************** *** 61,65 **** sub-classes must provide an implementation for this method. """ ! raise NotImplementedError, "sub-classes should override HttpExtensionProc" def TerminateFilter(self, status): --- 61,65 ---- sub-classes must provide an implementation for this method. """ ! raise NotImplementedError("sub-classes should override HttpExtensionProc") def TerminateFilter(self, status): Index: install.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/isapi/install.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** install.py 7 Mar 2007 01:47:39 -0000 1.11 --- install.py 26 Nov 2008 08:39:33 -0000 1.12 *************** *** 151,156 **** break else: ! raise ItemNotFound, \ ! "No web sites match the description '%s'" % (server_desc,) # Check it is good. try: --- 151,156 ---- break else: ! raise ItemNotFound( ! "No web sites match the description '%s'" % (server_desc,)) # Check it is good. try: *************** *** 160,165 **** if exc and exc[2]: msg = exc[2] ! raise ItemNotFound, \ ! "WebServer %s: %s" % (server, msg) return server --- 160,165 ---- if exc and exc[2]: msg = exc[2] ! raise ItemNotFound( ! "WebServer %s: %s" % (server, msg)) return server *************** *** 167,171 **** _CallHook(params, "PreInstall", options) if not params.Name: ! raise ConfigurationError, "No Name param" slash = params.Name.rfind("/") if slash >= 0: --- 167,171 ---- _CallHook(params, "PreInstall", options) if not params.Name: ! raise ConfigurationError("No Name param") slash = params.Name.rfind("/") if slash >= 0: *************** *** 238,243 **** newDir.ScriptMaps = (item,) + newDir.ScriptMaps else: ! raise ConfigurationError, \ ! "Unknown ScriptMapUpdate option '%s'" % (params.ScriptMapUpdate,) newDir.SetInfo() _CallHook(params, "PostInstall", options, newDir) --- 238,243 ---- newDir.ScriptMaps = (item,) + newDir.ScriptMaps else: ! raise ConfigurationError( ! "Unknown ScriptMapUpdate option '%s'" % (params.ScriptMapUpdate,)) newDir.SetInfo() _CallHook(params, "PostInstall", options, newDir) *************** *** 370,375 **** "PyISAPI_loader" + suffix + ".dll") if not os.path.isfile(template): ! raise ConfigurationError, \ ! "Template loader '%s' does not exist" % (template,) # We can't do a simple "is newer" check, as the DLL is specific to the # Python version. So we check the date-time and size are identical, --- 370,375 ---- "PyISAPI_loader" + suffix + ".dll") if not os.path.isfile(template): ! raise ConfigurationError( ! "Template loader '%s' does not exist" % (template,)) # We can't do a simple "is newer" check, as the DLL is specific to the # Python version. So we check the date-time and size are identical, *************** *** 450,454 **** if file_must_exist: if not os.path.isfile(dll_name): ! raise ConfigurationError, "%s does not exist" % (dll_name,) # Patch up all references to the DLL. --- 450,454 ---- if file_must_exist: if not os.path.isfile(dll_name): ! raise ConfigurationError("%s does not exist" % (dll_name,)) # Patch up all references to the DLL. *************** *** 488,492 **** conf_module_name = os.path.abspath(conf_module_name) if not os.path.isfile(conf_module_name): ! raise ConfigurationError, "%s does not exist" % (conf_module_name,) loader_dll = GetLoaderModuleName(conf_module_name) --- 488,492 ---- conf_module_name = os.path.abspath(conf_module_name) if not os.path.isfile(conf_module_name): ! raise ConfigurationError("%s does not exist" % (conf_module_name,)) loader_dll = GetLoaderModuleName(conf_module_name) |
