From a760d5648abba527b96d1b305c62c2250018f6ff Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Nov 19 2015 11:12:22 +0000
Subject: Port mailtoparse to Python 3 (#1282165)


---

diff --git a/exo.spec b/exo.spec
index 98dbce6..8fb8d57 100644
--- a/exo.spec
+++ b/exo.spec
@@ -6,7 +6,7 @@
 
 Name:           exo
 Version:        0.10.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application library for the Xfce desktop environment
 
 Group:          System Environment/Libraries
@@ -21,7 +21,7 @@ Source1:        internet-mail-24.png
 Source2:        internet-mail-48.png
 # replace mailto handler with python version
 # https://bugzilla.xfce.org/show_bug.cgi?id=9964
-Source3:        http://skvidal.fedorapeople.org/misc/mailtoparse.py
+Source3:        mailtoparse.py
 Patch1:         exo-0.7.2-remove-xfce-category.patch
 # Set default applications to the ones we use in Fedora
 Patch2:         exo-0.10.2-default-apps.patch
@@ -171,6 +171,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Thu Nov 19 2015 Miro Hrončok <mhroncok@redhat.com> - 0.10.7-2
+- Port mailtoparse to Python 3 (#1282165)
+
 * Mon Sep 14 2015 Mukundan Ragavan <nonamedotc@gmail.com> - 0.10.7-1
 - Updated to 0.10.7
 - Removed upstreamed missing URI patch
diff --git a/mailtoparse.py b/mailtoparse.py
index e541b10..4b3b62c 100644
--- a/mailtoparse.py
+++ b/mailtoparse.py
@@ -1,6 +1,6 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt
 # skvidal@fedoraproject.org
-# (c) red hat, inc 2013
+# (c) red hat, inc 2013, 2015
 # gpl whatever
 # this is a direct port of exo-compos-mail-1 from xfce
 # from perl to python
@@ -16,34 +16,31 @@
 # - would be nice to have an actual set of tests :)
 
 
-
 import sys
 import posix
 import os
-import urlparse
-import urllib
+import urllib.parse
 
 
 def parse_url(mailto):
-    urlparse.uses_query.append('mailto')
-    url = urlparse.urlparse(mailto)
+    url = urllib.parse.urlparse(mailto, 'mailto')
     res = {}
     to = []
     query = None
 
     if url.query or '?' not in url.path:
         if url.path:
-            to.append(urlparse.unquote(url.path))
-    
+            to.append(urllib.parse.unquote(url.path))
+
     else:
         (thisto, ques, query) = url.path.partition('?')
         if thisto.strip():
-            to.append(urlparse.unquote(thisto))
+            to.append(urllib.parse.unquote(thisto))
 
     if not query:
-        query = url.query    
+        query = url.query
 
-    q_dict = urlparse.parse_qs(query)
+    q_dict = urllib.parse.parse_qs(query)
     to.extend(q_dict.get('to', []))
     res['to'] = to
     if 'to' in q_dict:
@@ -53,9 +50,8 @@ def parse_url(mailto):
     return res
 
 
-
 if len(sys.argv) < 3:
-    print >> sys.stderr, "Usage: %s <style> <binary> <mailto>" % (sys.argv[0])
+    sys.stderr.write("Usage: %s <style> <binary> <mailto>\n" % (sys.argv[0]))
     sys.exit(1)
 
 
@@ -70,7 +66,12 @@ cc = mailto.get('cc', [])
 bcc = mailto.get('bcc', [])
 subject = ' '.join(mailto.get('subject', []))
 body = '\n'.join(mailto.get('body', []))
-attachments = mailto.get('attachment',[])
+attachments = mailto.get('attachment', [])
+
+# hackish
+if isinstance(subject, list):
+    subject = subject[0]
+
 
 args = [binary]
 if style == 'mozilla':
@@ -80,9 +81,9 @@ if style == 'mozilla':
     command += ",bcc='" + ','.join(bcc) + "'"
     command += ",attachment='" + ','.join(attachments) + "'"
     if subject:
-         command += ",subject='" + subject + "'"
+        command += ",subject='" + subject + "'"
     if body:
-         command += ",body='" + body + "'"
+        command += ",body='" + body + "'"
 
     args.append('-compose')
     args.append(command)
@@ -91,25 +92,25 @@ elif style == 'mozilla-remote':
     # generate xfeDoCommand(composeMessage, ...) string
     command = 'xfeDoCommand(composeMessage'
     command += ",to='" + ','.join(to) + "'"
-    command += ",cc='" + ','.join(cc) + "'"; 
+    command += ",cc='" + ','.join(cc) + "'"
     command += ",bcc='" + ','.join(bcc) + "'"
     command += ",attachment='" + ','.join(attachments) + "'"
     if subject:
-         command += ",subject='" + subject + "'"
+        command += ",subject='" + subject + "'"
     if body:
-         command += ",body='" + body + "'"
+        command += ",body='" + body + "'"
 
-    command += ')';
+    command += ')'
 
     # and add the parameters to the argv
     args.append('-remote')
     args.append(command)
 
 elif style == 'evolution':
-     # evo takes a mailto uri and parses it itself
-     # just hand back what we were handed originally
-     # note - it my want them to be url_escaped first? or not?
-     args.append(raw_mailto)
+    # evo takes a mailto uri and parses it itself
+    # just hand back what we were handed originally
+    # note - it my want them to be url_escaped first? or not?
+    args.append(raw_mailto)
 
 elif style == 'kmail':
     if len(to) >= 1:
@@ -135,13 +136,13 @@ elif style == 'kmail':
         args.append('\n'.join(body))
     args.append('--composer')
     args.append(baseaddr)
-        
+
 elif style == 'sylpheed':
     args.append('--compose')
     args.append(raw_mailto)
     # fixme - do attachments separately
 
-elif style == 'balsa': # cmon, balsa? really?
+elif style == 'balsa':  # cmon, balsa? really?
     args.append('--compose')
     args.append(raw_mailto)
     # fixme - do attachments separately
@@ -161,18 +162,17 @@ elif style == 'mutt':
     if to:
         args.append('')
 
-    
-       
-else: 
-   print >> sys.stderr, "%s: Unsupported style '%s'." % (sys.argv[0], style)
-   sys.exit(1)
+
+else:
+    sys.stderr.write("%s: Unsupported style '%s'.\n" % (sys.argv[0], style))
+    sys.exit(1)
 
 # try to execute the generated command
-posix.execv(binary,args)
-#DEBUG
-#print binary,
-#print ' '.join(args)
-#sys.exit(0)
-#ENDDEBUG
+posix.execv(binary, args)
+# DEBUG
+# print binary,
+# print ' '.join(args)
+# sys.exit(0)
+# ENDDEBUG
 # something went wrong
 sys.exit(1)