Merge pull request python-telegram-bot#199 from python-telegram-bot/send-inputfile-from-bytesio

jh0ker · jh0ker · commit 82030c410966 · 2016-03-14T01:17:27.000+01:00
Fix InputFile attribute check when from a BufferedReader object
diff --git a/telegram/inputfile.py b/telegram/inputfile.py
@@ -81,7 +81,8 @@ def __init__(self,
             self.input_file_content = self.input_file.read()
             if 'filename' in data:
                 self.filename = self.data.pop('filename')
-            elif isinstance(self.input_file, file):
+            elif isinstance(self.input_file, file) and \
+                    hasattr(self.input_file, 'name'):
                 self.filename = os.path.basename(self.input_file.name)
             elif from_url:
                 self.filename = os.path.basename(self.input_file.url)\
@@ -134,7 +135,7 @@ def to_form(self):
             form_boundary,
             'Content-Disposition: form-data; name="%s"; filename="%s"' % (
                 self.input_name, self.filename
-                ),
+            ),
             'Content-Type: %s' % self.mimetype,
             '',
             self.input_file_content
