retab the SWIG input file: whitespace was inconsistent.

1 files changed, 182 insertions, 184 deletions

diff --git a/lang/python/wiredtiger.i b/lang/python/wiredtiger.i
index fb3795f2664..be0c8221d8a 100644
--- a/lang/python/wiredtiger.i
+++ b/lang/python/wiredtiger.i
@@ -5,7 +5,7 @@
  * See the file LICENSE for redistribution information.
  *
  * wiredtiger.i
- * 	The SWIG interface file defining the wiredtiger python API.
+ *	The SWIG interface file defining the wiredtiger python API.
  */
 
 %define DOCSTRING
@@ -26,13 +26,13 @@ from packing import pack, unpack
 
 /* Set the input argument to point to a temporary variable */ 
 %typemap(in, numinputs=0) WT_CONNECTION ** (WT_CONNECTION *temp = NULL) {
-        $1 = &temp;
+	$1 = &temp;
 }
 %typemap(in, numinputs=0) WT_SESSION ** (WT_SESSION *temp = NULL) {
-        $1 = &temp;
+	$1 = &temp;
 }
 %typemap(in, numinputs=0) WT_CURSOR ** (WT_CURSOR *temp = NULL) {
-        $1 = &temp;
+	$1 = &temp;
 }
 
 /* Convert 'int *' to an output arg in search_near, wiredtiger_version */
@@ -43,43 +43,43 @@ from packing import pack, unpack
 
 /* Set the return value to the returned connection, session, or cursor */
 %typemap(argout) WT_CONNECTION ** {
-        $result = SWIG_NewPointerObj(SWIG_as_voidptr(*$1),
-             SWIGTYPE_p___wt_connection, 0);
+	$result = SWIG_NewPointerObj(SWIG_as_voidptr(*$1),
+	    SWIGTYPE_p___wt_connection, 0);
 }
 %typemap(argout) WT_SESSION ** {
-        $result = SWIG_NewPointerObj(SWIG_as_voidptr(*$1),
-             SWIGTYPE_p___wt_session, 0);
+	$result = SWIG_NewPointerObj(SWIG_as_voidptr(*$1),
+	    SWIGTYPE_p___wt_session, 0);
 }
 
 %typemap(argout) WT_CURSOR ** {
-        $result = SWIG_NewPointerObj(SWIG_as_voidptr(*$1),
-             SWIGTYPE_p___wt_cursor, 0);
-        if (*$1 != NULL) {
-                (*$1)->flags |= WT_CURSTD_RAW;
-                PyObject_SetAttrString($result, "is_column",
-                    PyBool_FromLong(strcmp((*$1)->key_format, "r") == 0));
-        }
+	$result = SWIG_NewPointerObj(SWIG_as_voidptr(*$1),
+	    SWIGTYPE_p___wt_cursor, 0);
+	if (*$1 != NULL) {
+		(*$1)->flags |= WT_CURSTD_RAW;
+		PyObject_SetAttrString($result, "is_column",
+		    PyBool_FromLong(strcmp((*$1)->key_format, "r") == 0));
+	}
 }
 
 /* 64 bit typemaps. */
 %typemap(in) uint64_t {
-    $1 = PyLong_AsUnsignedLongLong($input);
+	$1 = PyLong_AsUnsignedLongLong($input);
 }
 %typemap(out) uint64_t {
-    $result = PyLong_FromUnsignedLongLong($1);
+	$result = PyLong_FromUnsignedLongLong($1);
 }
 
 /* Throw away references after close. */
 %define DESTRUCTOR(class, method)
 %feature("shadow") class::method %{
-    def method(self, *args):
-        '''close(self, config) -> int
-        
-        @copydoc class::method'''
-        try:
-            return $action(self, *args)
-        finally:
-            self.this = None
+	def method(self, *args):
+		'''close(self, config) -> int
+		
+		@copydoc class::method'''
+		try:
+			return $action(self, *args)
+		finally:
+			self.this = None
 %}
 %enddef
 DESTRUCTOR(__wt_connection, close)
