re-order imports

telegram/bot.py

@@ -21,8 +21,8 @@
 """This module contains a object that represents a Telegram Bot."""
 
 import logging
-
 import functools
+
 from telegram import User, Message, Update, UserProfilePhotos, File, \
     ReplyMarkup, TelegramObject, NullHandler
 from telegram.utils import request

telegram/inputfile.py

@@ -20,6 +20,11 @@
 
 """This module contains a object that represents a Telegram InputFile."""
 
+import mimetypes
+import os
+import sys
+import imghdr
+
 try:
     from email.generator import _make_boundary as choose_boundary
     from urllib.request import urlopen
@@ -27,11 +32,6 @@ except ImportError:
     from mimetools import choose_boundary
     from urllib2 import urlopen
 
-import mimetypes
-import os
-import sys
-import imghdr
-
 from telegram import TelegramError
 
 DEFAULT_MIME_TYPE = 'application/octet-stream'

tests/test_audio.py

@@ -20,8 +20,8 @@
 
 import sys
 import unittest
-
 import os
+
 from flaky import flaky
 
 sys.path.append('.')

tests/test_bot.py

@@ -21,8 +21,8 @@
 
 import sys
 from datetime import datetime
-
 import io
+
 from flaky import flaky
 
 if sys.version_info[0:2] == (2, 6):

tests/test_botan.py

@@ -3,8 +3,8 @@
 
 import sys
 import unittest
-
 import os
+
 from flaky import flaky
 
 sys.path.append('.')

tests/test_document.py

@@ -20,8 +20,8 @@
 
 import sys
 import unittest
-
 import os
+
 from flaky import flaky
 
 sys.path.append('.')

tests/test_file.py

@@ -20,7 +20,6 @@
 
 import sys
 import unittest
-
 import os
 
 sys.path.append('.')

tests/test_filters.py

@@ -20,9 +20,10 @@
 This module contains a object that represents Tests for MessageHandler.Filters
 """
 
-import unittest
 import sys
+import unittest
 from datetime import datetime
+
 sys.path.append('.')
 
 from telegram import Update, Message, User, Chat

tests/test_photo.py

@@ -20,8 +20,8 @@
 
 import sys
 import unittest
-
 import os
+
 from flaky import flaky
 
 sys.path.append('.')

tests/test_sticker.py

@@ -20,8 +20,8 @@
 
 import sys
 import unittest
-
 import os
+
 from flaky import flaky
 
 sys.path.append('.')

tests/test_updater.py

@@ -24,14 +24,14 @@ WebhookServer and WebhookHandler
 import logging
 import signal
 import sys
-from datetime import datetime
-from time import sleep
-
 import os
 import re
-from future.builtins import bytes
+from datetime import datetime
+from time import sleep
 from random import randrange
 
+from future.builtins import bytes
+
 if sys.version_info[0:2] == (2, 6):
     import unittest2 as unittest
 else:

tests/test_video.py

@@ -20,8 +20,8 @@
 
 import sys
 import unittest
-
 import os
+
 from flaky import flaky
 
 sys.path.append('.')

tests/test_voice.py

@@ -20,8 +20,8 @@
 
 import sys
 import unittest
-
 import os
+
 from flaky import flaky
 
 sys.path.append('.')