[Python-modules-commits] r6721 - in packages/zsi/trunk/debian (3 files)
bzed at users.alioth.debian.org
bzed at users.alioth.debian.org
Tue Oct 21 15:14:55 UTC 2008
Date: Tuesday, October 21, 2008 @ 15:14:54
Author: bzed
Revision: 6721
Preparing fix for Lenny
Modified:
packages/zsi/trunk/debian/changelog
packages/zsi/trunk/debian/patches/00list
Deleted:
packages/zsi/trunk/debian/patches/update-to-svn-r1446.dpatch
Modified: packages/zsi/trunk/debian/changelog
===================================================================
--- packages/zsi/trunk/debian/changelog 2008-10-21 14:35:50 UTC (rev 6720)
+++ packages/zsi/trunk/debian/changelog 2008-10-21 15:14:54 UTC (rev 6721)
@@ -1,11 +1,5 @@
-zsi (2.1~a1-2) UNRELEASED; urgency=low
+zsi (2.1~a1-2) unstable; urgency=medium
- [ Bernd Zeimetz ]
- * NOT RELEASED YET
- * debian/patches:
- - Adding update-to-svn-r1446.dpatch to update the module to the latest svn
- revision.
-
[ Emilio Pozuelo Monfort ]
* debian/rules:
- Build with the default Python interpreter first, as distutils is
Modified: packages/zsi/trunk/debian/patches/00list
===================================================================
--- packages/zsi/trunk/debian/patches/00list 2008-10-21 14:35:50 UTC (rev 6720)
+++ packages/zsi/trunk/debian/patches/00list 2008-10-21 15:14:54 UTC (rev 6721)
@@ -1,3 +1,2 @@
-update-to-svn-r1446
bogus-shebang-remove
no-setuptools
Deleted: packages/zsi/trunk/debian/patches/update-to-svn-r1446.dpatch
===================================================================
--- packages/zsi/trunk/debian/patches/update-to-svn-r1446.dpatch 2008-10-21 14:35:50 UTC (rev 6720)
+++ packages/zsi/trunk/debian/patches/update-to-svn-r1446.dpatch 2008-10-21 15:14:54 UTC (rev 6721)
@@ -1,294 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## update-to-svn-r1446.dpatch by Bernd Zeimetz <bzed at debian.org>
-##
-## DP: Updating to svn rev. 1446
-
- at DPATCH@
-diff -urNad zsi~/ZSI/TC.py zsi/ZSI/TC.py
---- zsi~/ZSI/TC.py 2008-04-22 22:19:41.000000000 +0200
-+++ zsi/ZSI/TC.py 2008-04-22 22:19:51.000000000 +0200
-@@ -151,7 +151,7 @@
- if len(_children(elt)): return elt
- href = _find_href(elt)
- if not href:
-- if self.minOccurs is 0: return None
-+ if self.minOccurs is 0 or self.nilled(elt, ps): return None
- raise EvaluateException('Required' + tag + ' missing',
- ps.Backtrace(elt))
- return ps.FindLocalHREF(href, elt, 0)
-diff -urNad zsi~/ZSI/generate/containers.py zsi/ZSI/generate/containers.py
---- zsi~/ZSI/generate/containers.py 2007-10-31 20:51:00.000000000 +0100
-+++ zsi/ZSI/generate/containers.py 2008-04-22 22:19:51.000000000 +0200
-@@ -5,7 +5,7 @@
-
- # contains text container classes for new generation generator
-
--# $Id: containers.py 1420 2007-10-31 19:51:00Z boverhof $
-+# $Id: containers.py 1440 2008-01-11 01:26:39Z boverhof $
- import types, warnings
- from utility import StringWriter, TextProtect, TextProtectAttributeName,\
- GetPartsSubNames
-@@ -1984,20 +1984,27 @@
- if pyclass == 'bool': pyclass = 'int'
- kw = KW.copy()
- kw.update(dict(aname=aname, ns=self.ns, name=self.name,
-+ pname=(self.ns,self.name),
- substitutionGroup=self._substitutionGroupTag(),
- subclass=self.sKlass,literal=self.literalTag(),
- schema=self.schemaTag(), init=self.simpleConstructor(),
- klass=self.getClassName(), element="ElementDeclaration"))
-
-+ #
-+ # TODO: What does this local check do???? relevant for
-+ # [ 1853368 ] "elementFormDefault='unqualified'" mishandled
-+ #
-+
- if self.local:
- kw['element'] = 'LocalElementDeclaration'
-+ kw['pname'] = '"%s"' %self.name
-
- element = map(lambda i: i %kw, [
- '%(ID1)sclass %(klass)s(%(subclass)s, %(element)s):',
- '%(ID2)s%(literal)s',
- '%(ID2)s%(schema)s',
- '%(ID2)s%(init)s',
-- '%(ID3)skw["pname"] = ("%(ns)s","%(name)s")',
-+ '%(ID3)skw["pname"] = %(pname)s',
- '%(ID3)skw["aname"] = "%(aname)s"',
- ]
- )
-@@ -2053,20 +2060,27 @@
- def _setContent(self):
- kw = KW.copy()
- kw.update(dict(aname=self.getAttributeName(self.name), ns=self.ns, name=self.name,
-+ pname=(self.ns,self.name),
- subclass=self.sKlass,literal=self.literalTag(),
- schema=self.schemaTag(), init=self.simpleConstructor(),
- klass=self.getClassName(), element="ElementDeclaration",
- baseinit=self.simpleConstructor(self.sKlass)))
-
-+ #
-+ # TODO: What does this local check do???? relevant for
-+ # [ 1853368 ] "elementFormDefault='unqualified'" mishandled
-+ #
-+
- if self.local:
- kw['element'] = 'LocalElementDeclaration'
-+ kw['pname'] = '"%s"' %self.name
-
- element = map(lambda i: i %kw, [
- '%(ID1)sclass %(klass)s(%(subclass)s, %(element)s):',
- '%(ID2)s%(literal)s',
- '%(ID2)s%(schema)s',
- '%(ID2)s%(init)s',
-- '%(ID3)skw["pname"] = ("%(ns)s","%(name)s")',
-+ '%(ID3)skw["pname"] = %(pname)s',
- '%(ID3)skw["aname"] = "%(aname)s"',
- '%(ID3)s%(baseinit)s',
- ]
-@@ -2154,6 +2168,7 @@
- schema=self.schemaTag(),
- init=self.simpleConstructor(),
- ns=self.ns, name=self.name,
-+ pname=(self.ns,self.name),
- aname=self.getAttributeName(self.name),
- nsurilogic=self.nsuriLogic(),
- ofwhat=self.getTypecodeList(),
-@@ -2167,8 +2182,14 @@
- ex.args = tuple(args)
- raise
-
-+ #
-+ # TODO: What does this local check do???? relevant for
-+ # [ 1853368 ] "elementFormDefault='unqualified'" mishandled
-+ #
-+
- if self.local:
- kw['element'] = 'LocalElementDeclaration'
-+ kw['pname'] = '"%s"' %self.name
-
- element = [
- '%(ID1)sclass %(klass)s(%(subclass)s, %(element)s):',
-@@ -2177,7 +2198,7 @@
- '%(ID2)s%(init)s',
- '%(ID3)s%(nsurilogic)s',
- '%(ID3)sTClist = [%(ofwhat)s]',
-- '%(ID3)skw["pname"] = ("%(ns)s","%(name)s")',
-+ '%(ID3)skw["pname"] = %(pname)s',
- '%(ID3)skw["aname"] = "%(aname)s"',
- '%(ID3)s%(atypecode)s = {}',
- '%(ID3)sZSI.TCcompound.ComplexType.__init__(self,None,TClist,inorder=0,**kw)',
-@@ -2303,6 +2324,7 @@
- schema=self.schemaTag(),
- init=self.simpleConstructor(),
- ns=self.ns, name=self.name,
-+ pname=(self.ns,self.name),
- aname=self.getAttributeName(self.name),
- baseslogic=self.getBasesLogic(ID3),
- #ofwhat=self.getTypecodeList(),
-@@ -2317,9 +2339,15 @@
- args += ex.args
- ex.args = tuple(args)
- raise
--
-+
-+ #
-+ # TODO: What does this local check do???? relevant for
-+ # [ 1853368 ] "elementFormDefault='unqualified'" mishandled
-+ #
-+
- if self.local:
- kw['element'] = 'LocalElementDeclaration'
-+ kw['pname'] = '"%s"' %self.name
-
- element = [
- '%(ID1)sclass %(klass)s(%(element)s):',
-@@ -2327,7 +2355,7 @@
- '%(ID2)s%(schema)s',
- '%(ID2)s%(substitutionGroup)s',
- '%(ID2)s%(init)s',
-- '%(ID3)skw["pname"] = ("%(ns)s","%(name)s")',
-+ '%(ID3)skw["pname"] = %(pname)s',
- '%(ID3)skw["aname"] = "%(aname)s"',
- '%(baseslogic)s',
- '%(ID3)s%(alias)s.%(subclass)s.__init__(self, **kw)',
-diff -urNad zsi~/ZSI/twisted/WSresource.py zsi/ZSI/twisted/WSresource.py
---- zsi~/ZSI/twisted/WSresource.py 2007-11-01 21:33:33.000000000 +0100
-+++ zsi/ZSI/twisted/WSresource.py 2008-04-22 22:19:51.000000000 +0200
-@@ -1,7 +1,7 @@
- ###########################################################################
- # Joshua R. Boverhof, LBNL
- # See Copyright for copyright notice!
--# $Id: WSresource.py 1423 2007-11-01 20:33:33Z boverhof $
-+# $Id: WSresource.py 1439 2008-01-11 00:47:15Z boverhof $
- ###########################################################################
-
- import sys, warnings
-@@ -253,6 +253,41 @@
- return cls.protocol(DefaultCallbackHandler, DataHandler)
-
-
-+class DefaultHandlerChain:
-+
-+ @CheckInputArgs(CallbackChainInterface, HandlerChainInterface)
-+ def __init__(self, cb, *handlers):
-+ self.handlercb = cb
-+ self.handlers = handlers
-+ self.debug = len(log.theLogPublisher.observers) > 0
-+
-+ def processRequest(self, arg, **kw):
-+ debug = self.debug
-+ if debug: log.msg('--->PROCESS REQUEST: %s' %arg, debug=1)
-+
-+ for h in self.handlers:
-+ if debug: log.msg('\t%s handler: %s' %(arg, h), debug=1)
-+ arg = h.processRequest(arg, **kw)
-+
-+ return self.handlercb.processRequest(arg, **kw)
-+
-+ def processResponse(self, arg, **kw):
-+ debug = self.debug
-+ if debug: log.msg('===>PROCESS RESPONSE: %s' %str(arg), debug=1)
-+
-+ if arg is None:
-+ return
-+
-+ for h in self.handlers:
-+ if debug: log.msg('\t%s handler: %s' %(arg, h), debug=1)
-+ arg = h.processResponse(arg, **kw)
-+
-+ s = str(arg)
-+ if debug: log.msg(s, debug=1)
-+
-+ return s
-+
-+
- class WSAddressHandlerChainFactory:
- protocol = DefaultHandlerChain
-
-@@ -321,40 +356,3 @@
- return NOT_DONE_YET
-
-
--
--
--
--class DefaultHandlerChain:
--
-- @CheckInputArgs(CallbackChainInterface, HandlerChainInterface)
-- def __init__(self, cb, *handlers):
-- self.handlercb = cb
-- self.handlers = handlers
-- self.debug = len(log.theLogPublisher.observers) > 0
--
-- def processRequest(self, arg, **kw):
-- debug = self.debug
-- if debug: log.msg('--->PROCESS REQUEST: %s' %arg, debug=1)
--
-- for h in self.handlers:
-- if debug: log.msg('\t%s handler: %s' %(arg, h), debug=1)
-- arg = h.processRequest(arg, **kw)
--
-- return self.handlercb.processRequest(arg, **kw)
--
-- def processResponse(self, arg, **kw):
-- debug = self.debug
-- if debug: log.msg('===>PROCESS RESPONSE: %s' %str(arg), debug=1)
--
-- if arg is None:
-- return
--
-- for h in self.handlers:
-- if debug: log.msg('\t%s handler: %s' %(arg, h), debug=1)
-- arg = h.processResponse(arg, **kw)
--
-- s = str(arg)
-- if debug: log.msg(s, debug=1)
--
-- return s
--
-diff -urNad zsi~/ZSI/wstools/XMLSchema.py zsi/ZSI/wstools/XMLSchema.py
---- zsi~/ZSI/wstools/XMLSchema.py 2007-11-01 23:42:47.000000000 +0100
-+++ zsi/ZSI/wstools/XMLSchema.py 2008-04-22 22:19:51.000000000 +0200
-@@ -12,7 +12,7 @@
- # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
- # FOR A PARTICULAR PURPOSE.
-
--ident = "$Id: XMLSchema.py 1434 2007-11-01 22:42:47Z boverhof $"
-+ident = "$Id: XMLSchema.py 1416 2007-10-01 19:56:26Z boverhof $"
-
- import types, weakref, sys, warnings
- from Namespaces import SCHEMA, XMLNS, SOAP
-@@ -1214,13 +1214,16 @@
- except NoSchemaLocationWarning, ex:
- # Dependency declaration, hopefully implementation
- # is aware of this namespace (eg. SOAP,WSDL,?)
-+ print "IMPORT: ", import_ns
-+ print ex
- del slocd[import_ns]
- continue
- except SchemaError, ex:
-- warnings.warn(\
-- '<import namespace="%s">, %s'\
-- %(import_ns, 'failed to load schema instance, resort to lazy eval when necessary')
-- )
-+ #warnings.warn(\
-+ # '<import namespace="%s" schemaLocation=?>, %s'\
-+ # %(import_ns, 'failed to load schema instance')
-+ #)
-+ print ex
- del slocd[import_ns]
- class _LazyEvalImport(str):
- '''Lazy evaluation of import, replace entry in self.imports.'''
-diff -urNad zsi~/ZSI/wstools/c14n.py zsi/ZSI/wstools/c14n.py
---- zsi~/ZSI/wstools/c14n.py 2008-04-22 22:19:41.000000000 +0200
-+++ zsi/ZSI/wstools/c14n.py 2008-04-22 22:19:51.000000000 +0200
-@@ -33,7 +33,7 @@
- "Joseph M. Reagle Jr." <reagle at w3.org>
- "Rich Salz" <rsalz at zolera.com>
-
--$Date: 2006-03-30 23:47:16 +0000 (Thu, 30 Mar 2006) $ by $Author: boverhof $
-+$Date: 2006-03-31 01:47:16 +0200 (Fri, 31 Mar 2006) $ by $Author: boverhof $
- '''
-
- _copyright = '''Copyright 2001, Zolera Systems Inc. All Rights Reserved.
More information about the Python-modules-commits
mailing list