extern/httpie-cli
1
0
Fork 1
mirror of https://github.com/httpie/cli.git synced 2025-06-26 04:21:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix several ResourceWarning: unclosed file (#741)

Browse Source 
Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
This commit is contained in:
Mickaël Schoentgen 2019-02-04 10:00:30 +01:00 committed by Jakub Roztocil
parent b7c8bf0800
commit 3a46149de1
3 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
httpie/input.py
View File

@ -752,7 +752,7 @@ def parse_items(items,
def readable_file_arg(filename): def readable_file_arg(filename):
try: try:
open(filename, 'rb') with open(filename, 'rb'):
return filename
except IOError as ex: except IOError as ex:
raise ArgumentTypeError('%s: %s' % (filename, ex.args[1])) raise ArgumentTypeError('%s: %s' % (filename, ex.args[1]))
return filename

9
tests/test_downloads.py
View File

@ -131,7 +131,7 @@ class TestDownloads:
assert body == r assert body == r
def test_download_with_Content_Length(self, httpbin_both): def test_download_with_Content_Length(self, httpbin_both):
devnull = open(os.devnull, 'w') with open(os.devnull, 'w') as devnull:
downloader = Downloader(output_file=devnull, progress_file=devnull) downloader = Downloader(output_file=devnull, progress_file=devnull)
downloader.start(Response( downloader.start(Response(
url=httpbin_both.url + '/', url=httpbin_both.url + '/',
@ -143,18 +143,20 @@ class TestDownloads:
downloader.chunk_downloaded(b'12345') downloader.chunk_downloaded(b'12345')
downloader.finish() downloader.finish()
assert not downloader.interrupted assert not downloader.interrupted
downloader._progress_reporter.join()
def test_download_no_Content_Length(self, httpbin_both): def test_download_no_Content_Length(self, httpbin_both):
devnull = open(os.devnull, 'w') with open(os.devnull, 'w') as devnull:
downloader = Downloader(output_file=devnull, progress_file=devnull) downloader = Downloader(output_file=devnull, progress_file=devnull)
downloader.start(Response(url=httpbin_both.url + '/')) downloader.start(Response(url=httpbin_both.url + '/'))
time.sleep(1.1) time.sleep(1.1)
downloader.chunk_downloaded(b'12345') downloader.chunk_downloaded(b'12345')
downloader.finish() downloader.finish()
assert not downloader.interrupted assert not downloader.interrupted
downloader._progress_reporter.join()
def test_download_interrupted(self, httpbin_both): def test_download_interrupted(self, httpbin_both):
devnull = open(os.devnull, 'w') with open(os.devnull, 'w') as devnull:
downloader = Downloader(output_file=devnull, progress_file=devnull) downloader = Downloader(output_file=devnull, progress_file=devnull)
downloader.start(Response( downloader.start(Response(
url=httpbin_both.url + '/', url=httpbin_both.url + '/',
@ -163,3 +165,4 @@ class TestDownloads:
downloader.chunk_downloaded(b'1234') downloader.chunk_downloaded(b'1234')
downloader.finish() downloader.finish()
assert downloader.interrupted assert downloader.interrupted
downloader._progress_reporter.join()

2
tests/utils.py
View File

@ -62,6 +62,8 @@ class MockEnvironment(Environment):
return super(MockEnvironment, self).config return super(MockEnvironment, self).config
def cleanup(self): def cleanup(self):
self.stdout.close()
self.stderr.close()
if self._delete_config_dir: if self._delete_config_dir:
assert self.config_dir.startswith(tempfile.gettempdir()) assert self.config_dir.startswith(tempfile.gettempdir())
from shutil import rmtree from shutil import rmtree