* python/*.cc: Use PyObject_AsFileDescriptor instead of fileno(PyFile_AsFile)

Replace support for file objects with a more generic support for any object
providing a fileno() method and for file descriptors (integers).

This also helps us to port to Python 3, where the previously used PyFile_
functions are not available anymore.

1 files changed, 6 insertions, 6 deletions

diff --git a/python/apt_pkgmodule.cc b/python/apt_pkgmodule.cc
index 1417e5d0..10d98911 100644
--- a/python/apt_pkgmodule.cc
+++ b/python/apt_pkgmodule.cc
@@ -184,10 +184,10 @@ static PyObject *md5sum(PyObject *Self,PyObject *Args)
    }
 
    // Digest of a file
-   if (PyFile_Check(Obj) != 0)
+   int Fd = PyObject_AsFileDescriptor(Obj);
+   if (Fd != -1)
    {
       MD5Summation Sum;
-      int Fd = fileno(PyFile_AsFile(Obj));
       struct stat St;
       if (fstat(Fd,&St) != 0 ||
 	  Sum.AddFD(Fd,St.st_size) == false)
@@ -224,10 +224,10 @@ static PyObject *sha1sum(PyObject *Self,PyObject *Args)
    }
 
    // Digest of a file
-   if (PyFile_Check(Obj) != 0)
+   int Fd = PyObject_AsFileDescriptor(Obj);
+   if (Fd != -1)
    {
       SHA1Summation Sum;
-      int Fd = fileno(PyFile_AsFile(Obj));
       struct stat St;
       if (fstat(Fd,&St) != 0 ||
 	  Sum.AddFD(Fd,St.st_size) == false)
@@ -264,10 +264,10 @@ static PyObject *sha256sum(PyObject *Self,PyObject *Args)
    }
 
    // Digest of a file
-   if (PyFile_Check(Obj) != 0)
+   int Fd = PyObject_AsFileDescriptor(Obj);
+   if (Fd != -1)
    {
       SHA256Summation Sum;
-      int Fd = fileno(PyFile_AsFile(Obj));
       struct stat St;
       if (fstat(Fd,&St) != 0 ||
 	  Sum.AddFD(Fd,St.st_size) == false)