OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2024-11-21 22:56:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

new yapf version, new cosmetic fixes

Browse source
This commit is contained in:
Noam Meltzer 2016-06-18 20:05:10 +03:00
parent 494a7ec1e4
commit 5b91194cc7
3 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
telegram/bot.py
View file

@ -618,13 +618,14 @@ class Bot(TelegramObject):
@log
@message
def sendVenue(
self, chat_id,
latitude,
longitude,
title, address,
foursquare_id=None,
**kwargs):
def sendVenue(self,
chat_id,
latitude,
longitude,
title,
address,
foursquare_id=None,
**kwargs):
"""
Use this method to send information about a venue.
@ -1132,10 +1133,11 @@ class Bot(TelegramObject):
@log
@message
def editMessageReplyMarkup(
self, chat_id=None,
message_id=None, inline_message_id=None,
**kwargs):
def editMessageReplyMarkup(self,
chat_id=None,
message_id=None,
inline_message_id=None,
**kwargs):
"""Use this method to edit only the reply markup of messages sent by
the bot or via the bot (for inline bots).

7
telegram/ext/updater.py
View file

@ -285,10 +285,9 @@ class Updater(object):
def _check_ssl_cert(self, cert, key):
# Check SSL-Certificate with openssl, if possible
try:
exit_code = subprocess.call(
["openssl", "x509", "-text", "-noout", "-in", cert],
stdout=open(os.devnull, 'wb'),
stderr=subprocess.STDOUT)
exit_code = subprocess.call(["openssl", "x509", "-text", "-noout", "-in", cert],
stdout=open(os.devnull, 'wb'),
stderr=subprocess.STDOUT)
except OSError:
exit_code = 0
if exit_code is 0:

6
telegram/inputfile.py
View file

@ -125,9 +125,9 @@ class InputFile(object):
# Add input_file to upload
form.extend([
form_boundary, 'Content-Disposition: form-data; name="%s"; filename="%s"' % (
self.input_name, self.filename
), 'Content-Type: %s' % self.mimetype, '', self.input_file_content
form_boundary, 'Content-Disposition: form-data; name="%s"; filename="%s"' %
(self.input_name, self.filename), 'Content-Type: %s' % self.mimetype, '',
self.input_file_content
])
form.append('--' + self.boundary + '--')