First shot at making pypx more pythoinc.

Author: nilsfr

.gitignore

@@ -1,2 +1,7 @@
-build/
-pxpy.c
+*.pyc
+/build/
+/pxpy.c
+/.pyrex/
+/dist/
+/pxpy.so
+/*.egg-info/

Makefile

@@ -8,7 +8,7 @@
 # 
 
 all:
-	python Setup.py build_ext --inplace
+	python setup.py build_ext --inplace
 
 clean:
 	rm -f *.c *.o *.so *~ core

pxpy.pyx

@@ -21,6 +21,12 @@ import datetime
 
 import sys
 
+cdef extern from *:
+    ctypedef char* const_char_ptr "const char*"
+
+from cpython.mem cimport PyMem_Malloc, PyMem_Free
+from cpython.version cimport PY_MAJOR_VERSION
+
 from libc.stdlib cimport *
 cdef extern from "stdlib.h" nogil:
     void *memset(void *str, int c, size_t n)
@@ -35,6 +41,8 @@ cdef extern from "Python.h":
 
 cdef extern from "string.h":
     int strnlen(char *s, int maxlen)
+    char *strcpy(char *, char *)
+
 
 cdef extern from "paradox.h":
     ctypedef enum fieldtype_t:
@@ -116,13 +124,27 @@ cdef extern from "paradox.h":
     ctypedef struct pxpindex_t
     ctypedef struct pxstream_t
 
+    
+    ctypedef struct Pxval_str:
+        char *val
+        int len
+    ctypedef union Pxval_value:
+        long lval
+        double dval
+        Pxval_str str
+    ctypedef struct pxval_t:
+        char isnull
+        int type
+        Pxval_value value
+        
+        
     pxdoc_t *PX_new()
-    pxdoc_t* PX_new2(void  (*errorhandler)(pxdoc_t *p, int type, char *msg, void *data),
-                     void* (*allocproc)(pxdoc_t *p, size_t size, char *caller),
-                     void* (*reallocproc)(pxdoc_t *p, void *mem, size_t size, char *caller),
+    pxdoc_t* PX_new2(void  (*errorhandler)(pxdoc_t *p, int type, const_char_ptr msg, void *data),
+                     void* (*allocproc)(pxdoc_t *p, size_t size, const_char_ptr caller),
+                     void* (*reallocproc)(pxdoc_t *p, void *mem, size_t size, const_char_ptr caller),
                      void  (*freeproc)(pxdoc_t *p, void *mem))
     char *PX_strdup(pxdoc_t *pxdoc, char *str)
-    int PX_open_file(pxdoc_t *pxdoc, char *filename)
+    int PX_open_file(pxdoc_t *pxdoc, const_char_ptr filename)
     int PX_create_file(pxdoc_t *pxdoc, pxfield_t *px_fields, unsigned int numfields,  char *filename, int type)
     int PX_read_primary_index(pxdoc_t *pindex)
     int PX_add_primary_index(pxdoc_t *pxdoc, pxdoc_t *pindex)
@@ -163,14 +185,15 @@ cdef class PXDoc:
     """
 
     cdef pxdoc_t *doc
-    cdef char *filename
+    cdef bytes filename
     cdef char isopen
 
     def __init__(self, filename):
         """
         Create a PXDoc instance, associated to the given external filename.
         """
-
+        if PY_MAJOR_VERSION >= 3 or isinstance(filename, unicode):
+            filename = filename.encode('utf8')
         self.filename = filename
         self.doc = PX_new2(&errorhandler, NULL, NULL, NULL)
         self.isopen = 0
@@ -179,8 +202,7 @@ cdef class PXDoc:
         """
         Open the data file.
         """
-
-        if PX_open_file(self.doc, self.filename)<0:
+        if PX_open_file(self.doc, self.filename) < 0:
             raise Exception("Couldn't open `%s`" % self.filename)
         self.isopen = 1
 
@@ -357,7 +379,7 @@ cdef class Table(PXDoc):
         Get number of fields in the table.
         """
 
-        return self.record.getFieldsCount()
+        return len(self.record)
 
     def readRecord(self, recno=None):
         """
@@ -376,17 +398,36 @@ cdef class Table(PXDoc):
         """
 
         if not recno:
-            recno = self.current_recno+1
+            recno = self.current_recno + 1
         else:
             self.current_recno = recno
 
-        if recno>=self.doc.px_head.px_numrecords:
+        if recno >= self.doc.px_head.px_numrecords:
             return False
 
         self.current_recno = recno
 
         return self.record.read(recno)
 
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        ok = self.readRecord()
+        if not ok:
+            self.current_recno = -1
+            raise StopIteration()
+        return self.record
+
+    def __getitem__(self, key):
+        if key >= self.doc.px_head.px_numrecords:
+            raise IndexError()
+        self.record.read(key)
+        return self.record
+
+    def __len__(self):
+        return self.doc.px_head.px_numrecords
+
     def append(self, values):
         cdef char *b
         l = len(self.fields)
@@ -629,6 +670,7 @@ cdef class Record:
     """
 
     cdef void *data
+    cdef int current_fieldno
     cdef Table table
     cdef public fields
 
@@ -643,15 +685,17 @@ cdef class Record:
         self.data = table.doc.malloc(table.doc,
                                      table.doc.px_head.px_recordsize,
                                      "Memory for record")
+        self.current_fieldno = -1
+
         self.table = table
         self.fields = []
         offset = 0
-        for i in range(self.getFieldsCount()):
+        for i in range(len(self)):
             field = RecordField(self, i, offset)
             self.fields.append(field)
-            offset = offset + table.doc.px_head.px_fields[i].px_flen
+            offset = offset + table.doc.px_head.px_fields[i].px_flen        
 
-    def getFieldsCount(self):
+    def __len__(self):
         """
         Get number of fields in the record.
         """
@@ -667,3 +711,18 @@ cdef class Record:
                                                                   self.table.filename))
         return True
 
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        fieldno = self.current_fieldno + 1
+        try:
+            field = self.fields[fieldno]
+            self.current_fieldno = fieldno
+            return field
+        except IndexError:
+            self.current_fieldno = -1
+            raise StopIteration()
+
+    def __getitem__(self, key):
+        return self.fields[key]

setup.py

@@ -1,31 +1,56 @@
-#  -*- Python -*- -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 # :Project:  pxpy -- Module setup
 # :Source:   $Source: /cvsroot/pxlib/bindings/python/Setup.py,v $
 # :Created:  Sun, Apr 04 2004 00:14:12 CEST
 # :Author:   Lele Gaifax <[email protected]>
 # :Revision: $Revision: 1.3 $ by $Author: lele $
 # :Date:     $Date: 2004/07/19 23:04:35 $
 #
+import os
+import sys
 
-from distutils.core import setup
-from distutils.extension import Extension
+sys.path.append(os.path.join(os.path.dirname(__file__), '.pyrex'))
+
+from setuptools import setup, Extension
+from distutils.command.clean import clean as _clean
+from distutils import log
 from Cython.Distutils import build_ext
 
 
-setup(
-  name = 'python-pxlib',
-  description = "Python wrapper around pxlib",
-  version = '0.0.1',
-  author = "Lele Gaifax",
-  author_email = "[email protected]",
-  url = "http://pxlib.sourceforge.net/",
+class clean(_clean):
+    """
+    Subclass clean so it removes all the Cython generated C files.
+    """
+    
+    def run(self):
+        super(_clean, self).run()
+        for ext in self.distribution.ext_modules:
+            cy_sources = [s for s in ext.sources if s.endswith('.pyx')]
+            for cy_source in cy_sources:
+                c_source = cy_source[:-3] + 'c'
+                if os.path.exists(c_source):
+                    log.info('removing %s', c_source)
+                    os.remove(c_source)
 
-  ext_modules=[
-    Extension("pxpy", ["pxpy.pyx"],
-              # Uncomment, to use current version
-              #include_dirs=["../../pxlib/include/"],
-              #library_dirs=["../../pxlib/src/.libs"],
-              libraries=["px"]),
+setup(
+    name='python-pxlib',
+    description="Python wrapper around pxlib",
+    version='0.0.1',
+    author="Lele Gaifax",
+    author_email = "[email protected]",
+    url = "http://pxlib.sourceforge.net/",
+    test_suite='tests',
+    cmdclass={
+        'build_ext': build_ext,
+        'clean': clean
+    },
+    data_files=[
+        ('', ['pxpy.pyx'])
     ],
-  cmdclass = {'build_ext': build_ext}
-)
+    zip_safe=False,
+    setup_requires=["Cython>=0.13"],
+    ext_modules=[
+        Extension('pxpy', ['pxpy.pyx'],
+                  libraries=['px']),
+        ],
+    )

test.py

@@ -0,0 +1,51 @@
+#! /usr/bin/python
+# -*- mode: python; coding: utf-8 -*-
+# :Project:  pxpy -- silly tester
+# :Source:   $Source: /cvsroot/pxlib/bindings/python/test.py,v $
+# :Created:  Thu, May 13 2004 01:48:30 CEST
+# :Author:   Lele Gaifax <[email protected]>
+# :Revision: $Revision: 1.2 $ by $Author: lele $
+# :Date:     $Date: 2004/07/19 14:38:04 $
+# 
+import unittest
+import os.path
+import pxpy
+
+FIXTURE_DIR = os.path.join(os.path.dirname(__file__), 'fixtures')
+
+class PxLibTest(unittest.TestCase):
+    def test_iteration(self):
+        table = pxpy.Table(os.path.join(FIXTURE_DIR, 'LAND.DB'))
+        table.open()
+
+        self.assertEqual(table.getFieldsCount(), 9)
+        self.assertEqual(len(table), 216)
+        try:
+            table[216]
+        except IndexError:
+            pass
+        else:
+            self.fail()
+        try:
+            table[0][10]
+        except IndexError:
+            pass
+        else:
+            self.fail()
+        
+        afg = table[0][2]
+        self.assertEquals(afg.getValue(), 'Afghanistan')
+        self.assertEquals(afg.fname, 'Land_navn')
+
+        for i, record in enumerate(table):
+            for j, field in enumerate(record):
+                same_field = table[i][j]
+                self.assertEquals(field.getValue(), same_field.getValue())
+                self.assertEquals(field.fname, same_field.fname)
+        table.close()
+        
+
+if __name__ == "__main__":
+    unittest.main()
+
+