From 5b91194cc7d504376c2c600a5ca7a5aed25d68dc Mon Sep 17 00:00:00 2001 From: Noam Meltzer Date: Sat, 18 Jun 2016 20:05:10 +0300 Subject: [PATCH] new yapf version, new cosmetic fixes --- telegram/bot.py | 24 +++++++++++++----------- telegram/ext/updater.py | 7 +++---- telegram/inputfile.py | 6 +++--- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/telegram/bot.py b/telegram/bot.py index 2145bee7942..16338bd69a3 100644 --- a/telegram/bot.py +++ b/telegram/bot.py @@ -618,13 +618,14 @@ def sendLocation(self, chat_id, latitude, longitude, **kwargs): @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 @@ def editMessageCaption(self, @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). diff --git a/telegram/ext/updater.py b/telegram/ext/updater.py index 420763e87c1..3fc99e43b22 100644 --- a/telegram/ext/updater.py +++ b/telegram/ext/updater.py @@ -285,10 +285,9 @@ def _start_webhook(self, listen, port, url_path, cert, key, bootstrap_retries, c 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: diff --git a/telegram/inputfile.py b/telegram/inputfile.py index 8c9276eb523..5ed3c28c91a 100644 --- a/telegram/inputfile.py +++ b/telegram/inputfile.py @@ -125,9 +125,9 @@ def to_form(self): # 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 + '--')