Merge branch 'release-0.3.5'0.3.5

3 files changed, 120 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 31ac8f0..796e025 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+0.3.5 Nov 1:
+  o Move get_email_charset to this module.
+
 0.3.4 Oct 4:
   o Add cert bundle including ca-cert certificate. Closes #3850.
 
diff --git a/setup.py b/setup.py
index 128861b..519ddb3 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,7 @@
 """
 setup file for leap.common
 """
+import re
 from setuptools import setup, find_packages
 
 from pkg import utils
@@ -46,18 +47,79 @@ trove_classifiers = [
     "Topic :: Utilities"
 ]
 
+DOWNLOAD_BASE = ('https://github.com/leapcode/leap_pycommon/'
+                 'archive/%s.tar.gz')
+_versions = versioneer.get_versions()
+VERSION = _versions['version']
+VERSION_FULL = _versions['full']
+DOWNLOAD_URL = ""
+
+# get the short version for the download url
+_version_short = re.findall('\d+\.\d+\.\d+', VERSION)
+if len(_version_short) > 0:
+    VERSION_SHORT = _version_short[0]
+    DOWNLOAD_URL = DOWNLOAD_BASE % VERSION_SHORT
+
+cmdclass = versioneer.get_cmdclass()
+from setuptools import Command
+
+
+class freeze_debianver(Command):
+    """
+    Freezes the version in a debian branch.
+    To be used after merging the development branch onto the debian one.
+    """
+    user_options = []
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        proceed = str(raw_input(
+            "This will overwrite the file _version.py. Continue? [y/N] "))
+        if proceed != "y":
+            print("He. You scared. Aborting.")
+            return
+        template = r"""
+# This file was generated by the `freeze_debianver` command in setup.py
+# Using 'versioneer.py' (0.7+) from
+# revision-control system data, or from the parent directory name of an
+# unpacked source archive. Distribution tarballs contain a pre-generated copy
+# of this file.
+
+version_version = '{version}'
+version_full = '{version_full}'
+"""
+        templatefun = r"""
+
+def get_versions(default={}, verbose=False):
+        return {'version': version_version, 'full': version_full}
+"""
+        subst_template = template.format(
+            version=VERSION_SHORT,
+            version_full=VERSION_FULL) + templatefun
+        with open(versioneer.versionfile_source, 'w') as f:
+            f.write(subst_template)
+
+
+cmdclass["freeze_debianver"] = freeze_debianver
 setup(
     name='leap.common',
-    version=versioneer.get_version(),
-    cmdclass=versioneer.get_cmdclass(),
+    version=VERSION,
+    cmdclass=cmdclass,
     url='https://leap.se/',
+    download_url=DOWNLOAD_URL,
     license='GPLv3+',
     author='The LEAP Encryption Access Project',
     author_email='info@leap.se',
+    maintainer='Kali Kaneko',
+    maintainer_email='kali@leap.se',
     description='Common files used by the LEAP project.',
-    long_description=(
-        "Common files used by the LEAP Client project."
-    ),
+    long_description=open('README.rst').read() + '\n\n\n' +
+    open('CHANGELOG').read(),
     classifiers=trove_classifiers,
     namespace_packages=["leap"],
     package_dir={'': 'src'},
diff --git a/src/leap/common/mail.py b/src/leap/common/mail.py
new file mode 100644
index 0000000..2f2146d
--- /dev/null
+++ b/src/leap/common/mail.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# mail.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/>.
+"""
+Utility functions for email.
+"""
+import email
+import re
+
+from leap.common.check import leap_assert_type
+
+
+def get_email_charset(content, default="utf-8"):
+    """
+    Mini parser to retrieve the charset of an email.
+
+    :param content: mail contents
+    :type content: unicode
+    :param default: optional default value for encoding
+    :type default: str or None
+
+    :returns: the charset as parsed from the contents
+    :rtype: str
+    """
+    leap_assert_type(content, unicode)
+
+    charset = default
+    try:
+        em = email.message_from_string(content.encode("utf-8", "replace"))
+        # Miniparser for: Content-Type: <something>; charset=<charset>
+        charset_re = r'''charset=(?P<charset>[\w|\d|-]*)'''
+        charset = re.findall(charset_re, em["Content-Type"])[0]
+        if charset is None or len(charset) == 0:
+            charset = default
+    except Exception:
+        pass
+    return charset