Make userscripts work on both Python 2 and 3
This commit is contained in:
parent
0b5af757ec
commit
dca962ca03
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env python2
|
#!/usr/bin/env python
|
||||||
#
|
#
|
||||||
# Executes python-readability on current page and opens the summary as new tab.
|
# Executes python-readability on current page and opens the summary as new tab.
|
||||||
#
|
#
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/env python2
|
#!/usr/bin/env python
|
||||||
#
|
#
|
||||||
# Adds DuckDuckGo bang as searchengine.
|
# Adds DuckDuckGo bang as searchengine.
|
||||||
#
|
#
|
||||||
@ -8,14 +8,21 @@
|
|||||||
# Example:
|
# Example:
|
||||||
# :spawn --userscript ripbang amazon maps
|
# :spawn --userscript ripbang amazon maps
|
||||||
#
|
#
|
||||||
import os, re, requests, sys, urllib
|
|
||||||
|
from __future__ import print_function
|
||||||
|
import os, re, requests, sys
|
||||||
|
|
||||||
|
try:
|
||||||
|
from urllib.parse import unquote
|
||||||
|
except ImportError:
|
||||||
|
from urllib import unquote
|
||||||
|
|
||||||
for argument in sys.argv[1:]:
|
for argument in sys.argv[1:]:
|
||||||
bang = '!' + argument
|
bang = '!' + argument
|
||||||
r = requests.get('https://duckduckgo.com/',
|
r = requests.get('https://duckduckgo.com/',
|
||||||
params={'q': bang + ' SEARCHTEXT'})
|
params={'q': bang + ' SEARCHTEXT'})
|
||||||
|
|
||||||
searchengine = urllib.unquote(re.search("url=[^']+", r.text).group(0))
|
searchengine = unquote(re.search("url=[^']+", r.text).group(0))
|
||||||
searchengine = searchengine.replace('url=', '')
|
searchengine = searchengine.replace('url=', '')
|
||||||
searchengine = searchengine.replace('/l/?kh=-1&uddg=', '')
|
searchengine = searchengine.replace('/l/?kh=-1&uddg=', '')
|
||||||
searchengine = searchengine.replace('SEARCHTEXT', '{}')
|
searchengine = searchengine.replace('SEARCHTEXT', '{}')
|
||||||
@ -24,4 +31,4 @@ for argument in sys.argv[1:]:
|
|||||||
with open(os.environ['QUTE_FIFO'], 'w') as fifo:
|
with open(os.environ['QUTE_FIFO'], 'w') as fifo:
|
||||||
fifo.write('set searchengines %s %s' % (bang, searchengine))
|
fifo.write('set searchengines %s %s' % (bang, searchengine))
|
||||||
else:
|
else:
|
||||||
print '%s %s' % (bang, searchengine)
|
print('%s %s' % (bang, searchengine))
|
||||||
|
Loading…
Reference in New Issue
Block a user