Commit graph

372 commits

Author SHA1 Message Date
Jannes Höke
cd42524fd4 Merge pull request #174 from python-telegram-bot/inlinebots
Implement Inlinebots
2016-02-28 02:10:21 +01:00
Jannes Höke
4aca4d1d1f Merge pull request #187 from python-telegram-bot/flaky-tests
Flaky tests
2016-02-28 01:02:11 +01:00
Noam Meltzer
ccb24d1288 request.py: fix for python2.7 2016-02-27 23:13:29 +02:00
Noam Meltzer
fc618274ae bot.py: allow specifying timeout for sendVideo operations 2016-02-27 23:00:33 +02:00
Noam Meltzer
ec8cd37345 test_video.py: adapt to latest changes in the API 2016-02-27 22:50:28 +02:00
Jannes Höke
efd10507d0 remove kwargs in favor of named keyword arguments, validate argument types 2016-02-21 11:33:34 +01:00
Noam Meltzer
2338377eda request: better parsing of URLError exception 2016-02-20 15:20:00 +02:00
Jannes Höke
ca526fba73 improve unit tests according to comments 2016-02-20 12:14:34 +01:00
Jannes Höke
e2cc8db992 Merge branch 'master' into inlinebots 2016-02-20 11:17:34 +01:00
Noam Meltzer
d415a60ebf join() threads instead of guessing if they're running
- new book keeping of dispatcher's async threads so they can be joined
   when stopping
 - updater, webhook & dispatcher threads are now kept on
   Updater.__threads so they can be joined at the end

