Rahiel Kasim
ca81a75f29
Merge pull request #396 from python-telegram-bot/json
...
use ujson as JSON en/decoder if available
2016-08-26 11:42:28 +02:00
Rahiel Kasim
da87d4ba78
fix yapf
2016-08-26 11:17:05 +02:00
Rahiel Kasim
4753d27bd5
bump yapf to 0.11.0
2016-08-26 10:55:41 +02:00
Rahiel Kasim
eabfc0b06b
set ujson as optional dependency, test CPython builds with ujson
2016-08-26 10:23:17 +02:00
Rahiel Kasim
fcda567f8c
use ujson as JSON en/decoder if available
2016-08-26 09:40:46 +02:00
Jacob Bom
ffff0938f4
Add forwarded filter ( #392 )
2016-08-23 16:55:50 +02:00
Rahiel Kasim
00bba73673
drop Python 2.6 support ( closes #245 ) ( #386 )
...
* drop Python 2.6 support (closes #245 )
* fix NullHandler import
* README: explicitly mention Py3 and PyPy compatibility
2016-08-20 22:01:07 +02:00
eugenio412
e9c5ee7ad6
unset but ( #383 )
...
solved the bug that prevented the unset to work
2016-08-16 21:13:31 +02:00
MWeesenaar
f2f62423ba
Merge pull request #379 from bomjacob/master
...
Fix #376 : Execfile not in python 3. Take #2
2016-08-11 14:58:24 +02:00
Mikki Weesenaar
26a0a173f4
Manual merge
2016-08-11 14:38:55 +02:00
Jacob Bom
b736e1e855
Move the exec out of function, since that's a whole other scope...
2016-08-11 13:08:28 +02:00
Jacob Bom
bd3fa3bb64
Fix #376 : Execfile does not exist in python 3 ( #377 )
...
* Add execfile function since it's missing in python 3.
* Remove extra space.
2016-08-10 21:39:14 +02:00
Jacob Bom
c252042ddf
Remove extra space.
2016-08-10 21:00:01 +02:00
Jacob Bom
8475c322af
Add execfile function since it's missing in python 3.
2016-08-10 20:59:11 +02:00
Ilya Strukov
dd4c0f0f1d
Add missing return statement in timerbot example ( #368 )
2016-08-07 17:59:58 +02:00
Jannes Höke
555e36ee80
tests
2016-08-06 14:47:45 +02:00
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
