Jannes Höke
5134f71380
Merge branch 'more-regex-handlers' of https://github.com/bomjacob/python-telegram-bot into bomjacob-more-regex-handlers
2016-08-06 14:32:05 +02:00
Jacob Bom
32268597d9
Wrap long lines
2016-08-06 14:19:41 +02:00
Jacob Bom
4feb2553ff
Add self to Authors.rst
2016-08-06 13:45:43 +02:00
Jacob Bom
cd2f956e56
Also fix linebreak ^^
2016-08-06 13:35:58 +02:00
Jacob Bom
18fdb5ed13
Fix weird indent.
2016-08-06 13:35:06 +02:00
Jacob Bom
8c698caa12
Add Regex handling to CallbackQueryHandler and InlineQueryHandler.
...
Mostly a copy-paste from RegexHandler.
Not fully tested! Also needs yapf - sorry.
2016-08-06 13:33:38 +02:00
Jannes Höke
587908457e
move version string to telegram/version.py ( #361 )
2016-07-29 15:40:11 +00:00
Noam Meltzer
4375820863
fixup! updated issue template
2016-07-25 22:31:23 +03:00
Noam Meltzer
171c70b4c2
updated issue template
...
[ci skip]
2016-07-25 22:29:55 +03:00
overquota
f1ee54fa73
ChatMigrated exception ( #353 )
...
* ChatMigrated exception
2016-07-25 21:50:33 +03:00
Jannes Höke
90913724ca
Update README.rst
2016-07-24 02:42:55 +02:00
Jannes Höke
9d4691e50d
Create README.md
2016-07-24 02:35:01 +02:00
Rahiel Kasim
c4928229d6
README: link to website
2016-07-24 01:21:35 +02:00
Jannes Höke
2f2337cac1
update motto in readme
2016-07-24 01:16:57 +02:00
Jannes Höke
f5c57cd6c6
new inlinekeyboard example ( #355 )
2016-07-20 00:15:03 +02:00
Rahiel Kasim
c51c2224da
README: update link to new conversationbot example
2016-07-15 12:36:37 +02:00
Jannes Höke
834bf192b9
Bump version to v5.0.0
2016-07-15 01:48:11 +02:00
Jannes Höke
d5486433e5
use job context for timerbot example
2016-07-15 01:46:27 +02:00
Jannes Höke
c9ec436d68
remove old state machine example
2016-07-15 01:45:43 +02:00
Jannes Höke
ad3eec2af8
ConversationHandler ( #331 )
...
* initial commit for conversationhandler and example
* implement simple Promise for run_async/conversationhandler
* refactor Promise._done to done
* add handling for timed out Promises
* correctly handle promises with None results
* fix handling tuple states
* update comments on example
* Added a first test on the ConversationHandler.
* Fixed a small typo.
* Yapf'd.
* add sphinx doc for conversation handler
* fix title for callbackqueryhandler sphinx docs
2016-07-15 01:30:54 +02:00
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