From c88865da049d4e36f11d27306b2fc86ae5184596 Mon Sep 17 00:00:00 2001
From: Marco Sangalli <marco.sangalli@sensitive.io>
Date: Sun, 28 Feb 2016 02:33:49 +0100
Subject: [PATCH] Prepare to release v3.3

---
 CHANGES.rst          | 13 +++++++++++++
 docs/source/conf.py  |  2 +-
 setup.py             |  2 +-
 telegram/__init__.py |  2 +-
 telegram/bot.py      |  6 ++++++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 7b4c47e69..d9a27dc23 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,16 @@
+**2016-02-28**
+
+*Released 3.3*
+
+- Inline bots
+- Send any file by URL
+- Specialized exceptions: ``Unauthorized``, ``InvalidToken``, ``NetworkError`` and ``TimedOut``
+- Integration for botan.io (thanks to @ollmer)
+- HTML Parsemode (thanks to @jlmadurga)
+- Bugfixes and under-the-hood improvements
+
+**Very special thanks to Noam Meltzer (@tsnoam) for all of his work!**
+
 **2016-01-09**
 
 *Released 3.3b1*
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 8b2feea43..42b2ce18f 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -60,7 +60,7 @@ author = u'Leandro Toledo'
 # The short X.Y version.
 version = '3.3'
 # The full version, including alpha/beta/rc tags.
-release = '3.3b1'
+release = '3.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 09d198297..6c7f5d190 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ def requirements():
 
 setup(
     name='python-telegram-bot',
-    version='3.3b1',
+    version='3.3',
     author='Leandro Toledo',
     author_email='devs@python-telegram-bot.org',
     license='LGPLv3',
diff --git a/telegram/__init__.py b/telegram/__init__.py
index 42a2a985c..605bf291a 100644
--- a/telegram/__init__.py
+++ b/telegram/__init__.py
@@ -56,7 +56,7 @@ from .updater import Updater
 
 
 __author__ = 'devs@python-telegram-bot.org'
-__version__ = '3.3b1'
+__version__ = '3.3'
 __all__ = ('Bot', 'Updater', 'Dispatcher', 'Emoji', 'TelegramError',
            'InputFile', 'ReplyMarkup', 'ForceReply', 'ReplyKeyboardHide',
            'ReplyKeyboardMarkup', 'UserProfilePhotos', 'ChatAction',
diff --git a/telegram/bot.py b/telegram/bot.py
index a5f6cbdc6..b1f3a6163 100644
--- a/telegram/bot.py
+++ b/telegram/bot.py
@@ -199,6 +199,7 @@ class Bot(TelegramObject):
                     text,
                     parse_mode=None,
                     disable_web_page_preview=None,
+                    disable_notification=None,
                     **kwargs):
         """Use this method to send text messages.
 
@@ -213,6 +214,9 @@ class Bot(TelegramObject):
             Text of the message to be sent.
           disable_web_page_preview:
             Disables link previews for links in this message. [Optional]
+          disable_notification:
+            Sends the message silently. iOS users will not receive a notification,
+            Android users will receive a notification with no sound. [Optional]
           reply_to_message_id:
             If the message is a reply, ID of the original message. [Optional]
           reply_markup:
@@ -233,6 +237,8 @@ class Bot(TelegramObject):
             data['parse_mode'] = parse_mode
         if disable_web_page_preview:
             data['disable_web_page_preview'] = disable_web_page_preview
+        if disable_notification:
+            data['disable_notification'] = disable_notification
 
         return url, data