diff --git a/Fixum-0.11.alfredworkflow b/Fixum-0.11.alfredworkflow new file mode 100644 index 0000000..8cfbe14 Binary files /dev/null and b/Fixum-0.11.alfredworkflow differ diff --git a/src/info.plist b/src/info.plist index 594a059..9cdf20e 100644 --- a/src/info.plist +++ b/src/info.plist @@ -187,8 +187,8 @@ It is primarily a workaround to fix bugs that are preventing the workflows from version - 0.10 + 0.11 webaddress - + https://github.com/deanishe/alfred-fixum diff --git a/src/workflow/version b/src/workflow/version index 9c235b4..ebc91b4 100644 --- a/src/workflow/version +++ b/src/workflow/version @@ -1 +1 @@ -1.39.0 \ No newline at end of file +1.40.0 \ No newline at end of file diff --git a/src/workflow/web.py b/src/workflow/web.py index 84a7062..83212a8 100644 --- a/src/workflow/web.py +++ b/src/workflow/web.py @@ -528,7 +528,7 @@ def request(method, url, params=None, data=None, headers=None, cookies=None, socket.setdefaulttimeout(timeout) # Default handlers - openers = [] + openers = [urllib2.ProxyHandler(urllib2.getproxies())] if not allow_redirects: openers.append(NoRedirectHandler()) diff --git a/src/workflow/workflow3.py b/src/workflow/workflow3.py index 22dc5c6..23a7aae 100644 --- a/src/workflow/workflow3.py +++ b/src/workflow/workflow3.py @@ -50,12 +50,16 @@ class Variables(dict): information. Args: - arg (unicode, optional): Main output/``{query}``. + arg (unicode or list, optional): Main output/``{query}``. **variables: Workflow variables to set. + In Alfred 4.1+ and Alfred-Workflow 1.40+, ``arg`` may also be a + :class:`list` or :class:`tuple`. Attributes: - arg (unicode): Output value (``{query}``). + arg (unicode or list): Output value (``{query}``). + In Alfred 4.1+ and Alfred-Workflow 1.40+, ``arg`` may also be a + :class:`list` or :class:`tuple`. config (dict): Configuration for downstream workflow element. """ @@ -68,7 +72,7 @@ def __init__(self, arg=None, **variables): @property def obj(self): - """Return ``alfredworkflow`` `dict`.""" + """``alfredworkflow`` :class:`dict`.""" o = {} if self: d2 = {} @@ -92,10 +96,10 @@ def __unicode__(self): """ if not self and not self.config: - if self.arg: - return self.arg - else: + if not self.arg: return u'' + if isinstance(self.arg, unicode): + return self.arg return json.dumps(self.obj) @@ -328,6 +332,9 @@ def add_modifier(self, key, subtitle=None, arg=None, valid=None, icon=None, :meth:`Workflow.add_item() ` for valid values. + In Alfred 4.1+ and Alfred-Workflow 1.40+, ``arg`` may also be a + :class:`list` or :class:`tuple`. + Returns: Modifier: Configured :class:`Modifier`. @@ -568,6 +575,9 @@ def add_item(self, title, subtitle='', arg=None, autocomplete=None, turned on for your Script Filter, Alfred (version 3.5 and above) will filter against this field, not ``title``. + In Alfred 4.1+ and Alfred-Workflow 1.40+, ``arg`` may also be a + :class:`list` or :class:`tuple`. + See :meth:`Workflow.add_item() ` for the main documentation and other parameters.