Merge tag '0.3.0' into debian

Tag bitmask version 0.3.0

Conflicts:
	.coveragerc
	.tx/config
	NEWS.rst
	setup.cfg
	src/leap/base/checks.py
	src/leap/base/exceptions.py
	src/leap/base/tests/test_checks.py
	src/leap/eip/checks.py
	src/leap/gui/firstrun/login.py
	src/leap/gui/locale_rc.py
	src/leap/util/polkit.py
	tests/test_qt_environment.py
	tox.ini

1 files changed, 49 insertions, 0 deletions

diff --git a/src/leap/services/mail/smtpconfig.py b/src/leap/services/mail/smtpconfig.py
new file mode 100644
index 00000000..ea0f9c37
--- /dev/null
+++ b/src/leap/services/mail/smtpconfig.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+# smtpconfig.py
+# Copyright (C) 2013 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+SMTP configuration
+"""
+import logging
+
+from leap.common.config.baseconfig import BaseConfig
+from leap.services.mail.smtpspec import get_schema
+
+logger = logging.getLogger(__name__)
+
+
+class SMTPConfig(BaseConfig):
+    """
+    SMTP configuration abstraction class
+    """
+
+    def __init__(self):
+        BaseConfig.__init__(self)
+
+    def _get_schema(self):
+        """
+        Returns the schema corresponding to the version given.
+
+        :rtype: dict or None if the version is not supported.
+        """
+        return get_schema(self._api_version)
+
+    def get_hosts(self):
+        return self._safe_get_value("hosts")
+
+    def get_locations(self):
+        return self._safe_get_value("locations")