Commit graph

565 commits

Author SHA1 Message Date
Jannes Höke
af6eb457c1 Merge branch 'inlinebots' of github.com:python-telegram-bot/python-telegram-bot into inlinebots 2016-01-09 15:12:34 +01:00
Jannes Höke
6ece89bc56 update inline query results after api change 2016-01-09 15:09:48 +01:00
Jannes Höke
c69cdfd184 Initial commit for inline bot support 2016-01-09 15:09:48 +01:00
Jannes Höke
fd90c16265 merge master into inlinebots 2016-01-09 14:51:24 +01:00
Jannes Höke
77ca036d02 update inline query results after api change 2016-01-09 14:48:27 +01:00
Jannes Höke
e2e98e86db Initial commit for inline bot support 2016-01-09 14:48:27 +01:00
Leandro Toledo
71f82d57d9 Update CONTRIBUTING.rst 2016-01-06 17:09:19 -02:00
Jannes Höke
6a3d514ed1 Merge branch 'master' into inlinebots 2016-01-06 16:28:17 +01:00
Leandro Toledo
6aa2e510a3 Merge pull request #149 from python-telegram-bot/contribute-update
Expanding more subjects on CONTRIBUTING.rst
2016-01-06 13:04:59 -02:00
leandrotoledo
099deabf4e Removing if block to install unittest2 when running tests on Py2.6 2016-01-06 12:50:42 -02:00
Jannes Höke
b78ceeed10 fix race condition in dispatcher 2016-01-06 15:36:14 +01:00
leandrotoledo
a8240dca1f Adding unittest2, update travis to use requirements-dev.txt 2016-01-06 12:12:01 -02:00
leandrotoledo
7e207433cc Using flake8 instead pep8 2016-01-06 12:05:09 -02:00
leandrotoledo
fc6d0f4f07 Expanding more subjects 2016-01-06 11:54:22 -02:00
Jannes Höke
4fef5bcceb Merge branch 'master' into inlinebots 2016-01-05 15:17:38 +01:00
Jannes Höke
fc64cc0a4a Merge pull request #148 from mr-karan/patch-1
handle case of negative values of seconds
2016-01-05 14:37:26 +01:00
Karan Sharma
14a9962296 handle case of negative values of seconds 2016-01-05 19:06:28 +05:30
Jannes Höke
4197400853 remove token once again 2016-01-05 14:29:20 +01:00
Jannes Höke
aa8966832b release 3.2 and update copyright notice to 2015-2016 2016-01-05 14:12:03 +01:00
Jannes Höke
e27427676d fix jobqueue creation 2016-01-05 13:40:07 +01:00
Jannes Höke
8175fd7b53 update timerbot example 2016-01-05 13:39:51 +01:00
Jannes Höke
2875bae881 Integrate JobQueue with Updater 2016-01-05 13:32:19 +01:00
Jannes Höke
c756aa1c02 remove error raising in dispatchType 2016-01-05 12:49:48 +01:00
Jannes Höke
6d5c3187fc Initial commit for inline bot support 2016-01-04 17:31:06 +01:00
Jannes Höke
c2f04331f3 Merge pull request #145 from python-telegram-bot/jobqueue
JobQueue by @franciscod
2016-01-04 12:34:29 +01:00
Jannes Höke
5293ec49ff Add section about JobQueue to README 2016-01-04 11:34:47 +01:00
Jannes Höke
9319903343 rename testclass 2016-01-04 11:08:43 +01:00
Jannes Höke
95e2aad9bd fix sphinx build 2016-01-04 02:36:27 +01:00
Jannes Höke
73f4f26da5 more tests 2016-01-04 02:36:15 +01:00
Jannes Höke
24b2bf335c Increase time for travis testing 2016-01-04 02:12:24 +01:00
Jannes Höke
fc3fa0f515 Increase time for travis testing 2016-01-04 02:11:42 +01:00
Jannes Höke
87657bcd70 flake8 and string formatting 2016-01-04 02:05:39 +01:00
Jannes Höke
81b58c7d00 remove bot token (once again...) 2016-01-04 01:58:50 +01:00
Jannes Höke
dd7d1255d1 fixes, tests and examples for job queue 2016-01-04 01:56:22 +01:00
Jannes Höke
f813d4f5ec improve docstring 2016-01-04 01:32:47 +01:00
Jannes Höke
623863cee1 fix exception logging 2016-01-04 01:32:00 +01:00
Jannes Höke
aa125e59fb Merge branch 'master' into jobqueue 2016-01-04 00:01:27 +01:00
Jannes Höke
68c844df0c implement starting jobqueue in thread and fix errors 2016-01-04 00:01:00 +01:00
Jannes Höke
3779d454f3 Merge pull request #136 from tsnoam/master
consistent TelegramError exceptions
2016-01-03 23:58:14 +01:00
Noam Meltzer
5d168bd479 improve unitest coverage 2016-01-04 00:34:39 +02:00
Noam Meltzer
1c8bb21790 fix python 2.6 unitests which with the backport package unittest2 2016-01-04 00:32:17 +02:00
Noam Meltzer
054c976ad6 add tsnoam to AUTHORS 2016-01-04 00:32:17 +02:00
Noam Meltzer
bc2679f2ae utils.request: provide HTTP error code with unknown errors 2016-01-04 00:32:17 +02:00
Noam Meltzer
17dae68654 gitignore: files generated by unitests 2016-01-04 00:32:17 +02:00
Noam Meltzer
7734c1d6a6 fix unitests to work with new token validator 2016-01-04 00:32:13 +02:00
Noam Meltzer
aeca3ca174 basic token validation
refs #134
2016-01-04 00:31:40 +02:00
Noam Meltzer
21fdaa4ff7 utils.request: decorate functions with general try... except...
refs #134
2016-01-04 00:31:40 +02:00
Noam Meltzer
79f29c4b9e properly handle utf-8 server response & identify json parsing errors
refs #134
2016-01-04 00:31:40 +02:00
Noam Meltzer
a2d8ca3663 some errors are prefixed with '[Error]: ' - strip that down
use custom _lstrip_str() func instead of regex. a little performance
improvment and (IMO) a bit more readable.
2016-01-04 00:31:40 +02:00
Jannes Höke
6f76bfc2de Merge branch 'master' into jobqueue 2015-12-31 15:45:19 +01:00