@@ -99,17 +99,16 @@ static PyObject *wtError;
 %}
 
 %init %{
-        /*
-         * Create an exception type and put it into the _wiredtiger module.
-         * First increment the reference count because PyModule_AddObject
-         * decrements it.  Then note that "m" is the local variable for the
-         * module in the SWIG generated code.  If there is a SWIG variable for
-         * this, I haven't found it.
-         */
-        wtError =
-            PyErr_NewException("_wiredtiger.WiredTigerError", NULL, NULL);
-        Py_INCREF(wtError);
-        PyModule_AddObject(m, "WiredTigerError", wtError);
+	/*
+	 * Create an exception type and put it into the _wiredtiger module.
+	 * First increment the reference count because PyModule_AddObject
+	 * decrements it.  Then note that "m" is the local variable for the
+	 * module in the SWIG generated code.  If there is a SWIG variable for
+	 * this, I haven't found it.
+	 */
+	wtError = PyErr_NewException("_wiredtiger.WiredTigerError", NULL, NULL);
+	Py_INCREF(wtError);
+	PyModule_AddObject(m, "WiredTigerError", wtError);
 %}
 
 %pythoncode %{
@@ -118,55 +117,54 @@ WiredTigerError = _wiredtiger.WiredTigerError
 ## @cond DISABLE
 # Implements the iterable contract
 class IterableCursor:
-        def __init__(self, cursor):
-                self.cursor = cursor
+	def __init__(self, cursor):
+		self.cursor = cursor
 
-        def __iter__(self):
-                return self
+	def __iter__(self):
+		return self
 
-        def next(self):
-                if self.cursor.next() == WT_NOTFOUND:
-                        raise StopIteration
-                return self.cursor.get_keys() + self.cursor.get_values()
+	def next(self):
+		if self.cursor.next() == WT_NOTFOUND:
+			raise StopIteration
+		return self.cursor.get_keys() + self.cursor.get_values()
 ## @endcond
 %}
 
 %typemap(out) int {
-        if ($1 != 0 && $1 != WT_NOTFOUND) {
-                /* We could use PyErr_SetObject for more complex reporting. */
-                SWIG_Python_SetErrorMsg(wtError, wiredtiger_strerror($1));
-                SWIG_fail;
-        }
-        $result = SWIG_From_int((int)($1));
+	if ($1 != 0 && $1 != WT_NOTFOUND) {
+		/* We could use PyErr_SetObject for more complex reporting. */
+		SWIG_Python_SetErrorMsg(wtError, wiredtiger_strerror($1));
+		SWIG_fail;
+	}
+	$result = SWIG_From_int((int)($1));
 }
 
 /*
  * Extra 'self' elimination.
  * The methods we're wrapping look like this:
  * struct __wt_xxx {
- *    int method(WT_XXX *, ...otherargs...);
+ *	int method(WT_XXX *, ...otherargs...);
  * };
  * To SWIG, that is equivalent to:
- *    int method(struct __wt_xxx *self, WT_XXX *, ...otherargs...);
+ *	int method(struct __wt_xxx *self, WT_XXX *, ...otherargs...);
  * and we use consecutive argument matching of typemaps to convert two args to
  * one.
  */
 %define SELFHELPER(type)
 %typemap(in) (type *self, type *) (void *argp = 0, int res = 0) %{
-        res = SWIG_ConvertPtr($input, &argp, $descriptor, $disown | 0);
-        if (!SWIG_IsOK(res)) { 
-                SWIG_exception_fail(SWIG_ArgError(res),
-                    "in method '" "$symname" "', argument " "$argnum"
-                    " of type '" "$type" "'");
-        }
-        $2 = $1 = ($ltype)(argp);
+	res = SWIG_ConvertPtr($input, &argp, $descriptor, $disown | 0);
+	if (!SWIG_IsOK(res)) { 
+		SWIG_exception_fail(SWIG_ArgError(res), "in method '$symname', "
+		    "argument $argnum of type '$type'");
+	}
+	$2 = $1 = ($ltype)(argp);
 %}
 %enddef
 
 SELFHELPER(struct __wt_connection)
 SELFHELPER(struct __wt_session)
 SELFHELPER(struct __wt_cursor)
-     
+
 /* WT_CURSOR customization. */
 /* First, replace the varargs get / set methods with Python equivalents. */
 %ignore __wt_cursor::get_key;
