abnd90 / py-cloudapp Goto Github PK

From 0d802d3fe71b4127c5786c4259a85c653cc14968 Mon Sep 17 00:00:00 2001
From: Paddy Foran <[email protected]>
Date: Mon, 21 May 2012 16:43:51 -0400
Subject: [PATCH] Translated unicode domains using the idna punycode codec.

---
 cloudhandle.py |    8 ++++++++
 trayicon.py    |   14 ++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/cloudhandle.py b/cloudhandle.py
index 1a5346b..ba4426a 100755
--- a/cloudhandle.py
+++ b/cloudhandle.py
@@ -9,6 +9,8 @@ import urlparse

 from preferences import PreferencesDialog

+from encodings import idna
+
 class CloudHandle(object):

     fileList = []
@@ -53,6 +55,12 @@ class CloudHandle(object):
         self.fileList.pop()
         self.signals.gotFileList.emit(self.fileList)
         if self.pdialog.settings['auto_clipboard']:
+            value = item['url'].split("/")
+            domain = value[2].split(".")
+            domain[0] = idna.ToASCII(domain[0])
+            domain = ".".join(domain)
+            value[2] = domain
+            item['url'] = "/".join(value)
             self.signals.loadClipboard.emit(item['url'])
         if self.pdialog.settings['notifications']:
             if item['item_type'] == 'bookmark':
diff --git a/trayicon.py b/trayicon.py
index 4b4b992..a0ba9fa 100755
--- a/trayicon.py
+++ b/trayicon.py
@@ -8,6 +8,7 @@ from PyQt4.QtCore import QString, QThread, QFileInfo, QUrl, QObject, pyqtSignal,

 from cloudhandle import CloudHandle
 import icons_rc
+from encodings import idna

 class TrayIcon(QSystemTrayIcon):

@@ -68,9 +69,18 @@ class TrayIcon(QSystemTrayIcon):
         #PyQt converts all Strings to QStrings, converting back.
         l = []
         for item in fileList:
-            m = {}   
+            m = {}
             for key in item:
-                m[str(key)] = str(item[key])
+                value = item[key]
+                key = str(key)
+                if key == "url" or key == "content_url":
+                    value = value.split("/")
+                    domain = value[2].split(".")
+                    domain[0] = idna.ToASCII(domain[0])
+                    domain = ".".join(domain)
+                    value[2] = domain
+                    value = "/".join(value)
+                m[key] = str(value)
             l.append(m)

         self.fileList = l
-- 
1.7.5.4