Add github actions and fix tests

Author: russell

.github/workflows/ci.yaml

@@ -0,0 +1,32 @@
+name: Python package
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

sifter/notificationmethods/mailto.py

@@ -1,4 +1,4 @@
-from urllib.parse import urlparse
+from urllib import parse as urlparse
 import sifter.notificationmethod
 
 __all__ = ('MailtoNotificationMethod',)
@@ -19,7 +19,7 @@ def parse_mailto_url(url):
     @classmethod
     def test_valid(cls, notification_uri):
         uri_headers = cls.parse_mailto_url(notification_uri)
-        uri_headers = dict((k.lower(), v) for k,v in uri_headers.iteritems())
+        uri_headers = dict((k.lower(), v) for k,v in uri_headers.items())
         if any(h in uri_headers for h in ('auto-submitted', 'received', 'date', 'message-id', 'from')):
             return (False, "Notification method mailto - illegal header")
         return (True, '')
@@ -35,4 +35,3 @@ def test_capability(cls, notification_uri, notification_capability):
 
 
 MailtoNotificationMethod.register()
-

sifter/t/test_evaluation.py

@@ -35,9 +35,17 @@ def setUp(self):
             rule_fh.close()
 
     def test_msg_rule_cross_product(self):
+        def to_list(obj):
+            if obj is None or isinstance(obj, (str, int)):
+                return obj
+            elif isinstance(obj, (tuple)):
+                return tuple(to_list(item) for item in obj)
+            else:
+                return list(obj)
+
         for result in self.EVAL_RESULTS:
             self.assertEqual(
-                self.rules[result[1]].evaluate(self.messages[result[0]]),
+                [(action, to_list(value)) for action, value in self.rules[result[1]].evaluate(self.messages[result[0]])],
                 result[2]
                 )