tags 379113 + patch
thanks
Hi,
The following is the diff for my python-soappy 0.11.3-1.7 NMU.
diff -u python-soappy-0.11.3/debian/README.fpconst
python-soappy-0.11.3/debian/README.fpconst
--- python-soappy-0.11.3/debian/README.fpconst
+++ python-soappy-0.11.3/debian/README.fpconst
@@ -2,10 +2,10 @@
fpconst: A Python module for handling IEEE 754 floating point special
values
------------------------------------------------------------------
-Author: Gregory R. Warnes <[EMAIL PROTECTED]>
-Date:: 2003-04-08
-Version 0.6.0
-Copyright: (c) 2003 Pfizer, Inc
+Author: Gregory R. Warnes <[EMAIL PROTECTED]>
+Date: 2005-02-24
+Version: 0.7.2
+Copyright: (c) 2003-2005 Pfizer, Licensed to PSF under a Contributor Agreement
------------------------------------------------------------------
This module provides 'fpconst' a reference implementation of Python
@@ -22,32 +22,21 @@
-
+
+DOCUMENTATION
+
+ See the text of PEP 754 at http://www.python.org/peps/pep-0754.html
+ or the contents of the file pep-0754.txt
+
LICENSE
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the
- distribution.
-
- Neither the name of Pfizer, Inc. nor the names of its contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
+ Copyright 2003-2005 Pfizer
-----------------------------------------------------------------------------
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff -u python-soappy-0.11.3/debian/copyright
python-soappy-0.11.3/debian/copyright
--- python-soappy-0.11.3/debian/copyright
+++ python-soappy-0.11.3/debian/copyright
@@ -2,7 +2,7 @@
Mon, 25 Jun 2001 18:29:28 -0600.
It was downloaded from <http://www.actzero.com/soap/technology/releases_html>
- fpconst: http://www.analytics.washington.edu/Zope/projects/fpconst
+ fpconst: <http://cheeseshop.python.org/pypi/fpconst/0.7.2>
It is currently maintained at http://pywebsvcs.sourceforge.net/, though no new
releases have yet been made.
@@ -44,27 +44,217 @@
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the
- distribution.
-
- Neither the name of Pfizer, Inc. nor the names of its contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
+ Copyright 2003-2005 Pfizer
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+The Apache 2.0 license is:
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff -u python-soappy-0.11.3/debian/changelog
python-soappy-0.11.3/debian/changelog
--- python-soappy-0.11.3/debian/changelog
+++ python-soappy-0.11.3/debian/changelog
@@ -1,3 +1,11 @@
+python-soappy (0.11.3-1.7) unstable; urgency=low
+
+ * Non-maintainer upload, based on a package by Bernd Zeimetz.
+ * Update fpconst.py to version 0.7.2. (Closes: #379113)
+ * fpconst.py is now under Apache 2.0. Update copyright accordingly.
+
+ -- Russ Allbery <[EMAIL PROTECTED]> Thu, 4 Jan 2007 18:16:12 -0800
+
python-soappy (0.11.3-1.6) unstable; urgency=low
* Non-maintainer upload.
diff -u python-soappy-0.11.3/debian/fpconst.py
python-soappy-0.11.3/debian/fpconst.py
--- python-soappy-0.11.3/debian/fpconst.py
+++ python-soappy-0.11.3/debian/fpconst.py
@@ -14,43 +14,52 @@
for reference material on the IEEE 754 floating point standard.
Further information on this package is available at
-<http://software.biostat.washington.edu/statsoft/snake/fpconst>.
+<http://www.analytics.washington.edu/statcomp/projects/rzope/fpconst/>.
-Author: Gregory R. Warnes <[EMAIL PROTECTED]>
-Date:: 2003-04-08
-Copyright: (c) 2003, Pfizer, Inc.
+------------------------------------------------------------------
+Author: Gregory R. Warnes <[EMAIL PROTECTED]>
+Date: 2005-02-24
+Version: 0.7.2
+Copyright: (c) 2003-2005 Pfizer, Licensed to PSF under a Contributor Agreement
+License: Licensed under the Apache License, Version 2.0 (the"License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in
+ writing, software distributed under the License is
+ distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See
+ the License for the specific language governing
+ permissions and limitations under the License.
+------------------------------------------------------------------
"""
-__version__ = "0.6.0"
-ident = "$Id: fpconst.py,v 1.8 2003/05/12 15:14:00 warnes Exp $"
+__version__ = "0.7.2"
+ident = "$Id: fpconst.py,v 1.16 2005/02/24 17:42:03 warnes Exp $"
-import struct
+import struct, operator
# check endianess
_big_endian = struct.pack('i',1)[0] != '\x01'
# and define appropriate constants
if(_big_endian):
- _HW = 0
- _LW = 1
-
- NaN = struct.unpack('d', '\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF')[0]
+ NaN = struct.unpack('d', '\x7F\xF8\x00\x00\x00\x00\x00\x00')[0]
PosInf = struct.unpack('d', '\x7F\xF0\x00\x00\x00\x00\x00\x00')[0]
NegInf = -PosInf
-
else:
- _HW = 1
- _LW = 0
-
- NaN = struct.unpack('d', '\x00\x00\x00\x00\x00\x00\xf8\xff')[0]
+ NaN = struct.unpack('d', '\x00\x00\x00\x00\x00\x00\xf8\xff')[0]
PosInf = struct.unpack('d', '\x00\x00\x00\x00\x00\x00\xf0\x7f')[0]
NegInf = -PosInf
-def _double_as_longs(dval):
- "Use struct.unpack to decode a double precision float into two longs"
- tmp = struct.unpack('ll',struct.pack('d', dval))
- return (tmp[_HW], tmp[_LW])
-
+def _double_as_bytes(dval):
+ "Use struct.unpack to decode a double precision float into eight bytes"
+ tmp = list(struct.unpack('8B',struct.pack('d', dval)))
+ if not _big_endian:
+ tmp.reverse()
+ return tmp
##
## Functions to extract components of the IEEE 754 floating point format
@@ -58,28 +67,36 @@
def _sign(dval):
"Extract the sign bit from a double-precision floating point value"
- ll = _double_as_longs(dval)
- return ll[0] >> 31 & 0x01
+ bb = _double_as_bytes(dval)
+ return bb[0] >> 7 & 0x01
def _exponent(dval):
"""Extract the exponentent bits from a double-precision floating
point value.
- Note that for normalized values, the exponentdent bits have an offset
+ Note that for normalized values, the exponent bits have an offset
of 1023. As a consequence, the actual exponentent is obtained
- by subtracting 1023 for the value returned by this function
+ by subtracting 1023 from the value returned by this function
"""
- ll = _double_as_longs(dval)
- return (ll[0] >> 20) & 0x7ff
+ bb = _double_as_bytes(dval)
+ return (bb[0] << 4 | bb[1] >> 4) & 0x7ff
def _mantissa(dval):
"""Extract the _mantissa bits from a double-precision floating
point value."""
- ll = _double_as_longs(dval)
- mantissa0 = (ll[0] & 0x000fffffL) << 32
- mantissa1 = ll[1]
- return mantissa0 + mantissa1
+ bb = _double_as_bytes(dval)
+ mantissa = bb[1] & 0x0f << 48
+ mantissa += bb[2] << 40
+ mantissa += bb[3] << 32
+ mantissa += bb[4]
+ return mantissa
+
+def _zero_mantissa(dval):
+ """Determine whether the mantissa bits of the given double are all
+ zero."""
+ bb = _double_as_bytes(dval)
+ return ((bb[1] & 0x0f) | reduce(operator.or_, bb[2:])) == 0
##
## Functions to test for IEEE 754 special values
@@ -90,22 +107,72 @@
- return (_exponent(value)==0x7ff and _mantissa(value)!=0)
+ return (_exponent(value)==0x7ff and not _zero_mantissa(value))
def isInf(value):
"""Determine if the argument is an infinite IEEE 754 value (positive
or negative inifinity)"""
- return (_exponent(value)==0x7ff and _mantissa(value)== 0)
+ return (_exponent(value)==0x7ff and _zero_mantissa(value))
def isFinite(value):
"""Determine if the argument is an finite IEEE 754 value (i.e., is
not NaN, positive or negative inifinity)"""
return (_exponent(value)!=0x7ff)
-
def isPosInf(value):
"Determine if the argument is a IEEE 754 positive infinity value"
return (_sign(value)==0 and _exponent(value)==0x7ff and \
- _mantissa(value)== 0)
+ _zero_mantissa(value))
def isNegInf(value):
"Determine if the argument is a IEEE 754 negative infinity value"
return (_sign(value)==1 and _exponent(value)==0x7ff and \
- _mantissa(value)== 0)
+ _zero_mantissa(value))
+
+##
+## Functions to test public functions.
+##
+
+def test_isNaN():
+ assert( not isNaN(PosInf) )
+ assert( not isNaN(NegInf) )
+ assert( isNaN(NaN ) )
+ assert( not isNaN( 1.0) )
+ assert( not isNaN( -1.0) )
+
+def test_isInf():
+ assert( isInf(PosInf) )
+ assert( isInf(NegInf) )
+ assert( not isInf(NaN ) )
+ assert( not isInf( 1.0) )
+ assert( not isInf( -1.0) )
+
+def test_isFinite():
+ assert( not isFinite(PosInf) )
+ assert( not isFinite(NegInf) )
+ assert( not isFinite(NaN ) )
+ assert( isFinite( 1.0) )
+ assert( isFinite( -1.0) )
+
+def test_isPosInf():
+ assert( isPosInf(PosInf) )
+ assert( not isPosInf(NegInf) )
+ assert( not isPosInf(NaN ) )
+ assert( not isPosInf( 1.0) )
+ assert( not isPosInf( -1.0) )
+
+def test_isNegInf():
+ assert( not isNegInf(PosInf) )
+ assert( isNegInf(NegInf) )
+ assert( not isNegInf(NaN ) )
+ assert( not isNegInf( 1.0) )
+ assert( not isNegInf( -1.0) )
+
+# overall test
+def test():
+ test_isNaN()
+ test_isInf()
+ test_isFinite()
+ test_isPosInf()
+ test_isNegInf()
+
+if __name__ == "__main__":
+ test()
+
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
