python-telegram-bot · tsnoam · Jun 22, 2017 · Jun 18, 2017 · Jun 20, 2017 · Jun 20, 2017
diff --git a/telegram/__init__.py b/telegram/__init__.py
@@ -18,23 +18,20 @@
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 """A library that provides a Python interface to the Telegram Bot API"""
 
-from sys import version_info
-import sys
-import os
-
 from .base import TelegramObject
 from .user import User
 from .chat import Chat
 from .chatmember import ChatMember
-from .photosize import PhotoSize
-from .audio import Audio
-from .voice import Voice
-from .document import Document
-from .sticker import Sticker
-from .video import Video
-from .contact import Contact
-from .location import Location
-from .venue import Venue
+from .files.photosize import PhotoSize
+from .files.audio import Audio
+from .files.voice import Voice
+from .files.document import Document
+from .files.sticker import Sticker
+from .files.video import Video
+from .files.contact import Contact
+from .files.location import Location
+from .files.venue import Venue
+from .files.videonote import VideoNote
 from .chataction import ChatAction
 from .userprofilephotos import UserProfilePhotos
 from .keyboardbutton import KeyboardButton
@@ -43,56 +40,55 @@
 from .replykeyboardremove import ReplyKeyboardRemove, ReplyKeyboardHide
 from .forcereply import ForceReply
 from .error import TelegramError
-from .inputfile import InputFile
-from .file import File
+from .files.inputfile import InputFile
+from .files.file import File
 from .emoji import Emoji
 from .parsemode import ParseMode
 from .messageentity import MessageEntity
-from .animation import Animation
-from .game import Game
-from .shippingaddress import ShippingAddress
-from .orderinfo import OrderInfo
-from .successfulpayment import SuccessfulPayment
-from .invoice import Invoice
+from .games.animation import Animation
+from .games.game import Game
+from .payment.shippingaddress import ShippingAddress
+from .payment.orderinfo import OrderInfo
+from .payment.successfulpayment import SuccessfulPayment
+from .payment.invoice import Invoice
 from .message import Message
-from .inputmessagecontent import InputMessageContent
 from .callbackquery import CallbackQuery
 from .choseninlineresult import ChosenInlineResult
-from .inlinekeyboardbutton import InlineKeyboardButton
-from .inlinekeyboardmarkup import InlineKeyboardMarkup
-from .inlinequery import InlineQuery
-from .inlinequeryresult import InlineQueryResult
-from .inlinequeryresultarticle import InlineQueryResultArticle
-from .inlinequeryresultaudio import InlineQueryResultAudio
-from .inlinequeryresultcachedaudio import InlineQueryResultCachedAudio
-from .inlinequeryresultcacheddocument import InlineQueryResultCachedDocument
-from .inlinequeryresultcachedgif import InlineQueryResultCachedGif
-from .inlinequeryresultcachedmpeg4gif import InlineQueryResultCachedMpeg4Gif
-from .inlinequeryresultcachedphoto import InlineQueryResultCachedPhoto
-from .inlinequeryresultcachedsticker import InlineQueryResultCachedSticker
-from .inlinequeryresultcachedvideo import InlineQueryResultCachedVideo
-from .inlinequeryresultcachedvoice import InlineQueryResultCachedVoice
-from .inlinequeryresultcontact import InlineQueryResultContact
-from .inlinequeryresultdocument import InlineQueryResultDocument
-from .inlinequeryresultgif import InlineQueryResultGif
-from .inlinequeryresultlocation import InlineQueryResultLocation
-from .inlinequeryresultmpeg4gif import InlineQueryResultMpeg4Gif
-from .inlinequeryresultphoto import InlineQueryResultPhoto
-from .inlinequeryresultvenue import InlineQueryResultVenue
-from .inlinequeryresultvideo import InlineQueryResultVideo
-from .inlinequeryresultvoice import InlineQueryResultVoice
-from .inlinequeryresultgame import InlineQueryResultGame
-from .inputtextmessagecontent import InputTextMessageContent
-from .inputlocationmessagecontent import InputLocationMessageContent
-from .inputvenuemessagecontent import InputVenueMessageContent
-from .inputcontactmessagecontent import InputContactMessageContent
-from .labeledprice import LabeledPrice
-from .shippingoption import ShippingOption
-from .precheckoutquery import PreCheckoutQuery
-from .shippingquery import ShippingQuery
+from .inline.inlinekeyboardbutton import InlineKeyboardButton
+from .inline.inlinekeyboardmarkup import InlineKeyboardMarkup
+from .inline.inputmessagecontent import InputMessageContent
+from .inline.inlinequery import InlineQuery
+from .inline.inlinequeryresult import InlineQueryResult
+from .inline.inlinequeryresultarticle import InlineQueryResultArticle
+from .inline.inlinequeryresultaudio import InlineQueryResultAudio
+from .inline.inlinequeryresultcachedaudio import InlineQueryResultCachedAudio
+from .inline.inlinequeryresultcacheddocument import InlineQueryResultCachedDocument
+from .inline.inlinequeryresultcachedgif import InlineQueryResultCachedGif
+from .inline.inlinequeryresultcachedmpeg4gif import InlineQueryResultCachedMpeg4Gif
+from .inline.inlinequeryresultcachedphoto import InlineQueryResultCachedPhoto
+from .inline.inlinequeryresultcachedsticker import InlineQueryResultCachedSticker
+from .inline.inlinequeryresultcachedvideo import InlineQueryResultCachedVideo
+from .inline.inlinequeryresultcachedvoice import InlineQueryResultCachedVoice
+from .inline.inlinequeryresultcontact import InlineQueryResultContact
+from .inline.inlinequeryresultdocument import InlineQueryResultDocument
+from .inline.inlinequeryresultgif import InlineQueryResultGif
+from .inline.inlinequeryresultlocation import InlineQueryResultLocation
+from .inline.inlinequeryresultmpeg4gif import InlineQueryResultMpeg4Gif
+from .inline.inlinequeryresultphoto import InlineQueryResultPhoto
+from .inline.inlinequeryresultvenue import InlineQueryResultVenue
+from .inline.inlinequeryresultvideo import InlineQueryResultVideo
+from .inline.inlinequeryresultvoice import InlineQueryResultVoice
+from .inline.inlinequeryresultgame import InlineQueryResultGame
+from .inline.inputtextmessagecontent import InputTextMessageContent
+from .inline.inputlocationmessagecontent import InputLocationMessageContent
+from .inline.inputvenuemessagecontent import InputVenueMessageContent
+from .inline.inputcontactmessagecontent import InputContactMessageContent
+from .payment.labeledprice import LabeledPrice
+from .payment.shippingoption import ShippingOption
+from .payment.precheckoutquery import PreCheckoutQuery
+from .payment.shippingquery import ShippingQuery
 from .webhookinfo import WebhookInfo
