Expose the localOnly option to sane.get_devices()

Author: manisandro

CHANGES.rst

@@ -1,5 +1,5 @@
 Version 2.8.0
------------
+-------------
 
 - _sane.c:
 
@@ -14,6 +14,7 @@ Version 2.8.0
   - Make arr_snap return a 3D numpy array, shaped (samples, width, heigth)
   - Remove multipleOf support in arr_snap, this should be done by the caller
   - Overall cleanup
+  - Expose the localOnly option to sane.get_devices()
 
 - Documentation:
 

_sane.c

@@ -46,8 +46,8 @@ PERFORMANCE OF THIS SOFTWARE.
 static PyObject *ErrorObject;
 
 typedef struct {
-	PyObject_HEAD
-	SANE_Handle h;
+  PyObject_HEAD
+  SANE_Handle h;
 } SaneDevObject;
 
 static PyTypeObject SaneDev_Type;
@@ -402,8 +402,6 @@ SaneDev_set_auto_option(SaneDevObject *self, PyObject *args)
   return Py_BuildValue("i", i);
 }
 
-#define READSIZE 32768
-
 static PyObject *
 SaneDev_snap(SaneDevObject *self, PyObject *args)
 {
@@ -482,7 +480,6 @@ SaneDev_snap(SaneDevObject *self, PyObject *args)
 
       int imgBufOffset = imgBufCurLine * imgBytesPerLine;
       /* Copy data to image buffer */
-      /* Recall: imgBytesPerLine = p.pixels_per_line * (p.format == SANE_FRAME_RGB ? 3 : 1); */
       if(p.format == SANE_FRAME_GRAY || p.format == SANE_FRAME_RGB)
         {
           if(p.depth == 1)
@@ -645,7 +642,7 @@ PySane_init(PyObject *self, PyObject *args)
 
   return Py_BuildValue("iiii", version,
                        SANE_VERSION_MAJOR(version),
-		       SANE_VERSION_MINOR(version),
+                       SANE_VERSION_MINOR(version),
                        SANE_VERSION_BUILD(version));
 }
 

sane.py

@@ -355,9 +355,10 @@ def init():
     return _sane.init()
 
 
-def get_devices():
+def get_devices(localOnly=False):
     """
     Return a list of 4-tuples containing the available scanning devices.
+    If `localOnly` is `True`, only local devices will be returned.
     Each tuple is of the format ``(device_name, vendor, model, type)``, with:
 
     * `device_name` -- The device name, suitable for passing to :func:`sane.open`.
@@ -369,7 +370,7 @@ def get_devices():
     :raises _sane.error: If an error occurs.
 
     """
-    return _sane.get_devices()
+    return _sane.get_devices(localOnly)
 
 
 def open(devname):