Fix lines too long

.travis.yml

@@ -4,5 +4,9 @@ python:
   - "2.7"
   - "3.3"
   - "3.4"
-  - "nightly"
-script: make test
+install:
+  - pip install coveralls
+script:
+  coverage run telegram_test.py
+after_success:
+  coveralls

AUTHORS.rst

@@ -1 +1,20 @@
-* Leandro Toledo
+Credits
+=======
+
+``python-telegram-bot`` is written and maintained by `Leandro Toledo <https://github.com/leandrotoledo>`_.
+
+Contributors
+------------
+
+The following wonderful people contributed directly or indirectly to this project:
+
+- `Avanatiker <https://github.com/Avanatiker>`_
+- `bimmlerd <https://github.com/bimmlerd>`_
+- `franciscod <https://github.com/franciscod>`_
+- `JASON0916 <https://github.com/JASON0916>`_
+- `JRoot3D <https://github.com/JRoot3D>`_
+- `macrojames <https://github.com/macrojames>`_
+- `sooyhwang <https://github.com/sooyhwang>`_
+- `wjt <https://github.com/wjt>`_
+
+Please add yourself here alphabetically when you submit your first pull request.

CHANGES

@@ -1,3 +1,34 @@
+2015-08-17
+  Release 2.7
+  Added support for Voice object and sendVoice method
+  Due backward compatibility performer or/and title will be required for sendAudio
+  Fixed JSON serialization when forwared message
+
+
+2015-08-15
+  Released 2.6.1
+  Fixed parsing image header issue on < Python 2.7.3
+
+
+2015-08-14
+  Released 2.6.0
+  Depreciation of require_authentication and clearCredentials methods
+  Giving AUTHORS the proper credits for their contribution for this project
+  Message.date and Message.forward_date are now datetime objects
+
+
+2015-08-12
+  Released 2.5.3
+  telegram.Bot now supports to be unpickled
+
+
+2015-08-11
+  Released 2.5.2
+  New changes from Telegram Bot API have been applied
+  telegram.Bot now supports to be pickled
+  Return empty str instead None when message.text is empty
+
+
 2015-08-10
   Released 2.5.1
   Moved from GPLv2 to LGPLv3

CONTRIBUTING.rst

@@ -0,0 +1,39 @@
+How To Contribute
+=================
+
+Every open source project lives from the generous help by contributors that sacrifice their time and ``python-telegram-bot`` is no different.
+
+To make participation as pleasant as possible, this project adheres to the `Code of Conduct`_ by the Python Software Foundation.
+
+Here are a few guidelines to get you started:
+
+- Add yourself to the AUTHORS.rst_ file in an alphabetical fashion.
+  Every contribution is valuable and shall be credited.
+- If your change is noteworthy, add an entry to the CHANGES_.
+- No contribution is too small; please submit as many fixes for typos and grammar bloopers as you can!
+- Don’t break backward compatibility.
+- *Always* add tests and docs for your code.
+  This is a hard rule; patches with missing tests or documentation won’t be merged.
+  If a feature is not tested or documented, it doesn’t exist.
+- Obey `PEP 8`_ and `PEP 257`_.
+- Follow `Google Python Style Guide`_ and `Google Python Style Docstrings`_.
+- Write `good commit messages`_.
+
+.. note::
+   If you have something great but aren’t sure whether it adheres -- or even can adhere -- to the rules above: **please submit a pull request anyway**!
+
+   In the best case, we can mold it into something, in the worst case the pull request gets politely closed.
+   There’s absolutely nothing to fear.
+
+Thank you for considering to contribute to ``python-telegram-bot``!
+If you have any question or concerns, feel free to reach out to me.
+
+
+.. _`PEP 8`: https://www.python.org/dev/peps/pep-0008/
+.. _`PEP 257`: https://www.python.org/dev/peps/pep-0257/
+.. _`good commit messages`: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+.. _`Code of Conduct`: https://www.python.org/psf/codeofconduct/
+.. _`Google Python Style Guide`: https://google-styleguide.googlecode.com/svn/trunk/pyguide.html
+.. _`Google Python Style Docstrings`: http://sphinx-doc.org/latest/ext/example_google.html
+.. _CHANGES: https://github.com/leandrotoledo/python-telegram-bot/blob/master/CHANGES
+.. _AUTHORS.rst: https://github.com/leandrotoledo/python-telegram-bot/blob/master/AUTHORS.rst

README.rst

@@ -4,13 +4,33 @@ A Python wrapper around the Telegram Bot API.
 
 By `Leandro Toledo <leandrotoledodesouza@gmail.com>`_
 
+.. image:: https://img.shields.io/pypi/v/python-telegram-bot.svg
+   :target: https://pypi.python.org/pypi/python-telegram-bot
+   :alt: PyPi Package Version
+    
+.. image:: https://img.shields.io/pypi/dm/python-telegram-bot.svg
+   :target: https://pypi.python.org/pypi/python-telegram-bot
+   :alt: PyPi Package Monthly Download
+   
+.. image:: https://readthedocs.org/projects/python-telegram-bot/badge/?version=latest
+   :target: https://readthedocs.org/projects/python-telegram-bot/?badge=latest
+   :alt: Documentation Status
+   
+.. image:: https://img.shields.io/github/license/leandrotoledo/python-telegram-bot.svg
+   :target: http://www.gnu.org/licenses/lgpl-3.0.html
+   :alt: LGPLv3 License
+
 .. image:: https://travis-ci.org/leandrotoledo/python-telegram-bot.svg?branch=master
-    :target: https://travis-ci.org/leandrotoledo/python-telegram-bot
-    :alt: Travis CI Status
+   :target: https://travis-ci.org/leandrotoledo/python-telegram-bot
+   :alt: Travis CI Status
 
 .. image:: https://codeclimate.com/github/leandrotoledo/python-telegram-bot/badges/gpa.svg
    :target: https://codeclimate.com/github/leandrotoledo/python-telegram-bot
    :alt: Code Climate
+   
+.. image:: https://coveralls.io/repos/leandrotoledo/python-telegram-bot/badge.svg?branch=master&service=github
+   :target: https://coveralls.io/github/leandrotoledo/python-telegram-bot?branch=master
+   :alt: Coveralls
 
 =================
 Table of contents
@@ -28,13 +48,15 @@ Table of contents
 
 - `Getting the code`_
 
