summaryrefslogtreecommitdiff
path: root/install
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2019-11-28 13:26:07 -0800
committerMicah Lee <micah@micahflee.com>2019-11-28 13:26:07 -0800
commit7e06872a395aecc6b375e0d3e9434800757941b7 (patch)
treec2c4ccd246e09d354b45cf7634146bdd753ccf2b /install
parent58bc25850736a6a0d71e1d234d1357af8d464e7a (diff)
downloadonionshare-7e06872a395aecc6b375e0d3e9434800757941b7.tar.gz
onionshare-7e06872a395aecc6b375e0d3e9434800757941b7.zip
Make nautilus plugin work in python3
Diffstat (limited to 'install')
-rw-r--r--install/scripts/onionshare-nautilus.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/install/scripts/onionshare-nautilus.py b/install/scripts/onionshare-nautilus.py
index dad2330c..776ca5de 100644
--- a/install/scripts/onionshare-nautilus.py
+++ b/install/scripts/onionshare-nautilus.py
@@ -3,7 +3,10 @@ import sys
import json
import locale
import subprocess
-import urllib
+try:
+ import urllib.request
+except:
+ import urllib
import gi
gi.require_version("Nautilus", "3.0")
@@ -67,7 +70,10 @@ class OnionShareExtension(GObject.GObject, Nautilus.MenuProvider):
def url2path(self, url):
file_uri = url.get_activation_uri()
arg_uri = file_uri[7:]
- path = urllib.url2pathname(arg_uri)
+ try:
+ path = urllib.request.url2pathname(arg_uri)
+ except:
+ path = urllib.url2pathname(arg_uri)
return path
def exec_onionshare(self, filenames):