From cf8912bf1c38b3c13f7dbf9d80b9b30134cf9002 Mon Sep 17 00:00:00 2001
From: Florian Kothmeier <floriankothmeier@web.de>
Date: Sat, 22 Dec 2018 21:36:24 +0100
Subject: [PATCH] Convert to python3

---
 kdeconnect-ext.py | 10 +++++-----
 kdeconnect.py     |  8 +++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/kdeconnect-ext.py b/kdeconnect-ext.py
index 5019c06..2704a04 100644
--- a/kdeconnect-ext.py
+++ b/kdeconnect-ext.py
@@ -10,7 +10,7 @@
 
 class KDEConnectExtension(GObject.GObject, Nautilus.MenuProvider):
     def __init__(self):
-        pass
+        GObject.Object.__init__(self)
 
     def zipdir(self, path, ziph):
         # ziph is zipfile handle
@@ -31,8 +31,8 @@ def menu_activate_cb(self, menu, files, device_id, device_name, folder_list):
             files.append(zipfile)
 
         send_files(files, device_id, device_name)
-        # for folder_name in folder_list:
-        #     os.remove(folder_name[7:] + '.zip')
+        for folder_name in folder_list:
+             os.remove(folder_name[7:] + '.zip')
 
     def get_file_items(self, window, files):
         try:
@@ -49,8 +49,8 @@ def get_file_items(self, window, files):
                 folder_list.append(files[i].get_uri())
 
         files = files_new
-        print files
-        print folder_list
+        print(files)
+        print(folder_list)
 
         if (len(files_new) + len(folder_list) < 1):
             return []
diff --git a/kdeconnect.py b/kdeconnect.py
index 12f3e0b..30bf33c 100644
--- a/kdeconnect.py
+++ b/kdeconnect.py
@@ -5,7 +5,7 @@ def send_files(files, device_id, device_name):
     # results=[]
     # failed=0
     for file in files:
-        print "filename", file.get_uri()
+        print("filename", file.get_uri())
         return_code=call(["kdeconnect-cli", "-d", device_id, "--share", file.get_uri()])
         # if (return_code != 0):
         #     failed += 1
@@ -15,10 +15,12 @@ def send_files(files, device_id, device_name):
 
 def get_available_devices():
     devices_a=[]
-    devices = check_output(["kdeconnect-cli", "-a"]).strip().split("\n")
+    devices = check_output(["kdeconnect-cli", "-a"]).decode("utf-8").strip().split("\n")
     devices.pop()
+    print(devices)
     for device in devices:
         device_name=re.search("(?<=-\s).+(?=:\s)", device).group(0)
-        device_id=re.search("(?<=:\s)[a-z0-9]+(?=\s\()", device).group(0).strip()
+        device_id=re.search("(?<=:\s)[a-z0-9_]+(?=\s\()", device).group(0).strip()
         devices_a.append({ "name": device_name, "id": device_id })
+    print(devices_a)
     return devices_a