--- projects/libstatgrab/extras/python/statgrab.pyx	2004/02/13 00:16:20	1.5
+++ projects/libstatgrab/extras/python/statgrab.pyx	2004/02/13 17:53:15	1.7
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# $Id: statgrab.pyx,v 1.5 2004/02/13 00:16:20 tdb Exp $
+# $Id: statgrab.pyx,v 1.7 2004/02/13 17:53:15 tdb Exp $
 #
 
 ctypedef long time_t
@@ -100,15 +100,15 @@ cdef extern from "statgrab.h":
         long long rx
         time_t systime
 
-    ctypedef enum duplex:
+    ctypedef enum statgrab_duplex:
         FULL_DUPLEX
         HALF_DUPLEX
-        NO_DUPLEX
+        UNKNOWN_DUPLEX
 
     ctypedef struct network_iface_stat_t:
         char *interface_name
         int speed
-        duplex dup
+        statgrab_duplex dup
 
     ctypedef struct page_stat_t:
         long long pages_pagein
@@ -136,6 +136,11 @@ cdef extern from "statgrab.h":
     cdef extern int statgrab_drop_privileges()
 
 
+py_FULL_DUPLEX = FULL_DUPLEX
+py_HALF_DUPLEX = HALF_DUPLEX
+py_UNKNOWN_DUPLEX = UNKNOWN_DUPLEX
+
+
 class Result:
     def __init__(self, attrs):
         self.attrs = attrs
@@ -272,7 +277,7 @@ def py_get_disk_stats():
     s = get_disk_stats(&entries)
     if s == NULL:
         raise StatgrabException, 'get_disk_stats() returned NULL'
-    list = [entries]
+    list = []
     for i from 0 <= i < entries:
         list.append(Result(
             {'device_name': s.device_name,
@@ -295,7 +300,7 @@ def py_get_diskio_stats():
     s = get_diskio_stats(&entries)
     if s == NULL:
         raise StatgrabException, 'get_diskio_stats() returned NULL'
-    list = [entries]
+    list = []
     for i from 0 <= i < entries:
         list.append(Result(
             {'disk_name': s.disk_name,
@@ -313,7 +318,7 @@ def py_get_diskio_stats_diff():
     s = get_diskio_stats_diff(&entries)
     if s == NULL:
         raise StatgrabException, 'get_diskio_stats_diff() returned NULL'
-    list = [entries]
+    list = []
     for i from 0 <= i < entries:
         list.append(Result(
             {'disk_name': s.disk_name,
@@ -345,7 +350,7 @@ def py_get_network_stats():
     s = get_network_stats(&entries)
     if s == NULL:
         raise StatgrabException, 'get_network_stats() returned NULL'
-    list = [entries]
+    list = []
     for i from 0 <= i < entries:
         list.append(Result(
             {'interface_name': s.interface_name,
@@ -363,7 +368,7 @@ def py_get_network_stats_diff():
     s = get_network_stats_diff(&entries)
     if s == NULL:
         raise StatgrabException, 'get_network_stats_diff() returned NULL'
-    list = [entries]
+    list = []
     for i from 0 <= i < entries:
         list.append(Result(
             {'interface_name': s.interface_name,
@@ -381,7 +386,7 @@ def py_get_network_iface_stats():
     s = get_network_iface_stats(&entries)
     if s == NULL:
         raise StatgrabException, 'get_network_iface_stats() returned NULL'
-    list = [entries]
+    list = []
     for i from 0 <= i < entries:
         list.append(Result(
             {'interface_name': s.interface_name,