From 5a5c7536d307aa12c040f89b4d5048fcd8b1a1f6 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Sun, 26 Jul 2009 02:54:41 +0200 Subject: Get rid of the self-implemented file-stuff. Use the normal python-API instead --- portato/eix/eix_utils.pyx | 57 ----------------------------------------------- 1 file changed, 57 deletions(-) (limited to 'portato/eix/eix_utils.pyx') diff --git a/portato/eix/eix_utils.pyx b/portato/eix/eix_utils.pyx index 57fa5d7..0ea9603 100644 --- a/portato/eix/eix_utils.pyx +++ b/portato/eix/eix_utils.pyx @@ -1,15 +1,3 @@ -class EndOfFileError (IOError): - - def __init__ (self, filename = None): - self.message = "End of file reached while not expecting it" - self.filename = filename - - def __str__ (self): - if self.filename is not None: - return "%s: %s" % (self.message, self.filename) - else: - return self.message - cdef char* strdup (char * other) except NULL: cdef size_t len cdef char* new @@ -25,48 +13,3 @@ cdef char* strdup (char * other) except NULL: return NULL return strcpy(new, other) - - -cdef File* fopen (char* path, char* mode) except NULL: - cdef File* f - - f = PyMem_Malloc(sizeof(File)) - - if f is NULL: - raise MemoryError, "Malloc of File" - return NULL - - f.file = c_fopen(path, mode) - - if f.file is NULL: - raise IOError, (errno, strerror(errno), path) - return NULL - - f.name = strdup(path) - - if f.name is NULL: - return NULL - - return f - -cdef void fclose (File* f): - c_fclose(f.file) - ffree(f.name) - PyMem_Free(f) - -cdef void ffree (void* p): - PyMem_Free(p) - -cdef char* fget (File* f, size_t n) except NULL: - cdef char* buf - buf = PyMem_Malloc(n) - - if buf is NULL: - raise MemoryError, "Malloc" - return NULL - - if (fread(buf, 1, n, f.file) != n): - PyMem_Free(buf) - raise EndOfFileError, f.name - - return buf -- cgit v1.2.3-54-g00ecf