Merge lp:~justinmcp/unity-webapps-gmail/fix-module-imports into lp:unity-webapps-gmail

[Justin McPherson]

Fix module imports.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-vivid-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-gmail-ci/28/rebuild

review: Approve (continuous-integration)

[lp:~justinmcp/unity-webapps-gmail/fix-module-imports]

104. By Justin McPherson <justin@phablet-dev> on 2015-04-15

Update to python 3

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-ci/29/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-gmail-vivid-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-gmail-ci/29/rebuild

review: Approve (continuous-integration)

Unmerged revisions

104. By Justin McPherson <justin@phablet-dev> on 2015-04-15

Update to python 3

103. By Justin McPherson <justin@phablet-dev> on 2015-04-13

Fix module imports.

=== modified file 'scripts/update-desktop-file-unity-webapps-gmail.py'
--- scripts/update-desktop-file-unity-webapps-gmail.py	2014-03-07 01:12:40 +0000
+++ scripts/update-desktop-file-unity-webapps-gmail.py	2015-04-15 03:51:18 +0000
@@ -1,15 +1,12 @@
-#!/usr/bin/python
-from gi.repository import Gio
+#!/usr/bin/python3
+from gi.repository import GLib
 import os
-import glib
-import glob
-import re
 
 APP_ID = 'Gmailmailgooglecom'
 DESKTOP_FILENAMES = ['Gmailmailgooglecom.desktop', 'GMailmailgooglecom.desktop']
 
 def get_local_applications_path():
-    return os.path.join(glib.get_user_data_dir(), 'applications')
+    return os.path.join(GLib.get_user_data_dir(), 'applications')
 
 def update_desktop_file_startupwmclass():
     local_applications_path = get_local_applications_path()
@@ -27,8 +24,8 @@
                 start_idx += len('[Desktop Entry]')
                 updated_desktop_file_content = desktop_file_content[:start_idx] + '\nStartupWMClass={0}'.format(APP_ID) + desktop_file_content[start_idx:]
                 open(desktop_filename, "w+").write(updated_desktop_file_content)
-        except Exception, e:
-            print 'Error while upgrading the desktop file: ', str(e)
+        except Exception as e:
+            print('Error while upgrading the desktop file: ', str(e))
 
 if __name__ == "__main__":
     update_desktop_file_startupwmclass()