Noam Meltzer
02af1ea803
jobqueue: cosmetic fixes
2016-06-24 19:13:40 +03:00
Jannes Höke
c4a8ee5175
Merge branch 'master' into jobqueue-rework
...
Conflicts:
tests/test_jobqueue.py
2016-06-20 05:32:15 +02:00
Noam Meltzer
e0539d5992
Merge pull request #327 from python-telegram-bot/urllib3
...
Urllib3
2016-06-20 06:30:25 +03:00
Jannes Höke
738e3213a7
Merge branch 'master' into jobqueue-rework
2016-06-20 00:49:01 +02:00
leandrotoledo
b41f7e3e79
Code style with latest yapf
2016-06-19 17:50:02 -04:00
Jannes Höke
caf72ca490
Merge branch 'urllib3' of github.com:python-telegram-bot/python-telegram-bot into urllib3
2016-06-19 23:46:53 +02:00
Jannes Höke
7635bc0eec
comments, lock thread pool, while 1 and snake_case everywhere
2016-06-19 23:46:34 +02:00
Jannes Höke
703bece155
set loglevel of urllib3 to WARNING by default
2016-06-19 23:40:34 +02:00
Jannes Höke
949f4a4fbd
update requirements: minimum versions of urllib3 and future
2016-06-19 23:39:00 +02:00
leandrotoledo
05522e4321
Merge remote-tracking branch 'origin/master' into urllib3
2016-06-19 17:38:19 -04:00
leandrotoledo
4f101a79bb
Update travis yapf [ci skip]
2016-06-19 17:08:12 -04:00
Noam Meltzer
5b91194cc7
new yapf version, new cosmetic fixes
2016-06-18 20:05:10 +03:00
Noam Meltzer
494a7ec1e4
ypaf fixes
2016-06-18 19:57:11 +03:00
Noam Meltzer
fc05d3a626
switch back to PoolManager
...
telegram servers might send a reponse with HTTP 302 (redirect) to
another hostname. in such case HTTPSConnectionPool will fail to do the
job
2016-06-18 19:50:18 +03:00
Noam Meltzer
bc77c845ea
test_updater: make sure that conpool is stopped before setting updater
...
even for the first unitest, it might come after another unitests from
another file which had already init the conpool.
2016-06-18 09:53:08 +03:00
Noam Meltzer
a814e9de6b
make sure to stop conpool between sensitive unitests
2016-06-18 00:50:44 +03:00
Noam Meltzer
d37b6d6735
make sure to stop Updater after the test_createBot is over
2016-06-18 00:01:36 +03:00
Noam Meltzer
e479c7f25e
type hinting (cosmetic fix)
2016-06-17 23:59:32 +03:00
Noam Meltzer
a30411c9fa
make sure to remove the stopped dispatcher threads from ASYNC_THREADS
2016-06-17 23:58:22 +03:00
Noam Meltzer
881d1d0e25
fix/hack Updater.stop() not working on extreme cases
...
during test_bootstrap_retries_fail() there is an exception raised (by
design): TelegramError('test')
For a reason I haven't managed to pinpoint the above exception in its
precise timing caused the Updater to be left in a state which is
'self.running == False', but the dispatcher threads already initialized.
This patch identifies this extreme case and makes sure to go over the
stop procedure.
2016-06-17 23:53:18 +03:00
Noam Meltzer
cb6ddfded5
Merge remote-tracking branch 'origin/master' into urllib3
2016-06-17 17:54:04 +03:00
Noam Meltzer
bda0244ed8
updater: fix print in log
2016-06-17 16:52:25 +03:00
Rahiel Kasim
9338f93d24
Merge pull request #325 from python-telegram-bot/examples
...
more robust echobot, let roboed go
2016-06-12 17:08:15 +02:00
Rahiel Kasim
e10fa66286
echobot: simplify handling messageless updates
2016-06-12 17:06:03 +02:00
Rahiel Kasim
deb9de0ba0
README: remove roboed, rename example
2016-06-12 16:58:18 +02:00
Rahiel Kasim
94fd6851ab
more robust echobot, let roboed go
2016-06-12 15:30:56 +02:00
leandrotoledo
897f9615f0
Bump version to v4.2.1
2016-06-10 09:44:17 -04:00
Leandro Toledo
86676d59f1
Merge pull request #321 from python-telegram-bot/editMessageText-decorator
...
Adds @message decorator to editMessageText #320
2016-06-04 05:19:27 -04:00
leandrotoledo
f0b91ecf46
Fix travis
2016-06-03 13:44:24 -04:00
leandrotoledo
bbbc622517
Adds @message decorator to editMessageText #320
2016-06-03 13:28:29 -04:00
Noam Meltzer
1f5601dae2
fix SyntaxWarning
2016-06-01 22:38:08 +03:00
Noam Meltzer
3608c2bbe5
dispatcher: if connection pool is already initialized raise exception
...
this will better protect the user from wrong usage
2016-06-01 22:30:34 +03:00
Noam Meltzer
c28763c5be
dispatcher: cosmetic fix
2016-06-01 22:30:33 +03:00
Noam Meltzer
dd8b6219b9
dispatcher: a little performance improvment
2016-06-01 22:30:33 +03:00
Noam Meltzer
78f9bdcac9
dispatcher: pep8 style fix
...
globals are supposed to be upper case
2016-06-01 22:30:09 +03:00
Jannes Höke
da95341d5b
Update README.rst
2016-06-01 00:05:09 +02:00
Jannes Höke
98be6abc11
Remove clibot.py example
2016-05-31 21:07:47 +02:00
Jannes Höke
b08d41d0ff
formatting
2016-05-31 15:35:40 +02:00
Jannes Höke
de2d732135
Merge branch 'master' into jobqueue-rework
...
Conflicts:
README.rst
telegram/ext/commandhandler.py
telegram/ext/messagehandler.py
2016-05-31 15:34:36 +02:00
Jannes Höke
1ff348adbb
issue warning if connection pool was initialized before Dispatcher
2016-05-31 13:47:43 +02:00
Jannes Höke
6b457bada5
use keepalive for connection pool
2016-05-31 13:45:43 +02:00
Jannes Höke
74283bd414
use HTTPSConnectionPool instead of PoolManager
2016-05-30 17:12:50 +02:00
Jannes Höke
41f6591ac6
more sensible logging
2016-05-30 17:12:27 +02:00
Leandro Toledo
6d08e1bc7f
Merge pull request #317 from jlmadurga/issue/316
...
Fix callbackquery to_dict
2016-05-30 11:35:44 -03:00
Juan Madurga
073d7949dc
fix callbackquery to_dict
2016-05-30 15:59:45 +02:00
Jannes Höke
dd91ce1f39
use single queue for thread pool, initialize connection pool with n+3
2016-05-30 13:09:23 +02:00
Jannes Höke
57759d8e6d
[drunk] use actual thread pool and queue new functions into the pool instead of starting new threads every time
2016-05-30 03:16:33 +02:00
Noam Meltzer
574fc8cddf
urllib3: validate https certificate
2016-05-30 01:05:19 +03:00
Noam Meltzer
b040568b07
test_bot: fix for urllib3 compatibility
2016-05-30 01:05:19 +03:00
Noam Meltzer
3076dfc086
use urllib3 instead of urllib(2)
2016-05-30 01:05:19 +03:00