ammogcoder
diff --git a/‎CHANGES.rst‎
Lines changed: 4 additions & 0 deletions b/‎CHANGES.rst‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎telegram/__init__.py‎
Lines changed: 2 additions & 3 deletions b/‎telegram/__init__.py‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎telegram/bot.py‎
Lines changed: 0 additions & 9 deletions b/‎telegram/bot.py‎
Lines changed: 0 additions & 9 deletions
@@ -8,6 +8,10 @@ Changes
 - Internal restructure of files.
 - Improved unitests.
 - Fully support Bot API 3.2.
+- Remove deprecated ``telegram.Emoji``.
+- Remove deprecated ``Botan`` import from ``utils``.
+- Remove deprecated ``ReplyKeyboardHide``.
+- Remove deprecated ``edit_message`` argument of `bot.set_game_score``.
 
 **2017-06-18**
 
 
@@ -38,12 +38,11 @@
 from .keyboardbutton import KeyboardButton
 from .replymarkup import ReplyMarkup
 from .replykeyboardmarkup import ReplyKeyboardMarkup
-from .replykeyboardremove import ReplyKeyboardRemove, ReplyKeyboardHide
+from .replykeyboardremove import ReplyKeyboardRemove
 from .forcereply import ForceReply
 from .error import TelegramError
 from .files.inputfile import InputFile
 from .files.file import File
-from .emoji import Emoji
 from .parsemode import ParseMode
 from .messageentity import MessageEntity
 from .games.animation import Animation
@@ -102,7 +101,7 @@
 
 __all__ = [
     'Audio', 'Bot', 'Chat', 'ChatMember', 'ChatAction', 'ChosenInlineResult', 'CallbackQuery',
-    'Contact', 'Document', 'Emoji', 'File', 'ForceReply', 'InlineKeyboardButton',
+    'Contact', 'Document', 'File', 'ForceReply', 'InlineKeyboardButton',
     'InlineKeyboardMarkup', 'InlineQuery', 'InlineQueryResult', 'InlineQueryResult',
     'InlineQueryResultArticle', 'InlineQueryResultAudio', 'InlineQueryResultCachedAudio',
     'InlineQueryResultCachedDocument', 'InlineQueryResultCachedGif',
 
@@ -1689,7 +1689,6 @@ def set_game_score(self,
                        chat_id=None,
                        message_id=None,
                        inline_message_id=None,
-                       edit_message=None,
                        force=None,
                        disable_edit_message=None,
                        timeout=None,
@@ -1710,8 +1709,6 @@ def set_game_score(self,
                 be useful when fixing mistakes or banning cheaters.
             disable_edit_message (Optional[bool]): Pass True, if the game message should not be
                 automatically edited to include the current scoreboard.
-            edit_message (Optional[bool]): Deprecated. Has the opposite logic for
-                `disable_edit_message`.
             timeout (Optional[int|float]): If this value is specified, use it as the read timeout
                 from the server (instead of the one specified during creation of the connection
                 pool).
@@ -1736,12 +1733,6 @@ def set_game_score(self,
             data['force'] = force
         if disable_edit_message is not None:
             data['disable_edit_message'] = disable_edit_message
-        if edit_message is not None:
-            warnings.warn('edit_message is deprecated, use disable_edit_message instead')
-            if disable_edit_message is None:
-                data['edit_message'] = edit_message
-            else:
-                warnings.warn('edit_message is ignored when disable_edit_message is used')
 
         return url, data