leandrotoledo
e3fe1d2632
Merge branch 'master' of https://github.com/python-telegram-bot/python-telegram-bot
2016-07-14 17:19:13 -03:00
leandrotoledo
52bd3daa39
Bumping version of pre-commit [ci skip]
2016-07-14 17:18:29 -03:00
Leandro Toledo
b4e8209f2c
Update CONTRIBUTING.rst
...
Adding a bullet on "assertEqual method's arguments should be in ('actual', 'expected') order"
2016-07-14 17:16:25 -03:00
Valentijn
f5f95ef8c9
Documentation ( #350 )
...
* Small fixes to documentation and add myself to AUTHORS.
* Rework CONTRIBUTIONS.rst
Use code-blocks instead of literals, change headings for portability and use a relative link to AUTHORS instead of linking to a specific copy.
2016-07-14 16:56:05 -03:00
Rahiel Kasim
04a871aff5
introduce constants module ( #342 )
2016-07-14 21:48:31 +02:00
Jannes Höke
81a755a7d8
Merge branch 'urllib3_fix_proxy_auth'
2016-07-13 15:09:23 +02:00
Noam Meltzer
6016aca0ba
Bump version to v4.3.4
2016-07-12 23:34:49 +03:00
Noam Meltzer
7c908db901
urllib3: can now connect through proxies which require auth
...
fixes #343
2016-07-12 23:31:38 +03:00
Noam Meltzer
d192b385ea
dispatcher: add comment to describe the reason for conpool size
2016-07-12 21:58:27 +03:00
Jannes Höke
f0b2028e3f
Merge pull request #344 from python-telegram-bot/silence-webhook-logging
...
Move webhook handler logs to logging at DEBUG level
2016-07-12 14:35:14 +02:00
Mikki Weesenaar
f443003408
Small change in the documentation.
2016-07-12 13:45:37 +02:00
Jannes Höke
afc36a235b
move webhook handler logs to logging at DEBUG level
2016-07-11 23:44:40 +02:00
Noam Meltzer
b76337de87
__main__.py: assist with creating issues on github
...
usage:
python -m telegram
and copy/paste the output
2016-07-09 14:40:53 +03:00
Noam Meltzer
6afee6e0bd
Merge pull request #340 from python-telegram-bot/v4.3.x
...
urllib3: now supports proxy
2016-07-08 23:53:56 +03:00
Jannes Höke
27e57bbf58
Bump version to v4.3.3
2016-07-08 22:13:46 +02:00
Noam Meltzer
4990d664bb
Merge pull request #339 from python-telegram-bot/urllib3_fix_proxy
...
urllib3: now supports proxy
2016-07-08 23:00:02 +03:00
Noam Meltzer
b3e42c3e20
urllib3: now supports proxy
...
fixes #336
2016-07-08 22:33:37 +03:00
Jannes Höke
c2cce40299
Merge branch 'use-timeout'
2016-07-04 21:56:26 +02:00
Jannes Höke
a2ed7b26f1
Bump version to v4.3.2
2016-07-04 21:52:00 +02:00
Jannes Höke
89a3dc8372
use urlopen timeout
2016-07-04 21:40:31 +02:00
Jannes Höke
9fd298a393
Merge pull request #307 from python-telegram-bot/jobqueue-rework
...
Make job queue API similar to the dispatcher, add new functionality
2016-06-29 16:20:43 +02:00
Jannes Höke
ecbc268781
Bump version to v4.3.1
2016-06-29 15:53:52 +02:00
Jannes Höke
c7c21c94ea
update requirement: urllib3>=1.10
2016-06-29 15:53:10 +02:00
Jannes Höke
57efde5e0f
Bump version to v4.3
2016-06-28 13:35:42 +02:00
Jannes Höke
31073101a3
yapf
2016-06-24 19:22:49 +02:00
Noam Meltzer
1e0ebe89f3
JobQueue: minimize the amount of places changing self.__tick state
...
- start the jobqueue (by default) during __init__() instead of during
put()
- protect self._next_peek and self.__tick with a Lock
- rename self._start() to self._main_loop()
- stop() is now blocking until the event loop thread exits
2016-06-24 19:35:54 +03:00
Noam Meltzer
35872d7a8b
test_jobqueue: fix test_jobs_tuple()
...
this test was based on timing and assumed that the JobQueue did not have
time to start processing the queue before checking the assert.
what we really should do is make sure JobQueue does not process anything
2016-06-24 19:13:40 +03:00
Noam Meltzer
f65b6911ea
JobQueue: use class name for the logger name
2016-06-24 19:13:40 +03:00
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