-- `Documentation`_
+- `Getting started`_
 
   1. `API`_
 
   2. `Logging`_
 
   3. `Examples`_
+  
+  4. `Documentation`_
 
 - `License`_
 
@@ -67,6 +89,7 @@ sendAudio                 Yes
 sendDocument              Yes
 sendSticker               Yes
 sendVideo                 Yes
+sendVoice                 Yes
 sendLocation              Yes
 sendChatAction            Yes
 getUpdates                Yes
@@ -118,9 +141,9 @@ To see other options available, run:
 
     $ make help
 
-================
-_`Documentation`
-================
+==================
+_`Getting started`
+==================
 
 View the last release API documentation at: https://core.telegram.org/bots/api
 
@@ -172,9 +195,9 @@ To post an image file via URL (right now only sendPhoto supports this)::
 
     >>> bot.sendPhoto(chat_id=chat_id, photo='https://telegram.org/img/t_logo.png')
 
-To post an audio file::
+To post a voice file::
 
-    >>> bot.sendAudio(chat_id=chat_id, audio=open('tests/telegram.ogg', 'rb'))
+    >>> bot.sendVoice(chat_id=chat_id, voice=open('tests/telegram.ogg', 'rb'))
 
 To tell the user that something is happening on bot's side::
 
@@ -223,6 +246,12 @@ Here follows some examples to help you to get your own Bot up to speed:
 
 - `DevOps Reaction Bot <https://github.com/leandrotoledo/gae-devops-reaction-telegram-bot>`_ sends latest or random posts from `DevOps Reaction <http://devopsreactions.tumblr.com/>`_. Running on `Google App Engine <https://cloud.google.com/appengine>`_ (billing has to be enabled for fully Socket API support).
 
+================
+_`Documentation`
+================
+
+``python-telegram-bot``'s documentation lives at `Read the Docs <http://python-telegram-bot.readthedocs.org/en/latest/>`_.
+
 ==========
 _`License`
 ==========

docs-requirements.txt

@@ -0,0 +1,3 @@
+sphinx
+sphinx_rtd_theme
+sphinx-pypi-upload

docs/Makefile

