summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/cextension
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-08-07 12:01:19 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-08-07 12:01:19 -0400
commit5a02c9e73fe7e4bcafa6c07bce29131eefb5a022 (patch)
tree9c2d4a43a5ce22ad08d0417c80833b12c2cd483f /lib/sqlalchemy/cextension
parenta67df35e52f9bff3116c12ceff84e1a3308b276c (diff)
downloadsqlalchemy-5a02c9e73fe7e4bcafa6c07bce29131eefb5a022.tar.gz
- break out engine/base.py into base, interfaces, result, util.
- remove deprecated 0.7 engine methods
Diffstat (limited to 'lib/sqlalchemy/cextension')
-rw-r--r--lib/sqlalchemy/cextension/resultproxy.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/sqlalchemy/cextension/resultproxy.c b/lib/sqlalchemy/cextension/resultproxy.c
index 518209e54..ca3a8f40b 100644
--- a/lib/sqlalchemy/cextension/resultproxy.c
+++ b/lib/sqlalchemy/cextension/resultproxy.c
@@ -13,8 +13,8 @@ typedef int Py_ssize_t;
#define PY_SSIZE_T_MAX INT_MAX
#define PY_SSIZE_T_MIN INT_MIN
typedef Py_ssize_t (*lenfunc)(PyObject *);
-#define PyInt_FromSsize_t(x) PyInt_FromLong(x)
-typedef intargfunc ssizeargfunc;
+#define PyInt_FromSsize_t(x) PyInt_FromLong(x)
+typedef intargfunc ssizeargfunc;
#endif
@@ -121,7 +121,7 @@ BaseRowProxy_reduce(PyObject *self)
if (state == NULL)
return NULL;
- module = PyImport_ImportModule("sqlalchemy.engine.base");
+ module = PyImport_ImportModule("sqlalchemy.engine.result");
if (module == NULL)
return NULL;
@@ -248,7 +248,7 @@ BaseRowProxy_subscript(BaseRowProxy *self, PyObject *key)
long index;
int key_fallback = 0;
int tuple_check = 0;
-
+
if (PyInt_CheckExact(key)) {
index = PyInt_AS_LONG(key);
} else if (PyLong_CheckExact(key)) {
@@ -328,7 +328,7 @@ BaseRowProxy_subscript(BaseRowProxy *self, PyObject *key)
value = PySequence_GetItem(row, index);
tuple_check = 0;
}
-
+
if (value == NULL)
return NULL;
@@ -368,7 +368,7 @@ BaseRowProxy_getattro(BaseRowProxy *self, PyObject *name)
tmp = BaseRowProxy_subscript(self, name);
if (tmp == NULL && PyErr_ExceptionMatches(PyExc_KeyError)) {
PyErr_Format(
- PyExc_AttributeError,
+ PyExc_AttributeError,
"Could not locate column in row for column '%.200s'",
PyString_AsString(name)
);
@@ -399,7 +399,7 @@ BaseRowProxy_setparent(BaseRowProxy *self, PyObject *value, void *closure)
return -1;
}
- module = PyImport_ImportModule("sqlalchemy.engine.base");
+ module = PyImport_ImportModule("sqlalchemy.engine.result");
if (module == NULL)
return -1;