From ba49e7be08e340db9c0e570619388e9e2ea69509 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Mon, 20 Aug 2007 01:14:03 +0000 Subject: [PATCH] Removed backend.dictfetchmany(), as it wasn't being used anywhere git-svn-id: http://code.djangoproject.com/svn/django/trunk@5969 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/backends/ado_mssql/base.py | 1 - django/db/backends/dummy/base.py | 1 - django/db/backends/mysql/base.py | 1 - django/db/backends/mysql_old/base.py | 1 - django/db/backends/oracle/base.py | 1 - django/db/backends/postgresql/base.py | 4 ---- django/db/backends/postgresql_psycopg2/base.py | 1 - django/db/backends/sqlite3/base.py | 1 - django/db/backends/util.py | 6 ------ 9 files changed, 17 deletions(-) diff --git a/django/db/backends/ado_mssql/base.py b/django/db/backends/ado_mssql/base.py index 98c68f1919..10bc30a24c 100644 --- a/django/db/backends/ado_mssql/base.py +++ b/django/db/backends/ado_mssql/base.py @@ -102,7 +102,6 @@ supports_constraints = True supports_tablespaces = True uses_case_insensitive_names = False -dictfetchmany = util.dictfetchmany dictfetchall = util.dictfetchall OPERATOR_MAPPING = { diff --git a/django/db/backends/dummy/base.py b/django/db/backends/dummy/base.py index 0d83785e83..faee7ab329 100644 --- a/django/db/backends/dummy/base.py +++ b/django/db/backends/dummy/base.py @@ -39,7 +39,6 @@ class DatabaseWrapper(object): supports_constraints = False supports_tablespaces = False -dictfetchmany = complain dictfetchall = complain OPERATOR_MAPPING = {} diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 5c19e301f5..60af0c65bb 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -184,7 +184,6 @@ supports_constraints = True supports_tablespaces = False uses_case_insensitive_names = False -dictfetchmany = util.dictfetchmany dictfetchall = util.dictfetchall OPERATOR_MAPPING = { diff --git a/django/db/backends/mysql_old/base.py b/django/db/backends/mysql_old/base.py index bd3b382007..ba88042f5a 100644 --- a/django/db/backends/mysql_old/base.py +++ b/django/db/backends/mysql_old/base.py @@ -203,7 +203,6 @@ supports_constraints = True supports_tablespaces = False uses_case_insensitive_names = False -dictfetchmany = util.dictfetchmany dictfetchall = util.dictfetchall OPERATOR_MAPPING = { diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index eca0e2e1ea..a96056b187 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -224,7 +224,6 @@ def to_unicode(s): return force_unicode(s) return s -dictfetchmany = util.dictfetchmany dictfetchall = util.dictfetchall def get_field_cast_sql(db_type): diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index 43f06f83fe..9420909d5a 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -200,10 +200,6 @@ supports_constraints = True supports_tablespaces = False uses_case_insensitive_names = False -def dictfetchmany(cursor, number): - "Returns a certain number of rows from a cursor as a dict" - return cursor.dictfetchmany(number) - def dictfetchall(cursor): "Returns all rows from a cursor as a dict" return cursor.dictfetchall() diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py index ddc00f85fa..fe50c998bb 100644 --- a/django/db/backends/postgresql_psycopg2/base.py +++ b/django/db/backends/postgresql_psycopg2/base.py @@ -163,7 +163,6 @@ supports_constraints = True supports_tablespaces = False uses_case_insensitive_names = False -dictfetchmany = util.dictfetchmany dictfetchall = util.dictfetchall OPERATOR_MAPPING = { diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index 1c8409879d..f34e23598d 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -120,7 +120,6 @@ supports_constraints = False supports_tablespaces = False uses_case_insensitive_names = False -dictfetchmany = util.dictfetchmany dictfetchall = util.dictfetchall def _sqlite_extract(lookup_type, dt): diff --git a/django/db/backends/util.py b/django/db/backends/util.py index e022380390..fc3fbfcc3d 100644 --- a/django/db/backends/util.py +++ b/django/db/backends/util.py @@ -133,12 +133,6 @@ def _dict_helper(desc, row): "Returns a dictionary for the given cursor.description and result row." return dict(zip([col[0] for col in desc], row)) -def dictfetchmany(cursor, number): - "Returns a certain number of rows from a cursor as a dict" - desc = cursor.description - for row in cursor.fetchmany(number): - yield _dict_helper(desc, row) - def dictfetchall(cursor): "Returns all rows from a cursor as a dict" desc = cursor.description