-from .gamehighscore import GameHighScore
-from .videonote import VideoNote
+from .games.gamehighscore import GameHighScore
 from .update import Update
 from .bot import Bot
 from .constants import (MAX_MESSAGE_LENGTH, MAX_CAPTION_LENGTH, SUPPORTED_WEBHOOK_PORTS,

diff --git a/telegram/files/__init__.py b/telegram/files/__init__.py
diff --git a/telegram/audio.py → telegram/files/audio.py b/telegram/audio.py → telegram/files/audio.py
diff --git a/telegram/contact.py → telegram/files/contact.py b/telegram/contact.py → telegram/files/contact.py
diff --git a/telegram/document.py → telegram/files/document.py b/telegram/document.py → telegram/files/document.py
diff --git a/telegram/file.py → telegram/files/file.py b/telegram/file.py → telegram/files/file.py
diff --git a/telegram/inputfile.py → telegram/files/inputfile.py b/telegram/inputfile.py → telegram/files/inputfile.py
diff --git a/telegram/location.py → telegram/files/location.py b/telegram/location.py → telegram/files/location.py
diff --git a/telegram/photosize.py → telegram/files/photosize.py b/telegram/photosize.py → telegram/files/photosize.py
diff --git a/telegram/sticker.py → telegram/files/sticker.py b/telegram/sticker.py → telegram/files/sticker.py
diff --git a/telegram/venue.py → telegram/files/venue.py b/telegram/venue.py → telegram/files/venue.py
diff --git a/telegram/video.py → telegram/files/video.py b/telegram/video.py → telegram/files/video.py
diff --git a/telegram/videonote.py → telegram/files/videonote.py b/telegram/videonote.py → telegram/files/videonote.py
diff --git a/telegram/voice.py → telegram/files/voice.py b/telegram/voice.py → telegram/files/voice.py
diff --git a/telegram/games/__init__.py b/telegram/games/__init__.py
diff --git a/telegram/animation.py → telegram/games/animation.py b/telegram/animation.py → telegram/games/animation.py
diff --git a/telegram/callbackgame.py → telegram/games/callbackgame.py b/telegram/callbackgame.py → telegram/games/callbackgame.py
diff --git a/telegram/game.py → telegram/games/game.py b/telegram/game.py → telegram/games/game.py
diff --git a/telegram/gamehighscore.py → telegram/games/gamehighscore.py b/telegram/gamehighscore.py → telegram/games/gamehighscore.py
diff --git a/telegram/inline/__init__.py b/telegram/inline/__init__.py
diff --git a/telegram/inlinekeyboardbutton.py → telegram/inline/inlinekeyboardbutton.py b/telegram/inlinekeyboardbutton.py → telegram/inline/inlinekeyboardbutton.py
diff --git a/telegram/inlinekeyboardmarkup.py → telegram/inline/inlinekeyboardmarkup.py b/telegram/inlinekeyboardmarkup.py → telegram/inline/inlinekeyboardmarkup.py
diff --git a/telegram/inlinequery.py → telegram/inline/inlinequery.py b/telegram/inlinequery.py → telegram/inline/inlinequery.py
diff --git a/telegram/inlinequeryresult.py → telegram/inline/inlinequeryresult.py b/telegram/inlinequeryresult.py → telegram/inline/inlinequeryresult.py
diff --git a/telegram/inlinequeryresultarticle.py → telegram/inline/inlinequeryresultarticle.py b/telegram/inlinequeryresultarticle.py → telegram/inline/inlinequeryresultarticle.py
diff --git a/telegram/inlinequeryresultaudio.py → telegram/inline/inlinequeryresultaudio.py b/telegram/inlinequeryresultaudio.py → telegram/inline/inlinequeryresultaudio.py
diff --git a/telegram/inlinequeryresultcachedaudio.py → ...am/inline/inlinequeryresultcachedaudio.py b/telegram/inlinequeryresultcachedaudio.py → ...am/inline/inlinequeryresultcachedaudio.py
diff --git a/telegram/inlinequeryresultcacheddocument.py → ...inline/inlinequeryresultcacheddocument.py b/telegram/inlinequeryresultcacheddocument.py → ...inline/inlinequeryresultcacheddocument.py
diff --git a/telegram/inlinequeryresultcachedgif.py → ...gram/inline/inlinequeryresultcachedgif.py b/telegram/inlinequeryresultcachedgif.py → ...gram/inline/inlinequeryresultcachedgif.py
diff --git a/telegram/inlinequeryresultcachedmpeg4gif.py → ...inline/inlinequeryresultcachedmpeg4gif.py b/telegram/inlinequeryresultcachedmpeg4gif.py → ...inline/inlinequeryresultcachedmpeg4gif.py
diff --git a/telegram/inlinequeryresultcachedphoto.py → ...am/inline/inlinequeryresultcachedphoto.py b/telegram/inlinequeryresultcachedphoto.py → ...am/inline/inlinequeryresultcachedphoto.py
diff --git a/telegram/inlinequeryresultcachedsticker.py → .../inline/inlinequeryresultcachedsticker.py b/telegram/inlinequeryresultcachedsticker.py → .../inline/inlinequeryresultcachedsticker.py
diff --git a/telegram/inlinequeryresultcachedvideo.py → ...am/inline/inlinequeryresultcachedvideo.py b/telegram/inlinequeryresultcachedvideo.py → ...am/inline/inlinequeryresultcachedvideo.py
diff --git a/telegram/inlinequeryresultcachedvoice.py → ...am/inline/inlinequeryresultcachedvoice.py b/telegram/inlinequeryresultcachedvoice.py → ...am/inline/inlinequeryresultcachedvoice.py
diff --git a/telegram/inlinequeryresultcontact.py → telegram/inline/inlinequeryresultcontact.py b/telegram/inlinequeryresultcontact.py → telegram/inline/inlinequeryresultcontact.py
diff --git a/telegram/inlinequeryresultdocument.py → telegram/inline/inlinequeryresultdocument.py b/telegram/inlinequeryresultdocument.py → telegram/inline/inlinequeryresultdocument.py
diff --git a/telegram/inlinequeryresultgame.py → telegram/inline/inlinequeryresultgame.py b/telegram/inlinequeryresultgame.py → telegram/inline/inlinequeryresultgame.py
diff --git a/telegram/inlinequeryresultgif.py → telegram/inline/inlinequeryresultgif.py b/telegram/inlinequeryresultgif.py → telegram/inline/inlinequeryresultgif.py
diff --git a/telegram/inlinequeryresultlocation.py → telegram/inline/inlinequeryresultlocation.py b/telegram/inlinequeryresultlocation.py → telegram/inline/inlinequeryresultlocation.py
diff --git a/telegram/inlinequeryresultmpeg4gif.py → telegram/inline/inlinequeryresultmpeg4gif.py b/telegram/inlinequeryresultmpeg4gif.py → telegram/inline/inlinequeryresultmpeg4gif.py
diff --git a/telegram/inlinequeryresultphoto.py → telegram/inline/inlinequeryresultphoto.py b/telegram/inlinequeryresultphoto.py → telegram/inline/inlinequeryresultphoto.py
diff --git a/telegram/inlinequeryresultvenue.py → telegram/inline/inlinequeryresultvenue.py b/telegram/inlinequeryresultvenue.py → telegram/inline/inlinequeryresultvenue.py
diff --git a/telegram/inlinequeryresultvideo.py → telegram/inline/inlinequeryresultvideo.py b/telegram/inlinequeryresultvideo.py → telegram/inline/inlinequeryresultvideo.py
diff --git a/telegram/inlinequeryresultvoice.py → telegram/inline/inlinequeryresultvoice.py b/telegram/inlinequeryresultvoice.py → telegram/inline/inlinequeryresultvoice.py
diff --git a/telegram/inputcontactmessagecontent.py → ...gram/inline/inputcontactmessagecontent.py b/telegram/inputcontactmessagecontent.py → ...gram/inline/inputcontactmessagecontent.py
diff --git a/telegram/inputlocationmessagecontent.py → ...ram/inline/inputlocationmessagecontent.py b/telegram/inputlocationmessagecontent.py → ...ram/inline/inputlocationmessagecontent.py
diff --git a/telegram/inputmessagecontent.py → telegram/inline/inputmessagecontent.py b/telegram/inputmessagecontent.py → telegram/inline/inputmessagecontent.py
diff --git a/telegram/inputtextmessagecontent.py → telegram/inline/inputtextmessagecontent.py b/telegram/inputtextmessagecontent.py → telegram/inline/inputtextmessagecontent.py
diff --git a/telegram/inputvenuemessagecontent.py → telegram/inline/inputvenuemessagecontent.py b/telegram/inputvenuemessagecontent.py → telegram/inline/inputvenuemessagecontent.py
diff --git a/telegram/message.py b/telegram/message.py
@@ -23,10 +23,10 @@
 from time import mktime
 
 from telegram import (Audio, Contact, Document, Chat, Location, PhotoSize, Sticker, TelegramObject,
-                      User, Video, Voice, Venue, MessageEntity, Game, Invoice, SuccessfulPayment)
+                      User, Video, Voice, Venue, MessageEntity, Game, Invoice, SuccessfulPayment,
+                      VideoNote)
 from telegram.utils.deprecate import warn_deprecate_obj
 from telegram.utils.helpers import escape_html, escape_markdown
