Merge branch '1.4.x'

This commit is contained in:
Antoine Nguyen
2016-02-22 09:35:41 +01:00
4 changed files with 5 additions and 20 deletions
+1 -1
View File
@@ -52,7 +52,7 @@ copyright = u'2015, Antoine Nguyen'
# 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.
-1
View File
@@ -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
+3 -17
View File
@@ -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"):
+1 -1
View File
@@ -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",