Add,Support python3

Author: rexzhang

core.py

@@ -5,54 +5,53 @@
 import re
 
 import arrow
-from workflow import ICON_CLOCK, ICON_NOTE, ICON_ERROR
+from ualfred import ICON_CLOCK, ICON_ERROR, ICON_NOTE
 
 DEFAULT_FEEDBACK = [
     {
-        'title': 'Please enter timestamp, datetime string, "now", or space',
-        'subtitle': 'Examples: 1607609661, 2020-12-10 22:14:33, now',
-        'valid': False,
-        'icon': ICON_ERROR,
+        "title": 'Please enter timestamp, datetime string, "now", or space',
+        "subtitle": "Examples: 1607609661, 2020-12-10 22:14:33, now",
+        "valid": False,
+        "icon": ICON_ERROR,
     },
     {
-        'title': 'Change time zone or time shift',
-        'subtitle': 'Examples: now +08, now +1d',
-        'valid': False,
-        'icon': ICON_ERROR,
+        "title": "Change time zone or time shift",
+        "subtitle": "Examples: now +08, now +1d",
+        "valid": False,
+        "icon": ICON_ERROR,
     },
 ]
 
 SHIFT_UNIT_MAP = {
-    'ms': 'microseconds',
-    's': 'seconds',
-    'm': 'minutes',
-    'h': 'hours',
-    'd': 'days',
-    'w': 'weeks',
-    'M': 'months',
-    'q': 'quarters',
-    'y': 'years',
+    "ms": "microseconds",
+    "s": "seconds",
+    "m": "minutes",
+    "h": "hours",
+    "d": "days",
+    "w": "weeks",
+    "M": "months",
+    "q": "quarters",
+    "y": "years",
 }
 
 FORMAT_LIST = (
-    (ICON_NOTE, True, 'X', 'Timestamp(s)'),
-    (ICON_NOTE, True, 'x', 'Timestamp(us)'),
-    (
-        ICON_CLOCK, False, 'W, DDDD[th day]',
-        'ISO Week date and Day for year'
-    ),
-    (ICON_CLOCK, False, 'YYYY-MM-DD HH:mm:ss', 'Date and Time'),
-    (ICON_CLOCK, False, 'YYYY-MM-DD HH:mm:ss.SSSSSS', 'Date and Time'),
-    (ICON_CLOCK, False, arrow.FORMAT_RFC3339, 'RFC3339 Format'),
+    (ICON_NOTE, True, "X", "Timestamp(s)"),
+    (ICON_NOTE, True, "x", "Timestamp(us)"),
+    (ICON_CLOCK, False, "W, DDDD[th day]", "ISO Week date and Day for year"),
+    (ICON_CLOCK, False, "YYYY-MM-DD HH:mm:ss", "Date and Time"),
+    (ICON_CLOCK, False, "YYYY-MM-DD HH:mm:ss.SSSSSS", "Date and Time"),
+    (ICON_CLOCK, False, arrow.FORMAT_RFC3339, "RFC3339 Format"),
     (  # https://www.w3.org/TR/NOTE-datetime
-        ICON_CLOCK, False, 'YYYY-MM-DDTHH:mm:ssZZ',
-        'ISO 8601/W3C Format'
+        ICON_CLOCK,
+        False,
+        "YYYY-MM-DDTHH:mm:ssZZ",
+        "ISO 8601/W3C Format",
     ),
-    (ICON_CLOCK, False, arrow.FORMAT_RFC850, 'RFC850 Format'),
+    (ICON_CLOCK, False, arrow.FORMAT_RFC850, "RFC850 Format"),
 )
 
-RE_TIMEZONE = '^[+-][0-9]{2}$'
-RE_SHIFT = '^[+-][0-9]+[smhdwMy]$'
+RE_TIMEZONE = "^[+-][0-9]{2}$"
+RE_SHIFT = "^[+-][0-9]+[smhdwMy]$"
 
 
 class Time(object):
@@ -74,17 +73,17 @@ def query(self):
 
     @query.setter
     def query(self, value):
-        self._query = value.strip(' ')
+        self._query = value.strip(" ")
 
     def do_parser(self):