-from telegram.videonote import VideoNote
 
 
 class Message(TelegramObject):

diff --git a/telegram/payment/__init__.py b/telegram/payment/__init__.py
diff --git a/telegram/invoice.py → telegram/payment/invoice.py b/telegram/invoice.py → telegram/payment/invoice.py
diff --git a/telegram/labeledprice.py → telegram/payment/labeledprice.py b/telegram/labeledprice.py → telegram/payment/labeledprice.py
diff --git a/telegram/orderinfo.py → telegram/payment/orderinfo.py b/telegram/orderinfo.py → telegram/payment/orderinfo.py
diff --git a/telegram/precheckoutquery.py → telegram/payment/precheckoutquery.py b/telegram/precheckoutquery.py → telegram/payment/precheckoutquery.py
diff --git a/telegram/shippingaddress.py → telegram/payment/shippingaddress.py b/telegram/shippingaddress.py → telegram/payment/shippingaddress.py
diff --git a/telegram/shippingoption.py → telegram/payment/shippingoption.py b/telegram/shippingoption.py → telegram/payment/shippingoption.py
diff --git a/telegram/shippingquery.py → telegram/payment/shippingquery.py b/telegram/shippingquery.py → telegram/payment/shippingquery.py
diff --git a/telegram/successfulpayment.py → telegram/payment/successfulpayment.py b/telegram/successfulpayment.py → telegram/payment/successfulpayment.py
diff --git a/tests/test_photo.py b/tests/test_photo.py
@@ -127,16 +127,15 @@ def test_send_photo_url_jpg_file(self):
     @flaky(3, 1)
     @timeout(10)
     def test_send_photo_bytesio_jpg_file(self):
-        from telegram.inputfile import InputFile
         # raw image bytes
         raw_bytes = BytesIO(open(self.photo_bytes_jpg_no_standard, 'rb').read())
-        inputfile = InputFile({"photo": raw_bytes})
+        inputfile = telegram.InputFile({"photo": raw_bytes})
         self.assertEqual(inputfile.mimetype, 'application/octet-stream')
 
         # raw image bytes with name info
         raw_bytes = BytesIO(open(self.photo_bytes_jpg_no_standard, 'rb').read())
         raw_bytes.name = self.photo_bytes_jpg_no_standard
-        inputfile = InputFile({"photo": raw_bytes})
+        inputfile = telegram.InputFile({"photo": raw_bytes})
         self.assertEqual(inputfile.mimetype, 'image/jpeg')
 
         # send raw photo