Skip to content

Commit

Permalink
Merge branch '1.4.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
tonioo committed Feb 22, 2016
2 parents da02396 + 32acc9a commit 89f499b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 20 deletions.
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.4'
# The full version, including alpha/beta/rc tags.
release = '1.4.3'
release = '1.4.4'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
1 change: 0 additions & 1 deletion modoboa/core/views/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
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
Expand Down
20 changes: 3 additions & 17 deletions modoboa/lib/db_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,9 @@
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"):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def read(fname):

setup(
name="modoboa",
version='1.4.3',
version='1.4.4',
url='http://modoboa.org/',
license='MIT',
description="Mail hosting made simple",
Expand Down

0 comments on commit 89f499b

Please sign in to comment.