refs #175
2016-02-19 18:00:57 +02:00
Noam Meltzer
fd7baa2236 updater.py: use _init_thread for webhook as well 2016-02-19 18:00:57 +02:00
Noam Meltzer
4945d99de6 webhookhandler: better handling of invalid POST data 2016-02-19 18:00:57 +02:00
Noam Meltzer
c103c05679 updater.py: fix log of thread name 2016-02-19 18:00:57 +02:00
Rahiel Kasim
d02e656700 raise NetworkError for HTTP 502 (Bad Gateway) 2016-02-09 15:26:59 +01:00
Jannes Höke
edf4e8abbe fix docstring 2016-02-07 23:34:26 +01:00
Jannes Höke
c55c5408b1 tests and corrections for inlinequery 2016-02-07 23:34:15 +01:00
Jannes Höke
d1dc32d849 tests and corrections for choseninlineresult 2016-02-07 23:26:38 +01:00
Jannes Höke
2a01292a64 Merge branch 'master' into inlinebots 2016-02-07 22:42:12 +01:00
Jannes Höke
5b9ec7ff40 catch errors in error handlers 2016-02-07 22:40:55 +01:00
Jannes Höke
bec81b5c3b Merge pull request #161 from tsnoam/master
better exception handling
2016-02-07 22:34:49 +01:00
Jannes Höke
eac3d8842d remove json import 2016-02-07 15:09:41 +01:00
Jannes Höke
17ac73c3c4 fix message to json 2016-02-07 14:46:36 +01:00
Noam Meltzer
4a5001668d updater/dispatcher: on exception stop all threads 2016-02-07 00:56:30 +02:00
Noam Meltzer
7ebbc60694 Unauthorized is HTTP code 401
I am not certain where the older 403 came from, but for now going to
leave it as is
2016-02-07 00:56:30 +02:00
Noam Meltzer
e82ae432f7 dispatcher is now stopped using a threading.Event 2016-02-07 00:56:30 +02:00
Noam Meltzer
d4beb94059 Add specific exceptions types for important errors
maintain backward compatibility with the 'old' exception by inherting
from TelegramError and using the same message
2016-02-06 18:48:55 +02:00
Noam Meltzer
029705e0af updater: catch TelegramError instead of URLError
- URLError is now being caught by telegram.request.
- simplify the code now that we don't need to catch URLError
2016-02-06 18:48:55 +02:00
Noam Meltzer
2859a8873f utils.request: catch URLError in _try_except_req decorator 2016-02-06 18:48:55 +02:00
Jannes Höke
6d2e159d75 move 'no new updates found' message to debug (#167) 2016-01-31 10:32:34 +01:00
Jannes Höke
8d94c14504 Merge branch 'master' into inlinebots 2016-01-29 23:55:34 +01:00
Juan Madurga
c13af4d61d parse mode for HTML added 2016-01-27 11:20:32 +01:00
Jannes Hoeke
a383cee558 merge master into inlinebots 2016-01-25 18:05:27 +01:00
Jannes Höke
44645d2cc6 Merge pull request #157 from jlmadurga/context-for-handlers
Add context to dispatcher
2016-01-25 17:46:14 +01:00
Oleg Shlyazhko
c3bca9af48 remove checking for non 200 http codes, exceptions already handle it 2016-01-24 18:28:27 +03:00
Oleg Shlyazhko
9eec34edd1 pep8 fix 2016-01-23 20:13:48 +03:00
Oleg Shlyazhko
383a2d3742 fix httperror error output 2016-01-23 20:03:29 +03:00
Oleg Shlyazhko
d1e4eeaf30 fix urlopen data format 2016-01-23 19:49:55 +03:00
Oleg Shlyazhko
80b53f1ab7 fix urlopen call 2016-01-23 19:44:40 +03:00
Oleg Shlyazhko
0faa38b8af fix httperror logging 2016-01-23 19:29:01 +03:00
Oleg Shlyazhko
7508c2f8bf add detailed comment in class and src key to tracking url 2016-01-23 16:59:53 +03:00
Oleg Shlyazhko
2c12bd6775 replace print with logging 2016-01-23 16:58:01 +03:00
Oleg Shlyazhko
5b05bcc8f2 add http error exception handling 2016-01-23 15:21:13 +03:00
Oleg Shlyazhko
adb446abf6 fix pep8 styling 2016-01-23 15:14:17 +03:00
Oleg Shlyazhko
17c2857622 add module for botan analytics 2016-01-23 14:24:34 +03:00
Juan Madurga
cbcbfab45f fix pep8 2016-01-22 16:42:39 +01:00
Juan Madurga
1dc9907a70 fix code comments by jh0ker 2016-01-22 16:30:55 +01:00
Juan Madurga
b8c9992eff Merge branch 'master' into context-for-handlers 2016-01-22 09:46:05 +01:00
Juan Madurga
a6650de93d Add context parameter to dispatcher. Handlers now can updates with a context data if required 2016-01-20 19:56:41 +01:00
Noam Meltzer
dc032b349c _try_except_req(): catch httplib.HTTPException
fixes #153
2016-01-19 22:02:34 +02:00
Jannes Höke
5c2458bfd8 merge master into inlinebots 2016-01-14 15:28:22 +01:00
Jannes Höke
6166e7f07a Merge pull request #152 from python-telegram-bot/docstring_pep257_checker
Add docstring style checker and fixing some
2016-01-14 15:24:44 +01:00
Jannes Höke
da97c1741c merge 'urls' into 'inline' 2016-01-13 21:58:45 +01:00
leandrotoledo
d3a02405b2 pep8 2016-01-13 14:23:15 -02:00
leandrotoledo
dfc75cc64e Add docstring style checker and fixing some 2016-01-13 14:09:35 -02:00
Jannes Höke
332667c98b flake8 2016-01-12 13:16:43 +01:00
Jannes Höke
f71c40e0b8 use basename and check if filename has extension 2016-01-12 12:42:07 +01:00
Leandro Toledo
9f55c15cc7 Add sendPhoto tests, fix file_id casting to str instead unicode 2016-01-11 22:25:46 -02:00
Jannes Höke
831a0a31e5 flake8 2016-01-10 15:20:05 +01:00
Jannes Höke
d10b657521 enable sending by URL for all sendX methods 2016-01-10 15:12:42 +01:00
Jannes Höke
ef1012b722 enable sending by URL for all sendX methods 2016-01-10 15:11:17 +01:00
Jannes Höke
5fd7a4fe0d release v3.3b1 2016-01-09 15:50:19 +01:00
Jannes Höke
48c1673d7c fix additional args for inline queries 2016-01-09 15:30:47 +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
b78ceeed10 fix race condition in dispatcher 2016-01-06 15:36:14 +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
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
87657bcd70 flake8 and string formatting 2016-01-04 02:05:39 +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
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
Jannes Höke
119743433d merge Tengah-master into master 2015-12-31 15:41:37 +01:00
Bob Pasker
b0ad07f30f remove traceback import 2015-12-31 09:29:02 -05:00
Jannes Höke
5d1ef673a3 flake8 2015-12-31 15:04:42 +01:00
Jannes Höke
3e1cb08567 flake8 2015-12-31 15:03:40 +01:00
Jannes Höke
29a4062945 properly lock updater and dispatcher start/stop methods 2015-12-31 14:58:01 +01:00
Jannes Höke
2ff6fe9901 initial commit for JobQueue by @franciscod 2015-12-31 14:56:48 +01:00
Jannes Höke
34b91f5062 properly lock updater and dispatcher start/stop methods 2015-12-31 14:52:28 +01:00
Bob Pasker
cc6c4a6eb9 Change a print statement to use logger instead 2015-12-31 08:33:42 -05:00
Jannes Höke
fc9456e1a8 release v3.1.2 2015-12-29 14:46:00 +01:00
Jannes Höke
41ba57f064 don't stop the dispatcher thread on uncaught errors 2015-12-29 14:28:39 +01:00
Jannes Höke
b205751aee change default value for poll_interval to 0 2015-12-29 14:28:39 +01:00
Eduard Gomolyako
7d7397317e Fix file.download with custom_path 2015-12-27 04:01:13 +03:00
Jannes Höke
f75e329225 fix docstring 2015-12-21 21:40:41 +01:00
Jannes Höke
ea7c54ba07 Release v3.1.1, change author email everywhere 2015-12-21 21:18:53 +01:00
Jannes Höke
3c7b037eaa add additional arguments 'groups' and 'groupdict' for regex handlers 2015-12-21 20:25:31 +01:00
Jannes Höke
c15a1bc151 fix for #123 2015-12-21 19:36:17 +01:00
Jannes Höke
9e7314134e fix docstring 2015-12-17 14:55:20 +01:00