Making flake8 happy

JosXa · JosXa · commit a0cfb48682c8 · 2017-10-07T02:32:19.000+02:00
diff --git a/telegram/utils/helpers.py b/telegram/utils/helpers.py
@@ -21,10 +21,11 @@
 import re
 from collections import OrderedDict
 from datetime import datetime
+
 try:
     from urllib.parse import urlparse
 except ImportError:
-     from urlparse import urlparse
+    from urlparse import urlparse
 
 try:
     from html import escape as escape_html  # noqa: F401
@@ -41,7 +42,6 @@ def _timestamp(dt_obj):
     # Python < 3.3 (incl 2.7)
     from time import mktime
 
-
     def _timestamp(dt_obj):
         return mktime(dt_obj.timetuple())
 
@@ -137,11 +137,8 @@ def extract_urls(message):
     """
     from telegram import MessageEntity
 
-    results = message.parse_entities(types=[
-        MessageEntity.URL,
-        MessageEntity.TEXT_LINK])
-    all_urls = [v if k.type == MessageEntity.URL
-                else k.url for k, v in results.items()]
+    results = message.parse_entities(types=[MessageEntity.URL, MessageEntity.TEXT_LINK])
+    all_urls = [v if k.type == MessageEntity.URL else k.url for k, v in results.items()]
 
     if message.caption:
         all_urls += _extract_urls_from_text(message.caption)
diff --git a/tests/test_helpers.py b/tests/test_helpers.py
@@ -30,7 +30,8 @@ def test_escape_markdown(self):
         assert expected_str == helpers.escape_markdown(test_str)
 
     def test_extract_urls_from_text(self):
-        urls = "http://google.com and http://github.com/ and python-telegram-bot.readthedocs.io/en/latest/"
+        urls = "http://google.com and http://github.com/ and " \
+               "python-telegram-bot.readthedocs.io/en/latest/"
         result = helpers._extract_urls_from_text(urls)
         assert len(result) == 2
         assert result[0] == 'http://google.com'
@@ -40,12 +41,12 @@ def test_extract_urls_entities(self):
         test_entities = [{
             'length': 6, 'offset': 0, 'type': 'text_link',
             'url': 'http://github.com/'
-        },
-            {'length': 17, 'offset': 23, 'type': 'url'},
-            {
-                'length': 14, 'offset': 43, 'type': 'text_link',
-                'url': 'http://google.com'
-            }]
+        }, {
+            'length': 17, 'offset': 23, 'type': 'url'
+        }, {
+            'length': 14, 'offset': 43, 'type': 'text_link',
+            'url': 'http://google.com'
+        }]
         test_text = 'Github can be found at http://github.com. Google is here.'
         test_message = Message(message_id=1,
                                from_user=None,
