Skip to content

InputFile: Fix proper naming of file when reading from subprocess.PIPE #1079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsnoam merged 5 commits into from
May 2, 2018
Merged

InputFile: Fix proper naming of file when reading from subprocess.PIPE #1079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b8c75a
InputFile: Fix proper naming of file when reading from subprocess.PIPE
tsnoam Apr 20, 2018
c897d48
The first inputfile tests
tsnoam Apr 20, 2018
f2c5649
test_inputfile.py: Try to fix unitests on windows
tsnoam May 1, 2018
b4cef24
Make unittest work on windows too.
jsmnbom May 2, 2018
f30d47a
Kill instead of terminate, and don't poll the process
jsmnbom May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion telegram/files/inputfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ def __init__(self, data):
self.input_file_content = self.input_file.read()
if 'filename' in data:
self.filename = self.data.pop('filename')
elif hasattr(self.input_file, 'name'):
elif (hasattr(self.input_file, 'name') and
not isinstance(self.input_file.name, int) and # py3
self.input_file.name != '<fdopen>'): # py2
# on py2.7, pylint fails to understand this properly
# pylint: disable=E1101
self.filename = os.path.basename(self.input_file.name)
Expand Down
43 changes: 43 additions & 0 deletions tests/test_inputfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# A library that provides a Python interface to the Telegram Bot API
# Copyright (C) 2015-2018
# Leandro Toledo de Souza <devs@python-telegram-bot.org>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser Public License for more details.
#
# You should have received a copy of the GNU Lesser Public License
# along with this program. If not, see [http://www.gnu.org/licenses/].
import os
import subprocess
import sys

from telegram import InputFile


class TestInputFile(object):
png = os.path.join('tests', 'data', 'game.png')

def test_subprocess_pipe(self):
if sys.platform == 'win32':
cmd = ['type', self.png]
else:
cmd = ['cat', self.png]

proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=(sys.platform == 'win32'))
in_file = InputFile({'photo': proc.stdout})

assert in_file.input_file_content == open(self.png, 'rb').read()
assert in_file.mimetype == 'image/png'
assert in_file.filename == 'image.png'

proc.kill()