5 files changed, 113 insertions, 134 deletions
diff --git a/portato/eix.py b/portato/eix.py
new file mode 100644
index 0000000..927870e
--- /dev/null
+++ b/portato/eix.py
@@ -0,0 +1,113 @@
+# -*- coding: utf-8 -*-
+#
+# File: portato/eix.py
+# This file is part of the Portato-Project, a graphical portage-frontend.
+#
+# Copyright (C) 2006-2009 René 'Necoro' Neumann
+# This is free software.  You may redistribute copies of it under the terms of
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#
+# Written by René 'Necoro' Neumann <necoro@necoro.net>
+
+from __future__ import absolute_import, with_statement
+
+import struct
+from functools import wraps
+
+from .helper import debug
+
+class EixError (Exception):
+    message = "Unknown error."
+
+    def __str__ (self):
+        return self.message
+
+class EndOfFileException (EixError):
+
+    def __init__ (self, filename):
+        self.message = "End of file reached though it was not expected: '%s'" % filename
+
+class EixReaderClosed (EixError):
+    message = "EixReader is already closed."
+
+class UnsupportedVersionError (EixError):
+
+    def __init__ (self, version):
+        self.message = "Version '%s' is not supported." % version
+
+class EixReader (object):
+    supported_versions = (28, )
+
+    def __init__ (self, filename):
+        self.filename = filename
+        self.file = open(filename, "r")
+        self.closed = 0
+        
+        try:
+            self.version = self.get_number()
+
+            if self.version not in self.supported_versions:
+                raise UnsupportedVersionError(self.version)
+
+            debug("Started EixReader for version %s.", self.version)
+        except:
+            self.close()
+            raise
+
+    def check_closed (f):
+        @wraps(f)
+        def wrapper (self, *args, **kwargs):
+            if self.closed:
+                raise EixReaderClosed
+
+            return f(self, *args, **kwargs)
+        return wrapper
+
+    @check_closed
+    def get_number (self):
+        n = self._get_bytes(1)
+
+        if n < 0xFF:
+            value = n
+        else:
+            count = 0
+
+            while (n == 0xFF):
+                count += 1
+                n = self._get_bytes(1)
+
+            if n == 0:
+                n = 0xFF # 0xFF is encoded as 0xFF 0x00
+                count -= 1
+            
+            value = n << (count*8)
+
+            if count > 0:
+                rest = self._get_bytes(count, expect_list = True)
+
+                for i, r in enumerate(rest):
+                    value += r << ((count - i - 1)*8)
+            
+        return value
+
+    def _get_bytes (self, length, expect_list = False):
+        s = self.file.read(length)
+
+        if len(s) != length:
+            raise EndOfFileException, self.filename
+
+        if length == 1 and not expect_list:
+            return ord(s) # is faster than unpack and we have a scalar
+        else:
+            return struct.unpack("%sB" % length, s)
+
+    @check_closed
+    def close (self):
+        if self.closed:
+            raise EixReaderClosed
+        
+        self.file.close()
+        self.closed = 1
+        
+        debug("EixReader closed.")
diff --git a/portato/eix/__init__.py b/portato/eix/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/portato/eix/__init__.py
+++ /dev/null
diff --git a/portato/eix/eix_utils.pxd b/portato/eix/eix_utils.pxd
deleted file mode 100644
index 39f60a9..0000000
--- a/portato/eix/eix_utils.pxd
+++ /dev/null
@@ -1,17 +0,0 @@
-cdef extern from *:
-    ctypedef int size_t
-
-cdef extern from "errno.h":
-    int errno
-
-cdef extern from "string.h":
-    char* strerror (int errno)
-    size_t strlen (char* s)
-    char* strcpy (char* dest, char* src)
-
-cdef extern from "Python.h":
-    void* PyMem_Malloc (size_t n)
-    void PyMem_Free (void* p)
-
-cdef:
-    char* strdup (char* other) except NULL
diff --git a/portato/eix/eix_utils.pyx b/portato/eix/eix_utils.pyx
deleted file mode 100644
index 0ea9603..0000000
--- a/portato/eix/eix_utils.pyx
+++ /dev/null
@@ -1,15 +0,0 @@
-cdef char* strdup (char * other) except NULL:
-    cdef size_t len
-    cdef char* new
-
-    if other is NULL:
-        return NULL
-
-    len = strlen(other)
-    new = <char*>PyMem_Malloc(len+1)
-
-    if new is NULL:
-        raise MemoryError, "Malloc of new string copy"
-        return NULL
-
-    return strcpy(new, other)
diff --git a/portato/eix/libeix.pyx b/portato/eix/libeix.pyx
deleted file mode 100644
index 2a1c7df..0000000
--- a/portato/eix/libeix.pyx
+++ /dev/null
@@ -1,102 +0,0 @@
-class EixError (Exception):
-    message = "Unknown error."
-
-    def __str__ (self):
-        return self.message
-
-class EndOfFileException (EixError):
-
-    def __init__ (self, filename):
-        self.message = "End of file reached though it was not expected: '%s'" % filename
-
-class EixReaderClosed (EixError):
-    message = "EixReader is already closed."
-
-class UnsupportedVersionError (EixError):
-
-    def __init__ (self, version):
-        self.message = "Version '%s' is not supported." % version
-
-cdef class EixReader (object):
-    cdef object file
-    cdef char closed
-    
-    cdef readonly object filename
-    cdef readonly object version
-
-    supported_versions = (28, )
-
-    def __init__ (self, filename):
-        self.filename = filename
-        self.file = open(filename, "r")
-        self.closed = 0
-        
-        self.version = self._get_number()
-
-        if self.version not in self.supported_versions:
-            raise UnsupportedVersionError(self.version)
-
-    cdef unsigned long _get_number (self) except *:
-        cdef unsigned char n
-        cdef short count, i
-        cdef unsigned long value
-        cdef char* rest
-        cdef object orest
-
-        n = self._get_one_byte()
-
-        if n < 0xFF:
-            value = n
-        else:
-            count = 0
-
-            while (n == 0xFF):
-                count += 1
-                n = self._get_one_byte()
-
-            if n == 0:
-                n = 0xFF # 0xFF is encoded as 0xFF 0x00
-                count -= 1
-            
-            value = n << (count*8)
-
-            if count > 0:
-                orest = self.get_string(count)
-                rest = orest # cast to char*
-
-                for 0 <= i < count:
-                    value += (<unsigned char>rest[i]) << ((count - i - 1)*8)
-
-        return value
-
-    cdef unsigned char _get_one_byte (self) except? 0:
-        s = self.file.read(1)
-
-        if len(s) != 1:
-            raise EndOfFileException, self.filename
-        
-        return ord(s)
-
-    cdef object _get_string (self, length):
-        if self.closed:
-            raise EixReaderClosed
-
-        s = self.file.read(length)
-
-        if len(s) != length:
-            raise EndOfFileException, self.filename
-
-        return s
-
-    def get_number (self):
-        if self.closed:
-            raise EixReaderClosed
-        
-        return self._get_number()
-
-    def close (self):
-        if self.closed:
-            raise EixReaderClosed
-        
-        self.file.close()
-        self.closed = 1