Removed trailing slashes from URLs

JosXa · JosXa · commit 8648d5a65b46 · 2017-10-07T02:37:29.000+02:00
diff --git a/telegram/utils/helpers.py b/telegram/utils/helpers.py
@@ -143,6 +143,9 @@ def extract_urls(message):
     if message.caption:
         all_urls += _extract_urls_from_text(message.caption)
 
+    # Strip trailing slash from URL so we can compare them for equality
+    stripped_urls = [x[:-1] if x[-1] == '/' else x for x in all_urls]
+
     # Remove exact duplicates
-    urls = OrderedDict({k: None for k in all_urls})
+    urls = OrderedDict({k: None for k in stripped_urls})
     return list(urls.keys())
diff --git a/tests/test_helpers.py b/tests/test_helpers.py
@@ -56,10 +56,10 @@ def test_extract_urls_entities(self):
                                entities=[MessageEntity(**e) for e in test_entities])
         result = helpers.extract_urls(test_message)
 
-        assert len(result) == 3
-        assert (test_entities[0]['url'] == result[0])
-        assert (result[1] == 'http://github.com')
-        assert (test_entities[2]['url'] == result[2])
+        assert len(result) == 2
+        assert (test_entities[0]['url'][:-1] == result[0])
+        assert (result[0] == 'http://github.com')
+        assert (test_entities[2]['url'] == result[1])
 
     def test_extract_urls_caption(self):
         caption = "Taken from https://stackoverflow.com/questions/520031/whats" \
