Merge from 3.5

This commit is contained in:
Berker Peksag 2016-06-12 19:18:17 +03:00
commit f84f259b0b

View file

@ -42,7 +42,7 @@ extern PyObject* pysqlite_NotSupportedError;
extern PyObject* time_time; extern PyObject* time_time;
extern PyObject* time_sleep; extern PyObject* time_sleep;
/* A dictionary, mapping colum types (INTEGER, VARCHAR, etc.) to converter /* A dictionary, mapping column types (INTEGER, VARCHAR, etc.) to converter
* functions, that convert the SQL value to the appropriate Python value. * functions, that convert the SQL value to the appropriate Python value.
* The key is uppercase. * The key is uppercase.
*/ */