@@ -0,0 +1,192 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = build
+
+# User-friendly check for sphinx-build
+ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+endif
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  applehelp  to make an Apple Help Book"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  xml        to make Docutils-native XML files"
+	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  coverage   to run coverage check of the documentation (if enabled)"
+
+clean:
+	rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/PythonTelegramBot.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/PythonTelegramBot.qhc"
+
+applehelp:
+	$(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp
+	@echo
+	@echo "Build finished. The help book is in $(BUILDDIR)/applehelp."
+	@echo "N.B. You won't be able to view it unless you put it in" \
+	      "~/Library/Documentation/Help or install it in your application" \
+	      "bundle."
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/PythonTelegramBot"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/PythonTelegramBot"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+latexpdfja:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through platex and dvipdfmx..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."
+
+coverage:
+	$(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
+	@echo "Testing of coverage in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/coverage/python.txt."
+
+xml:
+	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+	@echo
+	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+pseudoxml:
+	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+	@echo
+	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."

docs/source/conf.py

@@ -0,0 +1,287 @@
+# -*- coding: utf-8 -*-
+#
+# Python Telegram Bot documentation build configuration file, created by
+# sphinx-quickstart on Mon Aug 10 22:25:07 2015.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys
+import os
+import shlex
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('../..'))
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+    'sphinx.ext.autodoc',
+    'sphinx.ext.napoleon'
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+# source_suffix = ['.rst', '.md']
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Python Telegram Bot'
+copyright = u'2015, Leandro Toledo'
+author = u'Leandro Toledo'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '2.5'
+# The full version, including alpha/beta/rc tags.
+release = '2.5.1'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# If true, keep warnings as "system message" paragraphs in the built documents.
+#keep_warnings = False
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'sphinx_rtd_theme'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# Add any extra paths that contain custom files (such as robots.txt or
+# .htaccess) here, relative to this directory. These files are copied
+# directly to the root of the documentation.
+#html_extra_path = []
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Language to be used for generating the HTML full-text search index.
+# Sphinx supports the following languages:
+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
+#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
+#html_search_language = 'en'
+
+# A dictionary with options for the search language support, empty by default.
+# Now only 'ja' uses this config value
+#html_search_options = {'type': 'default'}
+
+# The name of a javascript file (relative to the configuration directory) that
+# implements a search results scorer. If empty, the default will be used.
+#html_search_scorer = 'scorer.js'
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'PythonTelegramBotdoc'
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+
+# Latex figure (float) alignment
+#'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+  (master_doc, 'PythonTelegramBot.tex', u'Python Telegram Bot Documentation',
+   u'Leandro Toledo', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'pythontelegrambot', u'Python Telegram Bot Documentation',
+     [author], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+  (master_doc, 'PythonTelegramBot', u'Python Telegram Bot Documentation',
+   author, 'PythonTelegramBot', 'One line description of project.',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
+
+# If true, do not generate a @detailmenu in the "Top" node's menu.
+#texinfo_no_detailmenu = False

docs/source/index.rst

@@ -0,0 +1,23 @@
+.. Python Telegram Bot documentation master file, created by
+   sphinx-quickstart on Mon Aug 10 22:25:07 2015.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to Python Telegram Bot's documentation!
+===============================================
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
+

docs/source/modules.rst

@@ -0,0 +1,7 @@
+telegram
+========
+
+.. toctree::
+   :maxdepth: 4
+
+   telegram

docs/source/telegram.audio.rst

@@ -0,0 +1,7 @@
+telegram.audio module
+=====================
+
+.. automodule:: telegram.audio
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.base.rst

@@ -0,0 +1,7 @@
+telegram.base module
+====================
+
+.. automodule:: telegram.base
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.bot.rst

@@ -0,0 +1,7 @@
+telegram.bot module
+===================
+
+.. automodule:: telegram.bot
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.chataction.rst

@@ -0,0 +1,7 @@
+telegram.chataction module
+==========================
+
+.. automodule:: telegram.chataction
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.contact.rst

@@ -0,0 +1,7 @@
+telegram.contact module
+=======================
+
+.. automodule:: telegram.contact
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.document.rst

@@ -0,0 +1,7 @@
+telegram.document module
+========================
+
+.. automodule:: telegram.document
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.emoji.rst

@@ -0,0 +1,7 @@
+telegram.emoji module
+=====================
+
+.. automodule:: telegram.emoji
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.error.rst

@@ -0,0 +1,7 @@
+telegram.error module
+=====================
+
+.. automodule:: telegram.error
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.forcereply.rst

@@ -0,0 +1,7 @@
+telegram.forcereply module
+==========================
+
+.. automodule:: telegram.forcereply
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.groupchat.rst

@@ -0,0 +1,7 @@
+telegram.groupchat module
+=========================
+
+.. automodule:: telegram.groupchat
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.inputfile.rst

@@ -0,0 +1,7 @@
+telegram.inputfile module
+=========================
+
+.. automodule:: telegram.inputfile
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.location.rst

@@ -0,0 +1,7 @@
+telegram.location module
+========================
+
+.. automodule:: telegram.location
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.message.rst

@@ -0,0 +1,7 @@
+telegram.message module
+=======================
+
+.. automodule:: telegram.message
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.nullhandler.rst

@@ -0,0 +1,7 @@
+telegram.nullhandler module
+===========================
+
+.. automodule:: telegram.nullhandler
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.photosize.rst

@@ -0,0 +1,7 @@
+telegram.photosize module
+=========================
+
+.. automodule:: telegram.photosize
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.replykeyboardhide.rst

@@ -0,0 +1,7 @@
+telegram.replykeyboardhide module
+=================================
+
+.. automodule:: telegram.replykeyboardhide
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.replykeyboardmarkup.rst

@@ -0,0 +1,7 @@
+telegram.replykeyboardmarkup module
+===================================
+
+.. automodule:: telegram.replykeyboardmarkup
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.replymarkup.rst

@@ -0,0 +1,7 @@
+telegram.replymarkup module
+===========================
+
+.. automodule:: telegram.replymarkup
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.rst

@@ -0,0 +1,40 @@
+telegram package
+================
+
+Submodules
+----------
+
+.. toctree::
+
+   telegram.audio
+   telegram.base
+   telegram.bot
+   telegram.chataction
+   telegram.contact
+   telegram.document
+   telegram.emoji
+   telegram.error
+   telegram.forcereply
+   telegram.groupchat
+   telegram.inputfile
+   telegram.location
+   telegram.message
+   telegram.nullhandler
+   telegram.photosize
+   telegram.replykeyboardhide
+   telegram.replykeyboardmarkup
+   telegram.replymarkup
+   telegram.sticker
+   telegram.update
+   telegram.user
+   telegram.userprofilephotos
+   telegram.video
+   telegram.voice
+
+Module contents
+---------------
+
+.. automodule:: telegram
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.sticker.rst

@@ -0,0 +1,7 @@
+telegram.sticker module
+=======================
+
+.. automodule:: telegram.sticker
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.update.rst

@@ -0,0 +1,7 @@
+telegram.update module
+======================
+
+.. automodule:: telegram.update
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.user.rst

@@ -0,0 +1,7 @@
+telegram.user module
+====================
+
+.. automodule:: telegram.user
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.userprofilephotos.rst

@@ -0,0 +1,7 @@
+telegram.userprofilephotos module
+=================================
+
+.. automodule:: telegram.userprofilephotos
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.video.rst

@@ -0,0 +1,7 @@
+telegram.video module
+=====================
+
+.. automodule:: telegram.video
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/source/telegram.voice.rst

@@ -0,0 +1,7 @@
+telegram.voice module
+=====================
+
+.. automodule:: telegram.voice
+    :members:
+    :undoc-members:
+    :show-inheritance:

examples/echobot.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    Simple Bot to reply Telegram messages
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# Simple Bot to reply Telegram messages
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 import logging

examples/roboed.py

@@ -1,23 +1,21 @@
 #!/usr/bin/env python
 # encoding: utf-8
-
-"""
-    Robô Ed Telegram Bot
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# Robô Ed Telegram Bot
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 __author__ = 'leandrotoledodesouza@gmail.com'

setup.cfg

@@ -0,0 +1,10 @@
+[wheel]
+universal = 1
+
+[build_sphinx]
+source-dir = docs/source
+build-dir  = docs/build
+all_files  = 1
+
+[upload_sphinx]
+upload-dir = docs/build/html

setup.py

@@ -15,7 +15,7 @@ def read(*paths):
 
 setup(
     name='python-telegram-bot',
-    version='2.5.1',
+    version='2.7',
     author='Leandro Toledo',
     author_email='leandrotoledodesouza@gmail.com',
     license='LGPLv3',
@@ -24,7 +24,7 @@ setup(
     description='A Python wrapper around the Telegram Bot API',
     long_description=(read('README.rst')),
     packages=find_packages(exclude=['tests*']),
-    include_package_data = True,
+    include_package_data=True,
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',

telegram/__init__.py

@@ -1,25 +1,24 @@
 #!/usr/bin/env python
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
 
 __author__ = 'leandrotoledodesouza@gmail.com'
-__version__ = '2.5.1'
+__version__ = '2.7'
 
 from .base import TelegramObject
 from .user import User
@@ -28,6 +27,7 @@ from .update import Update
 from .groupchat import GroupChat
 from .photosize import PhotoSize
 from .audio import Audio
+from .voice import Voice
 from .document import Document
 from .sticker import Sticker
 from .video import Video
@@ -49,4 +49,5 @@ __all__ = ['Bot', 'Emoji', 'TelegramError', 'InputFile', 'ReplyMarkup',
            'ForceReply', 'ReplyKeyboardHide', 'ReplyKeyboardMarkup',
            'UserProfilePhotos', 'ChatAction', 'Location', 'Contact',
            'Video', 'Sticker', 'Document', 'Audio', 'PhotoSize', 'GroupChat',
-           'Update', 'Message', 'User', 'TelegramObject', 'NullHandler']
+           'Update', 'Message', 'User', 'TelegramObject', 'NullHandler',
+           'Voice']

telegram/audio.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject
@@ -26,10 +24,14 @@ class Audio(TelegramObject):
     def __init__(self,
                  file_id,
                  duration,
+                 performer=None,
+                 title=None,
                  mime_type=None,
                  file_size=None):
         self.file_id = file_id
         self.duration = duration
+        self.performer = performer
+        self.title = title
         self.mime_type = mime_type
         self.file_size = file_size
 
@@ -37,12 +39,18 @@ class Audio(TelegramObject):
     def de_json(data):
         return Audio(file_id=data.get('file_id', None),
                      duration=data.get('duration', None),
+                     performer=data.get('performer', None),
+                     title=data.get('title', None),
                      mime_type=data.get('mime_type', None),
                      file_size=data.get('file_size', None))
 
     def to_dict(self):
         data = {'file_id': self.file_id,
                 'duration': self.duration}
+        if self.performer:
+            data['performer'] = self.performer
+        if self.title:
+            data['title'] = self.title
         if self.mime_type:
             data['mime_type'] = self.mime_type
         if self.file_size:

telegram/base.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 import json

telegram/bot.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 import json
@@ -50,21 +48,39 @@ class Bot(TelegramObject):
         else:
             self.base_url = base_url + self.token
 
+        self.bot = None
+
         self.log = logging.getLogger(__name__)
 
-        try:
-            bot = self.getMe()
+    def info(func):
+        @functools.wraps(func)
+        def decorator(self, *args, **kwargs):
+            if not self.bot:
+                self.getMe()
 
-            self.id = bot.id
-            self.first_name = bot.first_name
-            self.last_name = bot.last_name
-            self.username = bot.username
+            result = func(self, *args, **kwargs)
+            return result
+        return decorator
 
-            self.__auth = True
+    @property
+    @info
+    def id(self):
+        return self.bot.id
 
-            self.log.info('Starting bot %s' % self.name)
-        except TelegramError:
-            raise TelegramError({'message': 'Bad token'})
+    @property
+    @info
+    def first_name(self):
+        return self.bot.first_name
+
+    @property
+    @info
+    def last_name(self):
+        return self.bot.last_name
+
+    @property
+    @info
+    def username(self):
+        return self.bot.username
 
     @property
     def name(self):
@@ -111,22 +127,6 @@ class Bot(TelegramObject):
             return Message.de_json(data)
         return decorator
 
-    def require_authentication(func):
-        @functools.wraps(func)
-        def decorator(self, *args, **kwargs):
-            if not self.__auth:
-                raise TelegramError({'message': "API must be authenticated."})
-
-            return func(self, *args, **kwargs)
-        return decorator
-
-    @log
-    @require_authentication
-    def clearCredentials(self):
-        """Clear any credentials for this instance.
-        """
-        self.__auth = False
-
     @log
     def getMe(self):
         """A simple method for testing your bot's auth token.
@@ -140,11 +140,12 @@ class Bot(TelegramObject):
         json_data = self._requestUrl(url, 'GET')
         data = self._parseAndCheckTelegram(json_data)
 
-        return User.de_json(data)
+        self.bot = User.de_json(data)
+
+        return self.bot
 
     @log
     @message
-    @require_authentication
     def sendMessage(self,
                     chat_id,
                     text,
@@ -184,7 +185,6 @@ class Bot(TelegramObject):
 
     @log
     @message
-    @require_authentication
     def forwardMessage(self,
                        chat_id,
                        from_chat_id,
@@ -218,7 +218,6 @@ class Bot(TelegramObject):
 
     @log
     @message
-    @require_authentication
     def sendPhoto(self,
                   chat_id,
                   photo,
@@ -260,16 +259,24 @@ class Bot(TelegramObject):
 
     @log
     @message
-    @require_authentication
     def sendAudio(self,
                   chat_id,
                   audio,
+                  duration=None,
+                  performer=None,
+                  title=None,
                   reply_to_message_id=None,
                   reply_markup=None):
         """Use this method to send audio files, if you want Telegram clients to
-        display the file as a playable voice message. For this to work, your
-        audio must be in an .ogg file encoded with OPUS (other formats may be
-        sent as telegram.Document).
+        display them in the music player. Your audio must be in an .mp3 format.
+        On success, the sent Message is returned. Bots can currently send audio
+        files of up to 50 MB in size, this limit may be changed in the future.
+
+        For backward compatibility, when both fields title and description are
+        empty and mime-type of the sent file is not "audio/mpeg", file is sent
+        as playable voice message. In this case, your audio must be in an .ogg
+        file encoded with OPUS. This will be removed in the future. You need to
+        use sendVoice method instead.
 
         Args:
           chat_id:
@@ -278,6 +285,12 @@ class Bot(TelegramObject):
             Audio file to send. You can either pass a file_id as String to
             resend an audio that is already on the Telegram servers, or upload
             a new audio file using multipart/form-data.
+          duration:
+            Duration of sent audio in seconds. [Optional]
+          performer:
+            Performer of sent audio. [Optional]
+          title:
+            Title of sent audio. [Optional]
           reply_to_message_id:
             If the message is a reply, ID of the original message. [Optional]
           reply_markup:
@@ -294,17 +307,23 @@ class Bot(TelegramObject):
         data = {'chat_id': chat_id,
                 'audio': audio}
 
+        if duration:
+            data['duration'] = duration
+        if performer:
+            data['performer'] = performer
+        if title:
+            data['title'] = title
+
         return url, data
 
     @log
     @message
-    @require_authentication
     def sendDocument(self,
                      chat_id,
                      document,
                      reply_to_message_id=None,
                      reply_markup=None):
-        """Use this method to send Lesser files.
+        """Use this method to send general files.
 
         Args:
           chat_id:
@@ -333,7 +352,6 @@ class Bot(TelegramObject):
 
     @log
     @message
-    @require_authentication
     def sendSticker(self,
                     chat_id,
                     sticker,
@@ -368,10 +386,11 @@ class Bot(TelegramObject):
 
     @log
     @message
-    @require_authentication
     def sendVideo(self,
                   chat_id,
                   video,
+                  duration=None,
+                  caption=None,
                   reply_to_message_id=None,
                   reply_markup=None):
         """Use this method to send video files, Telegram clients support mp4
@@ -384,6 +403,11 @@ class Bot(TelegramObject):
             Video to send. You can either pass a file_id as String to resend a
             video that is already on the Telegram servers, or upload a new
             video file using multipart/form-data.
+          duration:
+            Duration of sent video in seconds. [Optional]
+          caption:
+            Video caption (may also be used when resending videos by file_id).
+            [Optional]
           reply_to_message_id:
             If the message is a reply, ID of the original message. [Optional]
           reply_markup:
@@ -400,11 +424,60 @@ class Bot(TelegramObject):
         data = {'chat_id': chat_id,
                 'video': video}
 
+        if duration:
+            data['duration'] = duration
+        if caption:
+            data['caption'] = caption
+
+        return url, data
+
+    @log
+    @message
+    def sendVoice(self,
+                  chat_id,
+                  voice,
+                  duration=None,
+                  reply_to_message_id=None,
+                  reply_markup=None):
+        """Use this method to send audio files, if you want Telegram clients to
+        display the file as a playable voice message. For this to work, your
+        audio must be in an .ogg file encoded with OPUS (other formats may be
+        sent as Audio or Document). On success, the sent Message is returned.
+        Bots can currently send audio files of up to 50 MB in size, this limit
+        may be changed in the future.
+
+        Args:
+          chat_id:
+            Unique identifier for the message recipient - User or GroupChat id.
+          voice:
+            Audio file to send. You can either pass a file_id as String to
+            resend an audio that is already on the Telegram servers, or upload
+            a new audio file using multipart/form-data.
+          duration:
+            Duration of sent audio in seconds. [Optional]
+          reply_to_message_id:
+            If the message is a reply, ID of the original message. [Optional]
+          reply_markup:
+            Additional interface options. A JSON-serialized object for a
+            custom reply keyboard, instructions to hide keyboard or to force a
+            reply from the user. [Optional]
+
+        Returns:
+          A telegram.Message instance representing the message posted.
+        """
+
+        url = '%s/sendVoice' % self.base_url
+
+        data = {'chat_id': chat_id,
+                'voice': voice}
+
+        if duration:
+            data['duration'] = duration
+
         return url, data
 
     @log
     @message
-    @require_authentication
     def sendLocation(self,
                      chat_id,
                      latitude,
@@ -441,7 +514,6 @@ class Bot(TelegramObject):
 
     @log
     @message
-    @require_authentication
     def sendChatAction(self,
                        chat_id,
                        action):
@@ -460,7 +532,7 @@ class Bot(TelegramObject):
             - ChatAction.UPLOAD_PHOTO for photos,
             - ChatAction.UPLOAD_VIDEO or upload_video for videos,
             - ChatAction.UPLOAD_AUDIO or upload_audio for audio files,
-            - ChatAction.UPLOAD_DOCUMENT for Lesser files,
+            - ChatAction.UPLOAD_DOCUMENT for general files,
             - ChatAction.FIND_LOCATION for location data.
         """
 
@@ -472,7 +544,6 @@ class Bot(TelegramObject):
         return url, data
 
     @log
-    @require_authentication
     def getUserProfilePhotos(self,
                              user_id,
                              offset=None,
@@ -508,7 +579,6 @@ class Bot(TelegramObject):
         return UserProfilePhotos.de_json(data)
 
     @log
-    @require_authentication
     def getUpdates(self,
                    offset=None,
                    limit=100,
@@ -555,7 +625,6 @@ class Bot(TelegramObject):
         return [Update.de_json(x) for x in data]
 
     @log
-    @require_authentication
     def setWebhook(self,
                    webhook_url):
         """Use this method to specify a url and receive incoming updates via an
@@ -663,3 +732,7 @@ class Bot(TelegramObject):
         if self.last_name:
             data['last_name'] = self.last_name
         return data
+
+    def __reduce__(self):
+        return (self.__class__, (self.token,
+                                 self.base_url.replace(self.token, '')))

telegram/chataction.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 class ChatAction(object):

telegram/contact.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject

telegram/document.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject
@@ -25,7 +23,7 @@ from telegram import TelegramObject
 class Document(TelegramObject):
     def __init__(self,
                  file_id,
-                 thumb,
+                 thumb=None,
                  file_name=None,
                  mime_type=None,
                  file_size=None):

telegram/emoji.py

@@ -1,23 +1,21 @@
 #!/usr/bin/env python
 # flake8: noqa
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 class Emoji(object):

telegram/error.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 class TelegramError(Exception):

telegram/forcereply.py

@@ -1,25 +1,23 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
-from .replymarkup import ReplyMarkup
+from telegram import ReplyMarkup
 
 
 class ForceReply(ReplyMarkup):

telegram/groupchat.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject

telegram/inputfile.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 try:
@@ -28,8 +26,8 @@ except ImportError:
     from urllib2 import urlopen
 import mimetypes
 import os
-import re
 import sys
+import imghdr
 
 from .error import TelegramError
 
@@ -56,6 +54,9 @@ class InputFile(object):
         if 'video' in data:
             self.input_name = 'video'
             self.input_file = data.pop('video')
+        if 'voice' in data:
+            self.input_name = 'voice'
+            self.input_file = data.pop('voice')
 
         if isinstance(self.input_file, file):
             self.input_file_content = self.input_file.read()
@@ -130,26 +131,16 @@ class InputFile(object):
         Returns:
           The str mimetype of an image.
         """
-        try:
-            header = stream[:10]
-
-            if re.match(b'GIF8', header):
-                return 'image/gif'
-
-            if re.match(b'\x89PNG', header):
-                return 'image/png'
-
-            if re.match(b'\xff\xd8\xff\xe0\x00\x10JFIF', header) or \
-               re.match(b'\xff\xd8\xff\xe1(.*){2}Exif', header):
-                return 'image/jpeg'
-        except IndexError as e:
-            raise TelegramError(str(e))
+        image = imghdr.what(None, stream)
+        if image:
+            return 'image/%s' % image
 
         raise TelegramError({'message': 'Could not parse file content'})
 
     @staticmethod
     def is_inputfile(data):
-        """Check if the request is a file request
+        """Check if the request is a file request.
+
         Args:
           data:
             A dict of (str, unicode) key/value pairs
@@ -158,7 +149,7 @@ class InputFile(object):
             bool
         """
         if data:
-            file_types = ['audio', 'document', 'photo', 'video']
+            file_types = ['audio', 'document', 'photo', 'video', 'voice']
             file_type = [i for i in list(data.keys()) if i in file_types]
 
             if file_type:

telegram/location.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject

telegram/message.py

@@ -1,25 +1,25 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject
+from datetime import datetime
+from time import mktime
 
 
 class Message(TelegramObject):
@@ -37,6 +37,8 @@ class Message(TelegramObject):
                  photo=None,
                  sticker=None,
                  video=None,
+                 voice=None,
+                 caption=None,
                  contact=None,
                  location=None,
                  new_chat_participant=None,
@@ -58,6 +60,8 @@ class Message(TelegramObject):
         self.photo = photo
         self.sticker = sticker
         self.video = video
+        self.voice = voice
+        self.caption = caption
         self.contact = contact
         self.location = location
         self.new_chat_participant = new_chat_participant
@@ -79,6 +83,11 @@ class Message(TelegramObject):
         else:
             from_user = None
 
+        if 'date' in data:
+            date = datetime.fromtimestamp(data['date'])
+        else:
+            date = None
+
         if 'chat' in data:
             if 'first_name' in data['chat']:
                 from telegram import User
@@ -95,16 +104,16 @@ class Message(TelegramObject):
         else:
             forward_from = None
 
+        if 'forward_date' in data:
+            forward_date = datetime.fromtimestamp(data['forward_date'])
+        else:
+            forward_date = None
+
         if 'reply_to_message' in data:
             reply_to_message = Message.de_json(data['reply_to_message'])
         else:
             reply_to_message = None
 
-        if 'text' in data:
-            text = data['text']
-        else:
-            text = None
-
         if 'audio' in data:
             from telegram import Audio
             audio = Audio.de_json(data['audio'])
@@ -135,6 +144,12 @@ class Message(TelegramObject):
         else:
             video = None
 
+        if 'voice' in data:
+            from telegram import Voice
+            voice = Voice.de_json(data['voice'])
+        else:
+            voice = None
+
         if 'contact' in data:
             from telegram import Contact
             contact = Contact.de_json(data['contact'])
@@ -159,39 +174,58 @@ class Message(TelegramObject):
         else:
             left_chat_participant = None
 
+        if 'new_chat_photo' in data:
+            from telegram import PhotoSize
+            new_chat_photo = \
+                [PhotoSize.de_json(x) for x in data['new_chat_photo']]
+        else:
+            new_chat_photo = None
+
         return Message(message_id=data.get('message_id', None),
                        from_user=from_user,
-                       date=data.get('date', None),
+                       date=date,
                        chat=chat,
                        forward_from=forward_from,
-                       forward_date=data.get('forward_date', None),
+                       forward_date=forward_date,
                        reply_to_message=reply_to_message,
-                       text=text,
+                       text=data.get('text', ''),
                        audio=audio,
                        document=document,
                        photo=photo,
                        sticker=sticker,
                        video=video,
+                       voice=voice,
+                       caption=data.get('caption', ''),
                        contact=contact,
                        location=location,
                        new_chat_participant=new_chat_participant,
                        left_chat_participant=left_chat_participant,
                        new_chat_title=data.get('new_chat_title', None),
-                       new_chat_photo=data.get('new_chat_photo', None),
+                       new_chat_photo=new_chat_photo,
                        delete_chat_photo=data.get('delete_chat_photo', None),
                        group_chat_created=data.get('group_chat_created', None))
 
     def to_dict(self):
         data = {'message_id': self.message_id,
                 'from': self.from_user.to_dict(),
-                'date': self.date,
                 'chat': self.chat.to_dict()}
+        try:
+            # Python 3.3+ supports .timestamp()
+            data['date'] = int(self.date.timestamp())
+
+            if self.forward_date:
+                data['forward_date'] = int(self.forward_date.timestamp())
+        except AttributeError:
+            # _totimestamp() for Python 3 (< 3.3) and Python 2
+            data['date'] = self._totimestamp(self.date)
+
+            if self.forward_date:
+                data['forward_date'] = self._totimestamp(self.forward_date)
+
         if self.forward_from:
-            data['forward_from'] = self.forward_from
-        if self.forward_date:
-            data['forward_date'] = self.forward_date
+            data['forward_from'] = self.forward_from.to_dict()
         if self.reply_to_message:
-            data['reply_to_message'] = self.reply_to_message
+            data['reply_to_message'] = self.reply_to_message.to_dict()
         if self.text:
             data['text'] = self.text
         if self.audio:
@@ -204,20 +238,29 @@ class Message(TelegramObject):
             data['sticker'] = self.sticker.to_dict()
         if self.video:
             data['video'] = self.video.to_dict()
+        if self.voice:
+            data['voice'] = self.voice.to_dict()
+        if self.caption:
+            data['caption'] = self.caption
         if self.contact:
             data['contact'] = self.contact.to_dict()
         if self.location:
             data['location'] = self.location.to_dict()
         if self.new_chat_participant:
-            data['new_chat_participant'] = self.new_chat_participant
+            data['new_chat_participant'] = self.new_chat_participant.to_dict()
         if self.left_chat_participant:
-            data['left_chat_participant'] = self.left_chat_participant
+            data['left_chat_participant'] = \
+                self.left_chat_participant.to_dict()
         if self.new_chat_title:
             data['new_chat_title'] = self.new_chat_title
         if self.new_chat_photo:
-            data['new_chat_photo'] = self.new_chat_photo
+            data['new_chat_photo'] = [p.to_dict() for p in self.new_chat_photo]
         if self.delete_chat_photo:
             data['delete_chat_photo'] = self.delete_chat_photo
         if self.group_chat_created:
             data['group_chat_created'] = self.group_chat_created
         return data
+
+    @staticmethod
+    def _totimestamp(dt):
+        return int(mktime(dt.timetuple()))

telegram/nullhandler.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 import logging

telegram/photosize.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject

telegram/replykeyboardhide.py

@@ -1,25 +1,23 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
-from .replymarkup import ReplyMarkup
+from telegram import ReplyMarkup
 
 
 class ReplyKeyboardHide(ReplyMarkup):

telegram/replykeyboardmarkup.py

@@ -1,25 +1,23 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
-from .replymarkup import ReplyMarkup
+from telegram import ReplyMarkup
 
 
 class ReplyKeyboardMarkup(ReplyMarkup):

telegram/replymarkup.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject

telegram/sticker.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject
@@ -27,7 +25,7 @@ class Sticker(TelegramObject):
                  file_id,
                  width,
                  height,
-                 thumb,
+                 thumb=None,
                  file_size=None):
         self.file_id = file_id
         self.width = width

telegram/update.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject

telegram/user.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject

telegram/userprofilephotos.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject

telegram/video.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 from telegram import TelegramObject
@@ -28,10 +26,9 @@ class Video(TelegramObject):
                  width,
                  height,
                  duration,
-                 thumb,
+                 thumb=None,
                  mime_type=None,
-                 file_size=None,
-                 caption=None):
+                 file_size=None):
         self.file_id = file_id
         self.width = width
         self.height = height
@@ -39,7 +36,6 @@ class Video(TelegramObject):
         self.thumb = thumb
         self.mime_type = mime_type
         self.file_size = file_size
-        self.caption = caption
 
     @staticmethod
     def de_json(data):
@@ -55,8 +51,7 @@ class Video(TelegramObject):
                      duration=data.get('duration', None),
                      thumb=thumb,
                      mime_type=data.get('mime_type', None),
-                     file_size=data.get('file_size', None),
-                     caption=data.get('caption', None))
+                     file_size=data.get('file_size', None))
 
     def to_dict(self):
         data = {'file_id': self.file_id,
@@ -69,6 +64,4 @@ class Video(TelegramObject):
             data['mime_type'] = self.mime_type
         if self.file_size:
             data['file_size'] = self.file_size
-        if self.caption:
-            data['caption'] = self.caption
         return data

telegram/voice.py

@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
+
+
+from telegram import TelegramObject
+
+
+class Voice(TelegramObject):
+    def __init__(self,
+                 file_id,
+                 duration=None,
+                 mime_type=None,
+                 file_size=None):
+        self.file_id = file_id
+        self.duration = duration
+        self.mime_type = mime_type
+        self.file_size = file_size
+
+    @staticmethod
+    def de_json(data):
+        return Voice(file_id=data.get('file_id', None),
+                     duration=data.get('duration', None),
+                     mime_type=data.get('mime_type', None),
+                     file_size=data.get('file_size', None))
+
+    def to_dict(self):
+        data = {'file_id': self.file_id}
+        if self.duration:
+            data['duration'] = self.duration
+        if self.mime_type:
+            data['mime_type'] = self.mime_type
+        if self.file_size:
+            data['file_size'] = self.file_size
+        return data

telegram_test.py

@@ -1,22 +1,21 @@
 #!/usr/bin/env python
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Lesser Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser Public License for more details.
-
-    You should have received a copy of the GNU Lesser Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
 
 import logging
 import unittest

tests/test_bot.py

@@ -1,31 +1,39 @@
 #!/usr/bin/env python
 # encoding: utf-8
-
-"""
-    A library that provides a Python interface to the Telegram Bot API
-    Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see [http://www.gnu.org/licenses/].
-"""
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015 Leandro Toledo de Souza <leandrotoeldodesouza@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
 
 
 import os
+import json
 import telegram
 import unittest
+from datetime import datetime
 
 
 class BotTest(unittest.TestCase):
+    @staticmethod
+    def is_json(string):
+        try:
+            json.loads(string)
+        except ValueError:
+            return False
+        return True
+
     def setUp(self):
         bot = telegram.Bot(token=os.environ.get('TOKEN'))
         self._bot = bot
@@ -35,6 +43,7 @@ class BotTest(unittest.TestCase):
         '''Test the telegram.Bot getMe method'''
         print('Testing getMe')
         bot = self._bot.getMe()
+        self.assertTrue(self.is_json(bot.to_json()))
         self.assertEqual(120405045, bot.id)
         self.assertEqual('Toledo\'s Palace Bot', bot.first_name)
         self.assertEqual(None, bot.last_name)
@@ -45,12 +54,15 @@ class BotTest(unittest.TestCase):
         print('Testing sendMessage')
         message = self._bot.sendMessage(chat_id=12173560,
                                         text='Моё судно на воздушной подушке полно угрей')
+        self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual(u'Моё судно на воздушной подушке полно угрей', message.text)
+        self.assertIsInstance(message.date, datetime)
 
     def testGetUpdates(self):
         '''Test the telegram.Bot getUpdates method'''
         print('Testing getUpdates')
         updates = self._bot.getUpdates()
+        self.assertTrue(self.is_json(updates[0].to_json()))
         self.assertIsInstance(updates[0], telegram.Update)
 
     def testForwardMessage(self):
@@ -59,77 +71,139 @@ class BotTest(unittest.TestCase):
         message = self._bot.forwardMessage(chat_id=12173560,
                                            from_chat_id=12173560,
                                            message_id=138)
+        self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual('Oi', message.text)
         self.assertEqual('leandrotoledo', message.forward_from.username)
+        self.assertIsInstance(message.forward_date, datetime)
 
     def testSendPhoto(self):
         '''Test the telegram.Bot sendPhoto method'''
         print('Testing sendPhoto - File')
         message = self._bot.sendPhoto(photo=open('tests/telegram.png', 'rb'),
+                                      caption='testSendPhoto',
                                       chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual(1451, message.photo[0].file_size)
+        self.assertEqual('testSendPhoto', message.caption)
 
     def testResendPhoto(self):
         '''Test the telegram.Bot sendPhoto method'''
         print('Testing sendPhoto - Resend')
-        message = self._bot.sendPhoto(photo=str('AgADAQADr6cxGzU8LQe6q0dMJD2rHYkP2ykABFymiQqJgjxRGGMAAgI'),
+        message = self._bot.sendPhoto(photo='AgADAQADr6cxGzU8LQe6q0dMJD2rHYkP2ykABFymiQqJgjxRGGMAAgI',
                                       chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual('AgADAQADr6cxGzU8LQe6q0dMJD2rHYkP2ykABFymiQqJgjxRGGMAAgI', message.photo[0].file_id)
 
-    def testSendURLPhoto(self):
+    def testSendJPGURLPhoto(self):
         '''Test the telegram.Bot sendPhoto method'''
-        print('Testing sendPhoto - URL')
-        message = self._bot.sendPhoto(photo=str('http://dummyimage.com/600x400/000/fff.jpg&text=telegram'),
+        print('Testing testSendJPGURLPhoto - URL')
+        message = self._bot.sendPhoto(photo='http://dummyimage.com/600x400/000/fff.jpg&text=telegram',
                                       chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual(822, message.photo[0].file_size)
 
+    def testSendPNGURLPhoto(self):
+        '''Test the telegram.Bot sendPhoto method'''
+        print('Testing testSendPNGURLPhoto - URL')
+        message = self._bot.sendPhoto(photo='http://dummyimage.com/600x400/000/fff.png&text=telegram',
+                                      chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
+        self.assertEqual(684, message.photo[0].file_size)
+
+    def testSendGIFURLPhoto(self):
+        '''Test the telegram.Bot sendPhoto method'''
+        print('Testing testSendGIFURLPhoto - URL')
+        message = self._bot.sendPhoto(photo='http://dummyimage.com/600x400/000/fff.gif&text=telegram',
+                                      chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
+        self.assertEqual(684, message.photo[0].file_size)
+
     def testSendAudio(self):
         '''Test the telegram.Bot sendAudio method'''
         print('Testing sendAudio - File')
-        message = self._bot.sendAudio(audio=open('tests/telegram.ogg', 'rb'),
-                                      chat_id=12173560)
-        self.assertEqual(9199, message.audio.file_size)
+        message = self._bot.sendAudio(audio=open('tests/telegram.mp3', 'rb'),
+                                      chat_id=12173560,
+                                      performer='Leandro Toledo',
+                                      title='Teste')
+        self.assertTrue(self.is_json(message.to_json()))
+        self.assertEqual(28232, message.audio.file_size)
+        self.assertEqual('Leandro Toledo', message.audio.performer)
+        self.assertEqual('Teste', message.audio.title)
 
     def testResendAudio(self):
         '''Test the telegram.Bot sendAudio method'''
         print('Testing sendAudio - Resend')
-        message = self._bot.sendAudio(audio=str('AwADAQADIQEAAvjAuQABSAXg_GhkhZcC'),
+        message = self._bot.sendAudio(audio='BQADAQADwwcAAjU8LQdBRsl3_qD2TAI',
+                                      chat_id=12173560,
+                                      performer='Leandro Toledo',   # Bug #39
+                                      title='Teste')                # Bug #39
+        self.assertTrue(self.is_json(message.to_json()))
+        self.assertEqual('BQADAQADwwcAAjU8LQdBRsl3_qD2TAI', message.audio.file_id)
+
+    def testSendVoice(self):
+        '''Test the telegram.Bot sendVoice method'''
+        print('Testing sendVoice - File')
+        message = self._bot.sendVoice(voice=open('tests/telegram.ogg', 'rb'),
                                       chat_id=12173560)
-        self.assertEqual('AwADAQADIQEAAvjAuQABSAXg_GhkhZcC', message.audio.file_id)
+        self.assertTrue(self.is_json(message.to_json()))
+        self.assertEqual(9199, message.voice.file_size)
+
+    def testResendVoice(self):
+        '''Test the telegram.Bot sendVoice method'''
+        print('Testing sendVoice - Resend')
+        message = self._bot.sendVoice(voice='AwADAQADIQEAAvjAuQABSAXg_GhkhZcC',
+                                      chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
+        self.assertEqual('AwADAQADIQEAAvjAuQABSAXg_GhkhZcC', message.voice.file_id)
 
     def testSendDocument(self):
         '''Test the telegram.Bot sendDocument method'''
         print('Testing sendDocument - File')
         message = self._bot.sendDocument(document=open('tests/telegram.png', 'rb'),
                                          chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual(12948, message.document.file_size)
 
+    def testSendGIFURLDocument(self):
+        '''Test the telegram.Bot sendDocument method'''
+        print('Testing sendDocument - File')
+        message = self._bot.sendPhoto(photo='http://dummyimage.com/600x400/000/fff.gif&text=telegram',
+                                      chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
+        self.assertEqual(684, message.photo[0].file_size)
+
     def testResendDocument(self):
         '''Test the telegram.Bot sendDocument method'''
         print('Testing sendDocument - Resend')
-        message = self._bot.sendDocument(document=str('BQADAQADHAADNTwtBxZxUGKyxYbYAg'),
+        message = self._bot.sendDocument(document='BQADAQADHAADNTwtBxZxUGKyxYbYAg',
                                          chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual('BQADAQADHAADNTwtBxZxUGKyxYbYAg', message.document.file_id)
 
     def testSendVideo(self):
         '''Test the telegram.Bot sendVideo method'''
         print('Testing sendVideo - File')
         message = self._bot.sendVideo(video=open('tests/telegram.mp4', 'rb'),
+                                      caption='testSendVideo',
                                       chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual(326534, message.video.file_size)
+        self.assertEqual('testSendVideo', message.caption)
 
     def testResendVideo(self):
         '''Test the telegram.Bot sendVideo method'''
         print('Testing sendVideo - Resend')
-        message = self._bot.sendVideo(video=str('BAADAQADIgEAAvjAuQABOuTB937fPTgC'),
+        message = self._bot.sendVideo(video='BAADAQADIgEAAvjAuQABOuTB937fPTgC',
                                       chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual(4, message.video.duration)
 
     def testResendSticker(self):
         '''Test the telegram.Bot sendSticker method'''
         print('Testing sendSticker - Resend')
-        message = self._bot.sendSticker(sticker=str('BQADAQADHAADyIsGAAFZfq1bphjqlgI'),
+        message = self._bot.sendSticker(sticker='BQADAQADHAADyIsGAAFZfq1bphjqlgI',
                                         chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual(39518, message.sticker.file_size)
 
     def testSendLocation(self):
@@ -138,6 +212,7 @@ class BotTest(unittest.TestCase):
         message = self._bot.sendLocation(latitude=-23.558873,
                                          longitude=-46.659732,
                                          chat_id=12173560)
+        self.assertTrue(self.is_json(message.to_json()))
         self.assertEqual(-23.558873, message.location.latitude)
         self.assertEqual(-46.659732, message.location.longitude)
 
@@ -151,4 +226,5 @@ class BotTest(unittest.TestCase):
         '''Test the telegram.Bot getUserProfilePhotos method'''
         print('Testing getUserProfilePhotos')
         upf = self._bot.getUserProfilePhotos(user_id=12173560)
-        self.assertEqual(8314, upf.photos[0][0].file_size)
+        self.assertTrue(self.is_json(upf.to_json()))
+        self.assertEqual(6547, upf.photos[0][0].file_size)