support 'Versand durch ...'

amazon-order-confirmation-mail-parser

@@ -39,7 +39,8 @@ def parse(msg):
             ur' *(?P<name>.*)\s'
                 + ur' *(?P<price_brutto_currency>[A-Z]+) (?P<price_brutto>\d+,\d+)\s'
                 + ur'( *Zustand: (?P<state>.*)\s)?'
-                + ur' *Verkauft von: (?P<reseller>.*)',
+                + ur' *Verkauft von: (?P<reseller>.*)'
+                + ur'(\s *Versand durch (?P<shipper>.*))?',
             article_text,
             re.MULTILINE | re.UNICODE
             )

tests/test_renames_script.py

@@ -17,4 +17,4 @@ def test_integration():
             result = yaml.load(script_stdout)
             with open(mail_path.replace('.eml', '.yml'), 'r') as expected_result_file:
                 expected_result = yaml.load(expected_result_file.read())
-                assert result == expected_result
+                assert result == expected_result, 'unexpected result for ' + os.path.basename(mail_path)