From b18334d13cd65d8eff268ace564e64d325d01c67 Mon Sep 17 00:00:00 2001
From: Evan Broder <broder@mit.edu>
Date: Thu, 19 Nov 2009 12:03:31 -0500
Subject: [PATCH] For consistency, use "cdef extern" everywhere instead of
 "cdef import"

Signed-off-by: Evan Broder <broder@mit.edu>
---
 afs/_acl.pyx |    2 +-
 afs/_pts.pyx |    6 +++---
 afs/afs.pxd  |    2 +-
 afs/afs.pyx  |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/afs/_acl.pyx b/afs/_acl.pyx
index 3f34685..4090ff7 100644
--- a/afs/_acl.pyx
+++ b/afs/_acl.pyx
@@ -1,7 +1,7 @@
 from afs cimport *
 from afs import pyafs_error
 
-cdef import from "afs/prs_fs.h":
+cdef extern from "afs/prs_fs.h":
     enum:
         PRSFS_READ, PRSFS_WRITE, PRSFS_INSERT, PRSFS_LOOKUP,
         PRSFS_DELETE, PRSFS_LOCK, PRSFS_ADMINISTER,
diff --git a/afs/_pts.pyx b/afs/_pts.pyx
index c347037..420c739 100644
--- a/afs/_pts.pyx
+++ b/afs/_pts.pyx
@@ -2,7 +2,7 @@ from afs cimport *
 from afs import pyafs_error
 import re
 
-cdef import from "afs/ptuser.h":
+cdef extern from "afs/ptuser.h":
     enum:
         PR_MAXNAMELEN
         PRGRP
@@ -68,11 +68,11 @@ cdef import from "afs/ptuser.h":
     int ubik_PR_ListEntries(ubik_client *, afs_int32, afs_int32, afs_int32, prentries *, afs_int32 *)
     int ubik_PR_SetFieldsEntry(ubik_client *, afs_int32, afs_int32, afs_int32, afs_int32, afs_int32, afs_int32, afs_int32, afs_int32)
 
-cdef import from "afs/pterror.h":
+cdef extern from "afs/pterror.h":
     enum:
         PRNOENT
 
-cdef import from "krb5/krb5.h":
+cdef extern from "krb5/krb5.h":
     struct _krb5_context:
         pass
     struct krb5_principal_data:
diff --git a/afs/afs.pxd b/afs/afs.pxd
index b5180f5..aacba3b 100644
--- a/afs/afs.pxd
+++ b/afs/afs.pxd
@@ -155,7 +155,7 @@ cdef extern from "afs/vice.h":
         unsigned short out_size
         unsigned short in_size
 
-cdef import from "afs/venus.h":
+cdef extern from "afs/venus.h":
     enum:
         # PIOCTLS to Venus that we use
         VIOCGETAL, VIOC_GETVCXSTATUS2, VIOCSETAL, VIOC_FILE_CELL_NAME
diff --git a/afs/afs.pyx b/afs/afs.pyx
index 4fe9e1c..f7f167b 100644
--- a/afs/afs.pyx
+++ b/afs/afs.pyx
@@ -5,8 +5,8 @@ General PyAFS utilities, such as error handling
 import sys
 
 # otherwise certain headers are unhappy
-cdef import from "netinet/in.h": pass
-cdef import from "afs/vice.h": pass
+cdef extern from "netinet/in.h": pass
+cdef extern from "afs/vice.h": pass
 
 cdef int _init = 0
 
-- 
1.7.9.5