python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-25 01:16:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added UnixViewer get_command

Browse Source
This commit is contained in:
Andrew Murray 2018-11-03 13:13:04 +11:00
parent e3d5494a51
commit a0be7b09cc
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/test_imageshow.py
View File

@ -14,6 +14,9 @@ class TestImageShow(PillowTestCase):
# Test registering a viewer that is not a class # Test registering a viewer that is not a class
ImageShow.register("not a class") ImageShow.register("not a class")
# Restore original state
ImageShow._viewers.pop()
def test_show(self): def test_show(self):
class TestViewer: class TestViewer:
methodCalled = False methodCalled = False
@ -28,6 +31,9 @@ class TestImageShow(PillowTestCase):
self.assertTrue(ImageShow.show(im)) self.assertTrue(ImageShow.show(im))
self.assertTrue(viewer.methodCalled) self.assertTrue(viewer.methodCalled)
# Restore original state
ImageShow._viewers.pop(0)
def test_viewer(self): def test_viewer(self):
viewer = ImageShow.Viewer() viewer = ImageShow.Viewer()
@ -35,6 +41,10 @@ class TestImageShow(PillowTestCase):
self.assertRaises(NotImplementedError, viewer.get_command, None) self.assertRaises(NotImplementedError, viewer.get_command, None)
def test_viewers(self):
for viewer in ImageShow._viewers:
viewer.get_command('test.jpg')
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

9
src/PIL/ImageShow.py
View File

@ -148,12 +148,9 @@ else:
format = "PNG" format = "PNG"
options = {'compress_level': 1} options = {'compress_level': 1}
def show_file(self, file, **options): def get_command(self, file, **options):
command, executable = self.get_command_ex(file, **options) command = self.get_command_ex(file, **options)[0]
command = "(%s %s; rm -f %s)&" % (command, quote(file), return "(%s %s; rm -f %s)&" % (command, quote(file), quote(file))
quote(file))
os.system(command)
return 1
# implementations # implementations