From 87447e56f8cf234732ce4bc5dfe607556c49f4e1 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 16 Feb 2016 16:20:23 +0100 Subject: [PATCH] Use django's API... see #835 --- modoboa/core/views/admin.py | 1 - modoboa/lib/db_utils.py | 20 +++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/modoboa/core/views/admin.py b/modoboa/core/views/admin.py index 56d0b19df..9d1fc83b6 100644 --- a/modoboa/core/views/admin.py +++ b/modoboa/core/views/admin.py @@ -8,7 +8,6 @@ from django.shortcuts import render from django.template.loader import render_to_string from django.utils.translation import ugettext as _ -from modoboa.core.extensions import exts_pool from modoboa.core.models import Log from modoboa.core.utils import check_for_updates from modoboa.lib import events, parameters diff --git a/modoboa/lib/db_utils.py b/modoboa/lib/db_utils.py index 156fc5077..42c8dd55f 100644 --- a/modoboa/lib/db_utils.py +++ b/modoboa/lib/db_utils.py @@ -7,23 +7,9 @@ from django.utils.translation import ugettext as _ from modoboa.lib.exceptions import InternalError -def db_table_exists(table, cursor=None): - """Check if table exists - - Taken from here: - https://gist.github.com/527113/307c2dec09ceeb647b8fa1d6d49591f3352cb034 - - """ - try: - if not cursor: - cursor = connection.cursor() - if not cursor: - raise Exception - table_names = connection.introspection.get_table_list(cursor) - except: - raise Exception("unable to determine if the table '%s' exists" % table) - else: - return table in table_names +def db_table_exists(table): + """Check if table exists.""" + return table in connection.introspection.table_names() def db_type(cname="default"):