@@ -178,132 +176,132 @@ SELFHELPER(struct __wt_cursor)
 %apply (char *STRING, int LENGTH) { (char *data, int size) };
 
 %extend __wt_cursor {
-        /* Get / set keys and values */
-        void _set_key(char *data, int size) {
-                WT_ITEM k;
-                k.data = data;
-                k.size = (uint32_t)size;
-                $self->set_key($self, &k);
-        }
-
-        void _set_recno(uint64_t recno) {
-                WT_ITEM k;
-                uint8_t recno_buf[20];
-                size_t size;
-                int ret = wiredtiger_struct_pack($self->session,
-                    recno_buf, sizeof (recno_buf), "r", recno);
-                if (ret == 0)
-                        ret = wiredtiger_struct_size($self->session,
-                            &size, "q", recno);
-                if (ret != 0) {
-                        SWIG_Python_SetErrorMsg(wtError,
-                            wiredtiger_strerror(ret));
-                        return;
-                }
-                k.data = recno_buf;
-                k.size = (uint32_t)size;
-                $self->set_key($self, &k);
-        }
-
-        void _set_value(char *data, int size) {
-                WT_ITEM v;
-                v.data = data;
-                v.size = (uint32_t)size;
-                $self->set_value($self, &v);
-        }
-
-        PyObject *_get_key() {
-                WT_ITEM k;
-                int ret = $self->get_key($self, &k);
-                if (ret != 0) {
-                        SWIG_Python_SetErrorMsg(wtError,
-                            wiredtiger_strerror(ret));
-                        return (NULL);
-                }
-                return SWIG_FromCharPtrAndSize(k.data, k.size);
-        }
-
-        PyObject *_get_recno() {
-                WT_ITEM k;
-                uint64_t r;
-                int ret = $self->get_key($self, &k);
-                if (ret == 0)
-                        ret = wiredtiger_struct_unpack(
-			    $self->session, k.data, k.size, "q", &r);
-                if (ret != 0) {
-                        SWIG_Python_SetErrorMsg(wtError,
-                            wiredtiger_strerror(ret));
-                        return (NULL);
-                }
-                return PyLong_FromUnsignedLongLong(r);
-        }
-
-        PyObject *_get_value() {
-                WT_ITEM v;
-                int ret = $self->get_value($self, &v);
-                if (ret != 0) {
-                        SWIG_Python_SetErrorMsg(wtError,
-                            wiredtiger_strerror(ret));
-                        return (NULL);
-                }
-                return SWIG_FromCharPtrAndSize(v.data, v.size);
-        }
+	/* Get / set keys and values */
+	void _set_key(char *data, int size) {
+		WT_ITEM k;
+		k.data = data;
+		k.size = (uint32_t)size;
+		$self->set_key($self, &k);
+	}
+
+	void _set_recno(uint64_t recno) {
+		WT_ITEM k;
+		uint8_t recno_buf[20];
+		size_t size;
+		int ret = wiredtiger_struct_pack($self->session,
+		    recno_buf, sizeof (recno_buf), "r", recno);
+		if (ret == 0)
+			ret = wiredtiger_struct_size($self->session,
+			    &size, "q", recno);
+		if (ret != 0) {
+			SWIG_Python_SetErrorMsg(wtError,
+			    wiredtiger_strerror(ret));
+			return;
+		}
+		k.data = recno_buf;
+		k.size = (uint32_t)size;
+		$self->set_key($self, &k);
+	}
+
+	void _set_value(char *data, int size) {
+		WT_ITEM v;
+		v.data = data;
+		v.size = (uint32_t)size;
+		$self->set_value($self, &v);
+	}
+
+	PyObject *_get_key() {
+		WT_ITEM k;
+		int ret = $self->get_key($self, &k);
+		if (ret != 0) {
+			SWIG_Python_SetErrorMsg(wtError,
+			    wiredtiger_strerror(ret));
+			return (NULL);
+		}
+		return SWIG_FromCharPtrAndSize(k.data, k.size);
+	}
+
+	PyObject *_get_recno() {
+		WT_ITEM k;
+		uint64_t r;
+		int ret = $self->get_key($self, &k);
+		if (ret == 0)
+			ret = wiredtiger_struct_unpack($self->session,
+			    k.data, k.size, "q", &r);
+		if (ret != 0) {
+			SWIG_Python_SetErrorMsg(wtError,
+			    wiredtiger_strerror(ret));
+			return (NULL);
+		}
+		return PyLong_FromUnsignedLongLong(r);
+	}
+
+	PyObject *_get_value() {
+		WT_ITEM v;
+		int ret = $self->get_value($self, &v);
+		if (ret != 0) {
+			SWIG_Python_SetErrorMsg(wtError,
+			    wiredtiger_strerror(ret));
+			return (NULL);
+		}
+		return SWIG_FromCharPtrAndSize(v.data, v.size);
+	}
 
 %pythoncode %{
-        def get_key(self):
-            '''get_key(self) -> object
-            
-            @copydoc WT_CURSOR::get_key
-            Returns only the first column.'''
-            return self.get_keys()[0]
-
-        def get_keys(self):
-            '''get_keys(self) -> (object, ...)
-            
-            @copydoc WT_CURSOR::get_key'''
-            if self.is_column:
-                return [self._get_recno(),]
-            else:
-                return unpack(self.key_format, self._get_key())
-
-        def get_value(self):
-            '''get_value(self) -> object
-            
-            @copydoc WT_CURSOR::get_value
-            Returns only the first column.'''
-            return self.get_values()[0]
-
-        def get_values(self):
-            '''get_values(self) -> (object, ...)
-            
-            @copydoc WT_CURSOR::get_value'''
-            return unpack(self.value_format, self._get_value())
-
-        def set_key(self, *args):
-            '''set_key(self) -> None
-            
-            @copydoc WT_CURSOR::set_key'''
-            if self.is_column:
-                self._set_recno(args[0])
-            else:
-                # Keep the Python string pinned
-                self._key = pack(self.key_format, *args)
-                self._set_key(self._key)
-
-        def set_value(self, *args):
-            '''set_value(self) -> None
-            
-            @copydoc WT_CURSOR::set_value'''
-            # Keep the Python string pinned
-            self._value = pack(self.value_format, *args)
-            self._set_value(self._value)
-
-        def __iter__(self):
-            '''Cursor objects support iteration, equivalent to calling
-            WT_CURSOR::next until it returns ::WT_NOTFOUND.'''
-            if not hasattr(self, '_iterable'):
-                self._iterable = IterableCursor(self)
-            return self._iterable
+	def get_key(self):
+		'''get_key(self) -> object
+		
+		@copydoc WT_CURSOR::get_key
+		Returns only the first column.'''
+		return self.get_keys()[0]
+
+	def get_keys(self):
+		'''get_keys(self) -> (object, ...)
+		
+		@copydoc WT_CURSOR::get_key'''
+		if self.is_column:
+			return [self._get_recno(),]
+		else:
+			return unpack(self.key_format, self._get_key())
+
+	def get_value(self):
+		'''get_value(self) -> object
+		
+		@copydoc WT_CURSOR::get_value
+		Returns only the first column.'''
+		return self.get_values()[0]
+
+	def get_values(self):
+		'''get_values(self) -> (object, ...)
+		
+		@copydoc WT_CURSOR::get_value'''
+		return unpack(self.value_format, self._get_value())
+
+	def set_key(self, *args):
+		'''set_key(self) -> None
+		
+		@copydoc WT_CURSOR::set_key'''
+		if self.is_column:
+			self._set_recno(args[0])
+		else:
+			# Keep the Python string pinned
+			self._key = pack(self.key_format, *args)
+			self._set_key(self._key)
+
+	def set_value(self, *args):
+		'''set_value(self) -> None
+		
+		@copydoc WT_CURSOR::set_value'''
+		# Keep the Python string pinned
+		self._value = pack(self.value_format, *args)
+		self._set_value(self._value)
+
+	def __iter__(self):
+		'''Cursor objects support iteration, equivalent to calling
+		WT_CURSOR::next until it returns ::WT_NOTFOUND.'''
+		if not hasattr(self, '_iterable'):
+			self._iterable = IterableCursor(self)
+		return self._iterable
 %}
 };