-        self.wf.logger.debug('query string:{} {}'.format(
-            type(self.wf.args[0]), self.wf.args[0])
+        self.wf.logger.debug(
+            "query string:{} {}".format(type(self.wf.args[0]), self.wf.args[0])
         )
 
         try:
-            self.query = self.wf.args[0].encode('utf8')
+            self.query = self.wf.args[0].encode("utf8")
         except IndexError:
-            self.wf.logger.debug('parser workflow args failed.')
+            self.wf.logger.debug("parser workflow args failed.")
             return False
 
         while True:
@@ -96,34 +95,34 @@ def do_parser(self):
 
     def _parser_extend_info(self):
         """parser timezone, shift"""
-        index = self.query.rfind(' ')
+        index = self.query.rfind(" ")
         if index == -1:
-            query = ''
+            query = ""
             info = self.query
         else:
             query = self.query[:index]
-            info = self.query[index + 1:].strip(' ')
+            info = self.query[index + 1 :].strip(" ")
 
         # time zone
-        if info.upper() == 'UTC' or info == '+00' or info == '-00':
+        if info.upper() == "UTC" or info == "+00" or info == "-00":
             self.query = query
-            self.zone = 'UTC'
-            self.wf.logger.debug('found zone info:{}'.format(self.zone))
+            self.zone = "UTC"
+            self.wf.logger.debug("found zone info:{}".format(self.zone))
             return True
 
         r = re.match(RE_TIMEZONE, info)
         if r:
             self.query = query
             self.zone = info
-            self.wf.logger.debug('found zone info:{}'.format(self.zone))
+            self.wf.logger.debug("found zone info:{}".format(self.zone))
             return True
 
         # time shift TODO
         r = re.match(RE_SHIFT, info)
         if r:
             self.query = query
             self.shift = info
-            self.wf.logger.debug('found shift info:{}'.format(self.shift))
+            self.wf.logger.debug("found shift info:{}".format(self.shift))
             return True
 
         return False
@@ -141,14 +140,12 @@ def _parser_datetime(self):
         except arrow.ParserError:
             pass
 
-        if self.query == 'now' or self.query == '':
+        if self.query == "now" or self.query == "":
             self.now = True
             self.time = arrow.now()
             return True
 
-        self.wf.logger.debug(
-            'parser datetime error,query string:{}'.format(self.query)
-        )
+        self.wf.logger.debug("parser datetime error,query string:{}".format(self.query))
         return False
 
     def _apply_shift(self):
@@ -168,40 +165,42 @@ def get_feedback(self):
             return DEFAULT_FEEDBACK
 
         if self.now:
-            desc_now = 'Now, '
+            desc_now = "Now, "
         else:
-            desc_now = ''
+            desc_now = ""
 
         f = list()
         for icon, force_utc, fmt, desc_format in FORMAT_LIST:
             # time shift
             if self.shift:
-                desc_shift = '{}, '.format(self.shift)
+                desc_shift = "{}, ".format(self.shift)
             else:
-                desc_shift = ''
+                desc_shift = ""
 
             # time znone
             if force_utc:
-                self.time = self.time.to('UTC')
-                desc_zone = 'UTC'
+                self.time = self.time.to("UTC")
+                desc_zone = "UTC"
             elif self.zone and not force_utc:
                 self.time = self.time.to(self.zone)
                 desc_zone = self.zone
             else:
-                self.time = self.time.to('local')
-                desc_zone = 'Local'
+                self.time = self.time.to("local")
+                desc_zone = "Local"
 
             value = self.time.format(fmt)
-            subtitle = '{}{}[{}] {}'.format(
+            subtitle = "{}{}[{}] {}".format(
                 desc_now, desc_shift, desc_zone, desc_format
             )
-            f.append({
-                'title': value,
-                'subtitle': subtitle,
-                'valid': True,
-                'arg': value,
-                'icon': icon,
-            })
+            f.append(
+                {
+                    "title": value,
+                    "subtitle": subtitle,
+                    "valid": True,
+                    "arg": value,
+                    "icon": icon,
+                }
+            )
 
         return f
 

entry_point.py

@@ -3,14 +3,14 @@
 
 import sys
 
+from core import do_convert
+
 # Workflow3 supports Alfred 3's new features. The `Workflow` class
 # is also compatible with Alfred 2.
-from workflow import Workflow3
-
-from core import do_convert
+from ualfred import Workflow3
 
 
-def main(wf):
+def main(workflow):
     # The Workflow3 instance will be passed to the function
     # you call from `Workflow3.run`.
     # Not super useful, as the `wf` object created in
@@ -27,20 +27,20 @@ def main(wf):
     # args = wf.args
 
     # Do stuff here ...
-    feedback = do_convert(wf)
+    feedback = do_convert(workflow)
 
     # Add an item to Alfred feedback
     # wf.add_item(u'Item title', u'Item subtitle')
     for item in feedback:
-        wf.add_item(**item)
+        workflow.add_item(**item)
 
     # Send output to Alfred. You can only call this once.
     # Well, you *can* call it multiple times, but subsequent calls
     # are ignored (otherwise the JSON sent to Alfred would be invalid).
-    wf.send_feedback()
+    workflow.send_feedback()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     # Create a global `Workflow3` object
     wf = Workflow3()
     # Call your entry function via `Workflow3.run()` to enable its

workflow/Notify.tgz renamed to ualfred/Notify.tgz

@@ -0,0 +1,95 @@
+# encoding: utf-8
+#
+# Copyright (c) 2014 Dean Jackson <[email protected]>
+#
+# MIT Licence. See http://opensource.org/licenses/MIT
+#
+# Created on 2014-02-15
+#
+
+"""A helper library for `Alfred <http://www.alfredapp.com/>`_ workflows."""
+# Filter matching rules
+# Icons
+# Exceptions
+from .workflow import (
+    ICON_ACCOUNT,
+    ICON_BURN,
+    ICON_CLOCK,
+    ICON_COLOR,
+    ICON_COLOUR,
+    ICON_EJECT,
+    ICON_ERROR,
+    ICON_FAVORITE,
+    ICON_FAVOURITE,
+    ICON_GROUP,
+    ICON_HELP,
+    ICON_HOME,
+    ICON_INFO,
+    ICON_NETWORK,
+    ICON_NOTE,
+    ICON_SETTINGS,
+    ICON_SWIRL,
+    ICON_SWITCH,
+    ICON_SYNC,
+    ICON_TRASH,
+    ICON_USER,
+    ICON_WARNING,
+    ICON_WEB,
+    MATCH_ALL,
+    MATCH_ALLCHARS,
+    MATCH_ATOM,
+    MATCH_CAPITALS,
+    MATCH_INITIALS,
+    MATCH_INITIALS_CONTAIN,
+    MATCH_INITIALS_STARTSWITH,
+    MATCH_STARTSWITH,
+    MATCH_SUBSTRING,
+    KeychainError,
+    PasswordNotFound,
+    Workflow,
+    manager,
+)
+from .workflow3 import Variables, Workflow3
+
+__version__ = "2.0.1"
+
+__all__ = [
+    "Variables",
+    "Workflow",
+    "Workflow3",
+    "manager",
+    "PasswordNotFound",
+    "KeychainError",
+    "ICON_ACCOUNT",
+    "ICON_BURN",
+    "ICON_CLOCK",
+    "ICON_COLOR",
+    "ICON_COLOUR",
+    "ICON_EJECT",
+    "ICON_ERROR",
+    "ICON_FAVORITE",
+    "ICON_FAVOURITE",
+    "ICON_GROUP",
+    "ICON_HELP",
+    "ICON_HOME",
+    "ICON_INFO",
+    "ICON_NETWORK",
+    "ICON_NOTE",
+    "ICON_SETTINGS",
+    "ICON_SWIRL",
+    "ICON_SWITCH",
+    "ICON_SYNC",
+    "ICON_TRASH",
+    "ICON_USER",
+    "ICON_WARNING",
+    "ICON_WEB",
+    "MATCH_ALL",
+    "MATCH_ALLCHARS",
+    "MATCH_ATOM",
+    "MATCH_CAPITALS",
+    "MATCH_INITIALS",
+    "MATCH_INITIALS_CONTAIN",
+    "MATCH_INITIALS_STARTSWITH",
+    "MATCH_STARTSWITH",
+    "MATCH_SUBSTRING",
+]