[Python-modules-commits] r15155 - in packages/pyamf/trunk/debian (5 files)
nomadium-guest at users.alioth.debian.org
nomadium-guest at users.alioth.debian.org
Mon Dec 27 18:26:53 UTC 2010
Date: Monday, December 27, 2010 @ 18:26:40
Author: nomadium-guest
Revision: 15155
* Add Build-Depends on cython (>= 0.13).
* Remove unused patch regarding unit tests.
* Add patch including missing .pxd files needed by Cython.
Added:
packages/pyamf/trunk/debian/patches/cython-declarations.diff
Modified:
packages/pyamf/trunk/debian/control
packages/pyamf/trunk/debian/patches/series
packages/pyamf/trunk/debian/rules
Deleted:
packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff
Modified: packages/pyamf/trunk/debian/control
===================================================================
--- packages/pyamf/trunk/debian/control 2010-12-27 18:13:25 UTC (rev 15154)
+++ packages/pyamf/trunk/debian/control 2010-12-27 18:26:40 UTC (rev 15155)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Miguel Landaeta <miguel at miguel.cc>
-Build-Depends: debhelper (>= 7.0.50~), python-all-dev, cython, python-all-dbg,
- python-setuptools (>= 0.6c9)
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev, cython (>= 0.13),
+ python-all-dbg, python-setuptools (>= 0.6c9)
Standards-Version: 3.9.1
Homepage: http://pyamf.org/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyamf/trunk/
Added: packages/pyamf/trunk/debian/patches/cython-declarations.diff
===================================================================
--- packages/pyamf/trunk/debian/patches/cython-declarations.diff (rev 0)
+++ packages/pyamf/trunk/debian/patches/cython-declarations.diff 2010-12-27 18:26:40 UTC (rev 15155)
@@ -0,0 +1,263 @@
+Description: Include declaration files needed by Cython
+ Upstream is not including .pxd files needed to regenerate the source code
+ for PyAMF extensions. These .pxd files are available at the upstream git
+ repository:
+ https://github.com/hydralabs/pyamf/raw/master/cpyamf/util.pxd
+ https://github.com/hydralabs/pyamf/raw/master/cpyamf/codec.pxd
+ https://github.com/hydralabs/pyamf/raw/master/cpyamf/amf3.pxd
+Author: Miguel Landaeta <miguel at miguel.cc>
+Bug-Debian: http://bugs.debian.org/499617
+Forwarded: not-needed
+Last-Update: 2010-12-27
+
+--- /dev/null
++++ pyamf-0.6/cpyamf/codec.pxd
+@@ -0,0 +1,114 @@
++# Copyright (c) The PyAMF Project.
++# See LICENSE.txt for details.
++
++cdef extern from "Python.h":
++ ctypedef struct PyObject:
++ pass
++
++
++from cpyamf cimport util
++
++cdef class IndexedCollection(object):
++ """
++ Provides reference functionality for amf contexts.
++ """
++
++ cdef public bint use_hash
++ cdef PyObject **data
++ cdef dict refs
++ cdef Py_ssize_t size
++ cdef Py_ssize_t length
++
++ cdef int _actually_increase_size(self) except -1
++ cdef int _increase_size(self) except? -1
++ cdef void _clear(self)
++ cpdef int clear(self) except -1
++ cdef object _ref(self, object obj)
++ cpdef object getByReference(self, Py_ssize_t ref)
++ cpdef Py_ssize_t getReferenceTo(self, object obj) except -2
++ cpdef Py_ssize_t append(self, object obj) except -1
++
++
++cdef class Context(object):
++ """
++ C based version of ``pyamf.BaseContext``
++ """
++
++ cdef dict class_aliases
++ cdef IndexedCollection objects
++ cdef dict unicodes
++ cdef dict _strings
++ cdef public dict extra
++
++ cpdef int clear(self) except? -1
++ cpdef object getClassAlias(self, object klass)
++
++ cpdef object getObject(self, Py_ssize_t ref)
++ cpdef Py_ssize_t getObjectReference(self, object obj) except -2
++ cpdef Py_ssize_t addObject(self, object obj) except -1
++
++ cpdef unicode getStringForBytes(self, object s)
++ cpdef str getBytesForString(self, object u)
++
++
++cdef class Codec(object):
++ """
++ Base class for Encoder/Decoder classes. Provides base functionality for
++ managing codecs.
++ """
++
++ cdef util.cBufferedByteStream stream
++ cdef public bint strict
++ cdef public object timezone_offset
++
++
++cdef class Decoder(Codec):
++ cdef object readDate(self)
++ cpdef object readString(self)
++ cdef object readObject(self)
++ cdef object readNumber(self)
++ cdef object readNull(self)
++ cdef object readUndefined(self)
++ cdef object readList(self)
++ cdef object readXML(self)
++
++ cpdef object readElement(self)
++ cdef object readConcreteElement(self, char t)
++
++ cpdef int send(self, data) except -1
++
++
++cdef class Encoder(Codec):
++ """
++ """
++
++ cdef dict func_cache
++ cdef list use_write_object
++ cdef list bucket
++
++ cpdef int serialiseString(self, u) except -1
++ cdef inline int writeType(self, char type) except -1
++ cdef int writeNull(self, object o) except -1
++ cdef int writeUndefined(self, object o) except -1
++ cdef int writeString(self, object o) except -1
++ cdef int writeBytes(self, object o) except -1
++ cdef int writeBoolean(self, object o) except -1
++ cdef int writeInt(self, object o) except -1
++ cdef int writeLong(self, object o) except -1
++ cdef int writeNumber(self, object o) except -1
++ cdef int writeDateTime(self, object o) except -1
++ cdef int writeDate(self, object o) except -1
++ cdef int writeXML(self, object o) except -1
++ cpdef int writeList(self, object o, bint is_proxy=?) except -1
++ cdef int writeTuple(self, object o) except -1
++ cdef int writeSequence(self, object iterable) except -1
++ cpdef int writeObject(self, object o, bint is_proxy=?) except -1
++ cdef int writeDict(self, dict o) except -1
++ cdef int writeMixedArray(self, object o) except -1
++ cdef int writeGenerator(self, object) except -1
++
++ cdef inline int handleBasicTypes(self, object element, object py_type) except -1
++ cdef int checkBadTypes(self, object element, object py_type) except -1
++ cpdef int writeElement(self, object element) except -1
++
++ cpdef int send(self, data) except -1
+--- /dev/null
++++ pyamf-0.6/cpyamf/amf3.pxd
+@@ -0,0 +1,61 @@
++from cpyamf cimport codec, util
++
++
++cdef class ClassDefinition(object):
++ """
++ Holds transient class trait info for an individual encode/decode.
++ """
++
++ cdef readonly object alias
++ cdef Py_ssize_t ref
++ cdef readonly Py_ssize_t attr_len
++ cdef readonly int encoding
++
++ cdef char *encoded_ref
++ cdef Py_ssize_t encoded_ref_size
++
++ cdef readonly list static_properties
++
++ cdef int writeReference(self, util.cBufferedByteStream stream)
++
++
++cdef class Context(codec.Context):
++ cdef codec.IndexedCollection strings
++ cdef dict classes
++ cdef dict class_ref
++ cdef dict proxied_objects
++ cdef Py_ssize_t class_idx
++
++ cpdef object getString(self, Py_ssize_t ref)
++ cpdef Py_ssize_t getStringReference(self, object s) except -2
++ cpdef Py_ssize_t addString(self, object s) except -1
++
++ cpdef int addProxyObject(self, object obj, object proxied) except? -1
++ cpdef object getProxyForObject(self, object obj)
++ cpdef object getObjectForProxy(self, object proxy)
++
++ cpdef object getClassByReference(self, Py_ssize_t ref)
++ cpdef ClassDefinition getClass(self, object klass)
++ cpdef Py_ssize_t addClass(self, ClassDefinition alias, klass) except? -1
++
++
++cdef class Decoder(codec.Decoder):
++ cdef public bint use_proxies
++ cdef readonly Context context
++
++ cdef ClassDefinition _getClassDefinition(self, long ref)
++ cdef int _readStatic(self, ClassDefinition class_def, dict obj) except -1
++ cdef int _readDynamic(self, ClassDefinition class_def, dict obj) except -1
++
++ cdef object readBytes(self)
++ cdef object readInteger(self, int signed=?)
++ cdef object readByteArray(self)
++ cdef object readProxy(self, obj)
++
++
++cdef class Encoder(codec.Encoder):
++ cdef public bint use_proxies
++ cdef readonly Context context
++
++ cdef int writeByteArray(self, object obj) except -1
++ cdef int writeProxy(self, obj) except -1
+--- /dev/null
++++ pyamf-0.6/cpyamf/util.pxd
+@@ -0,0 +1,67 @@
++# Copyright (c) The PyAMF Project.
++# See LICENSE.txt for details.
++
++
++cdef class cBufferedByteStream:
++ """
++ The c version of BufferedByteStream.
++
++ :todo: Need to spend some time marrying these two up.
++ """
++ cdef char endian
++ cdef char *buffer
++ cdef int closed
++ cdef Py_ssize_t pos
++ cdef Py_ssize_t size # total size of the alloc'd buffer
++ cdef Py_ssize_t length
++ cdef Py_ssize_t min_buf_size
++
++ cpdef inline Py_ssize_t tell(self) except -1
++ cdef int write(self, char *buf, Py_ssize_t size) except -1
++ cdef inline int _init_buffer(self)
++ cdef int _actually_increase_buffer(self, Py_ssize_t size) except -1
++ cdef int _increase_buffer(self, Py_ssize_t size) except -1
++ cdef inline bint has_available(self, Py_ssize_t size) except -1
++ cdef int read(self, char **buf, Py_ssize_t size) except -1
++ cpdef bint at_eof(self) except -1
++ cpdef inline Py_ssize_t remaining(self) except -1
++ cpdef int seek(self, Py_ssize_t pos, int mode=*) except -1
++ cpdef object getvalue(self)
++ cdef Py_ssize_t peek(self, char **buf, Py_ssize_t size) except -1
++ cpdef int truncate(self, Py_ssize_t size=?) except -1
++ cpdef int consume(self) except -1
++ cdef int unpack_int(self, unsigned int num_bytes, void *ret) except -1
++ cdef int pack_int(self, int num_bytes, long x) except -1
++ cdef int pack_uint(self, int num_bytes, unsigned long x) except -1
++ cpdef unsigned char read_uchar(self) except? 0
++ cpdef char read_char(self) except? 0
++ cpdef unsigned short read_ushort(self) except? 0
++ cpdef short read_short(self) except? 0
++ cpdef unsigned long read_24bit_uint(self) except? 0
++ cpdef long read_24bit_int(self) except? 0
++ cpdef unsigned long read_ulong(self) except? 0
++ cpdef long read_long(self) except? 0
++ cpdef int write_uchar(self, unsigned char ret) except -1
++ cpdef int write_char(self, char ret) except -1
++ cpdef int write_ushort(self, unsigned short ret) except -1
++ cpdef int write_short(self, short ret) except -1
++ cpdef int write_24bit_uint(self, unsigned long ret) except -1
++ cpdef int write_24bit_int(self, long ret) except -1
++ cpdef int write_ulong(self, unsigned long ret) except -1
++ cpdef int write_long(self, long ret) except -1
++ cpdef object read_utf8_string(self, Py_ssize_t)
++ cpdef int write_utf8_string(self, object obj) except -1
++ cdef int read_double(self, double *obj) except -1
++ cpdef int write_double(self, double val) except -1
++ cdef int read_float(self, float *x) except -1
++ cpdef int write_float(self, float c) except -1
++ cpdef int append(self, object obj) except -1
++
++
++cdef class BufferedByteStream(cBufferedByteStream):
++ """
++ A file like object that mimics StringIO with some extra helper methods.
++
++ Provides the ability to read arbitrary data types from the underlying
++ stream.
++ """
Deleted: packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff
===================================================================
--- packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff 2010-12-27 18:13:25 UTC (rev 15154)
+++ packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff 2010-12-27 18:26:40 UTC (rev 15155)
@@ -1,18 +0,0 @@
-Author: Miguel Landaeta <miguel at miguel.cc>
-Subject: fix typo in a django unit test
-Forwarded: yes
-
-After PyAMF 0.5.1 release, at upstream svn repo in revision 2927,
-this unit test was changed as is showed below.
-
---- pyamf-0.5.1.orig/pyamf/tests/adapters/test_django.py
-+++ pyamf-0.5.1/pyamf/tests/adapters/test_django.py
-@@ -655,7 +655,7 @@ class ImageTestCase(ModelsBaseTestCase):
-
- sa, da = alias.getEncodableAttributes(i)
-
-- self.assertEquals(sa, {'text': '', 'id': 1, 'file': u'foo_'})
-+ self.assertEquals(sa, {'text': '', 'id': 1, 'file': u'foo'})
- self.assertEquals(da, None)
- self.assertTrue(self.executed)
-
Modified: packages/pyamf/trunk/debian/patches/series
===================================================================
--- packages/pyamf/trunk/debian/patches/series 2010-12-27 18:13:25 UTC (rev 15154)
+++ packages/pyamf/trunk/debian/patches/series 2010-12-27 18:26:40 UTC (rev 15155)
@@ -1,3 +1,2 @@
-#fix_typo_in_django_unittest.diff
cython-dbg.diff
-#debian-changes-0.6-1
+cython-declarations.diff
Modified: packages/pyamf/trunk/debian/rules
===================================================================
--- packages/pyamf/trunk/debian/rules 2010-12-27 18:13:25 UTC (rev 15154)
+++ packages/pyamf/trunk/debian/rules 2010-12-27 18:26:40 UTC (rev 15155)
@@ -4,15 +4,13 @@
dh --with python2 $@
override_dh_auto_build:
- #rm -f cpyamf/*.c
- #cython cpyamf/*.pyx
- #set -e; for module in cpyamf/amf3.pyx cpyamf/util.pyx; do cython $${module}; done
+ rm -f cpyamf/*.c
+ cython cpyamf/*.pyx
dh_auto_build
override_dh_auto_clean:
dh_auto_clean
- #-rm -rf PyAMF.egg-info cpyamf/*.so cpyamf/*.c foo unit-tests-results.txt
- rm -rf PyAMF.egg-info cpyamf/*.so foo unit-tests-results.txt
+ -rm -rf PyAMF.egg-info cpyamf/*.so cpyamf/*.c foo unit-tests-results.txt
#override_dh_auto_test:
#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
More information about the Python-modules-commits
mailing list