Rename afs.afs to afs._util so that absolute imports from afs work.

Signed-off-by: Evan Broder <broder@mit.edu>

diff --git a/.gitignore b/.gitignore
index 93a4719..4267774 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-afs/afs.c
-afs/afs.dep
+afs/_util.c
+afs/_util.dep

 afs/_pts.c
 afs/_pts.dep
 afs/_acl.c
 afs/_pts.c
 afs/_pts.dep
 afs/_acl.c

diff --git a/afs/_acl.pyx b/afs/_acl.pyx
index 4090ff7..bf1b1f9 100644 (file)
--- a/afs/_acl.pyx
+++ b/afs/_acl.pyx
@@ -1,5 +1,5 @@
-from afs cimport *
-from afs import pyafs_error
+from afs._util cimport *
+from afs._util import pyafs_error

 
 cdef extern from "afs/prs_fs.h":
     enum:
 
 cdef extern from "afs/prs_fs.h":
     enum:

diff --git a/afs/_fs.pyx b/afs/_fs.pyx
index 75653e2..57ac603 100644 (file)
--- a/afs/_fs.pyx
+++ b/afs/_fs.pyx
@@ -1,5 +1,5 @@
-from afs cimport *
-from afs import pyafs_error
+from afs._util cimport *
+from afs._util import pyafs_error

 
 def whichcell(char* path):
     """Determine which AFS cell a particular path is in."""
 
 def whichcell(char* path):
     """Determine which AFS cell a particular path is in."""

diff --git a/afs/_pts.pyx b/afs/_pts.pyx
index 420c739..3c10b70 100644 (file)
--- a/afs/_pts.pyx
+++ b/afs/_pts.pyx
@@ -1,5 +1,5 @@
-from afs cimport *
-from afs import pyafs_error
+from afs._util cimport *
+from afs._util import pyafs_error

 import re
 
 cdef extern from "afs/ptuser.h":
 import re
 
 cdef extern from "afs/ptuser.h":

diff --git a/afs/afs.pxd b/afs/_util.pxd
similarity index 100%
rename from afs/afs.pxd
rename to afs/_util.pxd

diff --git a/afs/afs.pyx b/afs/_util.pyx
similarity index 100%
rename from afs/afs.pyx
rename to afs/_util.pyx

diff --git a/setup.py b/setup.py
index 2a92096..47cf789 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ setup(
     requires=['Cython'],
     packages=['afs', 'afs.tests'],
     ext_modules=[
     requires=['Cython'],
     packages=['afs', 'afs.tests'],
     ext_modules=[

-        PyAFSExtension("afs.afs"),
+        PyAFSExtension("afs._util"),

         PyAFSExtension("afs._acl"),
         PyAFSExtension("afs._fs"),
         PyAFSExtension("afs._pts", libraries=['krb5']),
         PyAFSExtension("afs._acl"),
         PyAFSExtension("afs._fs"),
         PyAFSExtension("afs._pts", libraries=['krb5']),