aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesús <heckyel@hyperbola.info>2020-06-01 18:10:07 -0500
committerJesús <heckyel@hyperbola.info>2020-06-01 18:10:07 -0500
commit9bcdcbda2b5e34c204976e7b43de62f9ac7bd591 (patch)
tree01f5dfb56728728133795484110a9614cdaec9bf
parent99f96dc8b20ebfaeb51019001771f138a02ff1cd (diff)
downloadlibrevideoconverter-9bcdcbda2b5e34c204976e7b43de62f9ac7bd591.tar.lz
librevideoconverter-9bcdcbda2b5e34c204976e7b43de62f9ac7bd591.tar.xz
librevideoconverter-9bcdcbda2b5e34c204976e7b43de62f9ac7bd591.zip
pep8
-rwxr-xr-xbuild-windows.sh12
-rw-r--r--build_installer.sh2
-rwxr-xr-xclean.sh1
-rwxr-xr-xhelperscripts/windows-virtualenv/__main__.py6
-rwxr-xr-xhelperscripts/windows-virtualenv/virtualenv.py2
-rw-r--r--lvc/__init__.py2
-rw-r--r--lvc/qtfaststart/__init__.py2
-rw-r--r--lvc/ui/console.py36
-rw-r--r--lvc/variables.py1
-rw-r--r--lvc/widgets/gtk/window.py11
-rw-r--r--lvc/widgets/osx/base.py2
-rw-r--r--lvc/windows/autoupdate.py18
-rw-r--r--setup-files/linux/setup.py35
-rw-r--r--setup-files/osx/setup.py15
-rwxr-xr-xsetup-files/windows/lvc.nsi2
-rw-r--r--setup.py15
-rw-r--r--sign.sh2
-rw-r--r--test/base.py1
-rw-r--r--test/mock.py2
-rw-r--r--test/testdata/fake_converter.py14
-rw-r--r--test/uitests.sikuli/config.py6
-rw-r--r--test/uitests.sikuli/datafiles.py2
-rw-r--r--test/uitests.sikuli/lvc_steps.py4
-rw-r--r--test/uitests.sikuli/test_android_conversions.py4
-rw-r--r--test/uitests.sikuli/test_apple_conversions.py4
-rw-r--r--test/uitests.sikuli/test_choose_files.py2
-rw-r--r--test/uitests.sikuli/test_clear_finished_conversions.py2
-rw-r--r--test/uitests.sikuli/test_conversions.py2
-rw-r--r--test/uitests.sikuli/test_other_conversions.py2
-rw-r--r--test/uitests.sikuli/test_output_settings.py2
-rw-r--r--test/uitests.sikuli/test_remove_files.py2
31 files changed, 124 insertions, 89 deletions
diff --git a/build-windows.sh b/build-windows.sh
index 513bf17..3ec2054 100755
--- a/build-windows.sh
+++ b/build-windows.sh
@@ -1,12 +1,12 @@
#!/bin/sh
if [ ! -e lvc-env ] ; then
- echo "LVC virtualenv is not present. Run "
- echo
- echo " python helperscripts/windows-virtualenv/ lvc-env"
- echo
- echo "to build it"
- exit 1
+ echo "LVC virtualenv is not present. Run "
+ echo
+ echo " python helperscripts/windows-virtualenv/ lvc-env"
+ echo
+ echo "to build it"
+ exit 1
fi
PYTHONPATH="." lvc-env/Scripts/python.exe setup.py bdist_nsis
diff --git a/build_installer.sh b/build_installer.sh
index 0d0f6f6..bfaa021 100644
--- a/build_installer.sh
+++ b/build_installer.sh
@@ -2,5 +2,5 @@
productbuild \
--component "dist/Libre Video Converter.app" /Applications \
- --sign 'Freedom System: Heckyel | 2017' \
+ --sign 'Freedom System: Jesús E. 2017 - 2020' \
--product setup-files/osx/lvc3_definition.plist lvc3.pkg
diff --git a/clean.sh b/clean.sh
index a38eb67..53cca6c 100755
--- a/clean.sh
+++ b/clean.sh
@@ -3,3 +3,4 @@
rm -fr build
rm -fr dist
rm -fr librevideoconverter.egg-info
+find . -name "*.pyc" -type f -delete
diff --git a/helperscripts/windows-virtualenv/__main__.py b/helperscripts/windows-virtualenv/__main__.py
index 76c91b7..9305f6c 100755
--- a/helperscripts/windows-virtualenv/__main__.py
+++ b/helperscripts/windows-virtualenv/__main__.py
@@ -156,16 +156,16 @@ def parse_args():
def writeout(msg, *args):
"""write a line to stdout."""
- print msg % args
+ print(msg % args)
def writeout_and_stay(msg, *args):
"""write a line to stdout and stay on the same line."""
# clear out old line
- print " " * 70 + "\r",
+ print(" " * 70 + "\r"),
# write out new line
- print (msg % args) + "\r",
+ print((msg % args) + "\r"),
sys.stdout.flush()
diff --git a/helperscripts/windows-virtualenv/virtualenv.py b/helperscripts/windows-virtualenv/virtualenv.py
index 66f3e3d..54310ed 100755
--- a/helperscripts/windows-virtualenv/virtualenv.py
+++ b/helperscripts/windows-virtualenv/virtualenv.py
@@ -619,6 +619,7 @@ def install_distribute(py_executable, unzip=False,
_install_req(py_executable, unzip, distribute=True,
search_dirs=search_dirs, never_download=never_download)
+
_pip_re = re.compile(r'^pip-.*(zip|tar.gz|tar.bz2|tgz|tbz)$', re.I)
@@ -1596,6 +1597,7 @@ def make_environment_relocatable(home_dir):
fixup_pth_and_egg_link(home_dir)
# FIXME: need to fix up distutils.cfg
+
OK_ABS_SCRIPTS = ['python', 'python%s' % sys.version[:3],
'activate', 'activate.bat', 'activate_this.py']
diff --git a/lvc/__init__.py b/lvc/__init__.py
index 11fafb7..1564ac3 100644
--- a/lvc/__init__.py
+++ b/lvc/__init__.py
@@ -6,8 +6,6 @@ from lvc import conversion
from lvc import signals
from lvc import video
-VERSION = '1.0.1'
-
class Application(signals.SignalEmitter):
diff --git a/lvc/qtfaststart/__init__.py b/lvc/qtfaststart/__init__.py
index f985b5c..8b13789 100644
--- a/lvc/qtfaststart/__init__.py
+++ b/lvc/qtfaststart/__init__.py
@@ -1 +1 @@
-VERSION = "1.6"
+
diff --git a/lvc/ui/console.py b/lvc/ui/console.py
index a0c373b..871bfd6 100644
--- a/lvc/ui/console.py
+++ b/lvc/ui/console.py
@@ -5,12 +5,17 @@ import time
import sys
import lvc
+
+from lvc.variables import (
+ __version__
+)
+
from lvc.widgets import app
from lvc.widgets import initialize
parser = optparse.OptionParser(
usage='%prog [-l] [--list-converters] [-c <converter> <filenames..>]',
- version='%prog ' + lvc.VERSION,
+ version='%prog ' + __version__,
prog='python -m lvc.ui.console')
parser.add_option('-j', '--json', action='store_true',
dest='json',
@@ -31,12 +36,12 @@ class Application(lvc.Application):
for c in sorted(self.converter_manager.list_converters(),
key=operator.attrgetter('name')):
if options.json:
- print json.dumps({'name': c.name,
- 'identifier': c.identifier})
+ print(json.dumps({'name': c.name,
+ 'identifier': c.identifier}))
else:
- print '%s (-c %s)' % (
+ print('%s (-c %s)' % (
c.name,
- c.identifier)
+ c.identifier))
return
try:
@@ -45,12 +50,12 @@ class Application(lvc.Application):
message = '%r is not a valid converter type.' % (
options.converter,)
if options.json:
- print json.dumps({'error': message})
+ print(json.dumps({'error': message}))
else:
- print 'ERROR:', message
- print 'Use "%s -l" to get a list of valid converters.' % (
- parser.prog,)
- print
+ print('ERROR:', message)
+ print('Use "%s -l" to get a list of valid converters.' % (
+ parser.prog,))
+ print('')
parser.print_help()
sys.exit(1)
@@ -71,7 +76,7 @@ class Application(lvc.Application):
}
if c.error is not None:
output['error'] = c.error
- print json.dumps(output)
+ print(json.dumps(output))
else:
if c.status == 'initialized':
line = 'starting (output: %s)' % (c.output,)
@@ -89,7 +94,7 @@ class Application(lvc.Application):
line = 'finished (output: %s)' % (c.output,)
else:
line = c.status
- print '%s: %s' % (c.video.filename, line)
+ print('%s: %s' % (c.video.filename, line))
for filename in args:
try:
@@ -98,10 +103,10 @@ class Application(lvc.Application):
message = 'could not parse %r' % filename
if options.json:
any_failed = True
- print json.dumps({'status': 'failed', 'error': message,
- 'filename': filename})
+ print(json.dumps({'status': 'failed', 'error': message,
+ 'filename': filename}))
else:
- print 'ERROR:', message
+ print('ERROR:', message)
continue
changed(c)
c.listen(changed)
@@ -114,6 +119,7 @@ class Application(lvc.Application):
sys.exit(0 if not any_failed else 1)
+
if __name__ == "__main__":
initialize(None)
app.widgetapp = Application()
diff --git a/lvc/variables.py b/lvc/variables.py
new file mode 100644
index 0000000..1a72d32
--- /dev/null
+++ b/lvc/variables.py
@@ -0,0 +1 @@
+__version__ = '1.1.0'
diff --git a/lvc/widgets/gtk/window.py b/lvc/widgets/gtk/window.py
index 18d91a2..62eb19a 100644
--- a/lvc/widgets/gtk/window.py
+++ b/lvc/widgets/gtk/window.py
@@ -36,6 +36,10 @@ import os
from lvc import resources
from lvc import signals
+from lvc.variables import (
+ __version__
+)
+
import keymap
import layout
import widgets
@@ -110,6 +114,7 @@ class WrappedWindow(gtk.Window):
if not self.change_focus_using_wrapper(direction):
gtk.Window.do_focus(self, direction)
+
gobject.type_register(WrappedWindow)
@@ -625,16 +630,15 @@ class AboutDialog(Dialog):
# app.config.get(prefs.APP_REVISION_NUM))
# else:
# version = "%s" % app.config.get(prefs.APP_VERSION)
- version = '1.0.1'
# name_label = gtk.Label(
# '<span size="xx-large" weight="bold">%s %s</span>' % (
# app.config.get(prefs.SHORT_APP_NAME), version))
name_label = gtk.Label(
'<span size="xx-large" weight="bold">%s %s</span>' % (
- 'Libre Video Converter', version))
+ 'Libre Video Converter', __version__))
name_label.set_use_markup(True)
packing_vbox._widget.pack_start(name_label)
- copyright_text = 'Copyright (c) Jesus Eduardo (Heckyel) | 2017'
+ copyright_text = 'Copyright (c) Jesus E. 2017 - 2020'
copyright_label = gtk.Label('<small>%s</small>' % copyright_text)
copyright_label.set_use_markup(True)
copyright_label.set_justify(gtk.JUSTIFY_CENTER)
@@ -689,6 +693,7 @@ class AboutDialog(Dialog):
resources.open_url(
'https://notabug.org/heckyel/librevideoconverter')
+
type_map = {
0: gtk.MESSAGE_WARNING,
1: gtk.MESSAGE_INFO,
diff --git a/lvc/widgets/osx/base.py b/lvc/widgets/osx/base.py
index 234f266..b24b126 100644
--- a/lvc/widgets/osx/base.py
+++ b/lvc/widgets/osx/base.py
@@ -121,7 +121,7 @@ class Widget(signals.SignalEmitter):
height = int(request[1])
indent = ' ' * nesting_level
me = str(self.__class__).split('.')[-1]
- print '%s%s: %sx%s' % (indent, me, width, height)
+ print('%s%s: %sx%s' % (indent, me, width, height))
def place(self, rect, containing_view):
"""Place this widget on a view. """
diff --git a/lvc/windows/autoupdate.py b/lvc/windows/autoupdate.py
index 834a45f..ba2e271 100644
--- a/lvc/windows/autoupdate.py
+++ b/lvc/windows/autoupdate.py
@@ -77,7 +77,7 @@ def open_or_create_key(key, subkey, write_access=False):
sam = winreg.KEY_READ
try:
return winreg.OpenKey(key, subkey, 0, sam)
- except OSError, e:
+ except OSError as e:
if e.errno == 2:
# Not Found error. We should create the key
return winreg.CreateKey(key, subkey)
@@ -88,14 +88,14 @@ def open_or_create_key(key, subkey, write_access=False):
def check_for_updates_set(winsparkle_key):
try:
winreg.QueryValueEx(winsparkle_key, "CheckForUpdates")
- except OSError, e:
- if e.errno == 2:
- # not found error.
- return False
- else:
- raise
- else:
- return True
+ except OSError as e:
+ if e.errno == 2:
+ # not found error.
+ return False
+ else:
+ raise
+ else:
+ return True
def set_default_check_for_updates(winsparkle_key):
diff --git a/setup-files/linux/setup.py b/setup-files/linux/setup.py
index 87acef1..2271cce 100644
--- a/setup-files/linux/setup.py
+++ b/setup-files/linux/setup.py
@@ -5,6 +5,9 @@ import subprocess
import sys
from distutils.cmd import Command
from setuptools import setup
+from lvc.variables import (
+ __version__
+)
if sys.version < '2.7':
raise RuntimeError('LVC requires Python 2.7')
@@ -52,22 +55,24 @@ class sdist_deb(Command):
def run(self):
self.run_command("sdist")
self.setup_dirs()
- for debian_dir in glob.glob(os.path.join(SETUP_DIR, 'debian-*')):
+ for debian_dir in glob.glob(os.path.join(
+ SETUP_DIR, 'debian-*')):
self.build_for_release(debian_dir)
os.chdir(self.orig_dir)
- print
- print "debian source build complete"
- print "files are in %s" % self.work_dir
+ print('')
+ print("debian source build complete")
+ print("files are in %s" % self.work_dir)
def build_for_release(self, debian_dir):
os.chdir(self.work_dir)
- source_tree = os.path.join(self.work_dir,
- 'librevideoconverter-%s' % VERSION)
+ source_tree = os.path.join(
+ self.work_dir,
+ 'librevideoconverter-%s' % __version__)
if os.path.exists(source_tree):
shutil.rmtree(source_tree)
self.extract_tarball()
self.copy_debian_directory(debian_dir)
- os.chdir('librevideoconverter-%s' % VERSION)
+ os.chdir('librevideoconverter-%s' % __version__)
subprocess.check_call(['dpkg-buildpackage', '-S'])
def setup_dirs(self):
@@ -78,17 +83,21 @@ class sdist_deb(Command):
os.makedirs(self.work_dir)
def extract_tarball(self):
- tarball = os.path.join(self.dist_dir,
- "librevideoconverter-%s.tar.gz" % VERSION)
+ tarball = os.path.join(
+ self.dist_dir,
+ "librevideoconverter-%s.tar.gz" % __version__)
subprocess.check_call(["tar", "zxf", tarball])
- shutil.copyfile(tarball,
- "librevideoconverter_%s.orig.tar.gz" % VERSION)
+ shutil.copyfile(
+ tarball,
+ "librevideoconverter_%s.orig.tar.gz" % __version__)
def copy_debian_directory(self, debian_dir):
- dest = os.path.join(self.work_dir,
- 'librevideoconverter-%s/debian' % VERSION)
+ dest = os.path.join(
+ self.work_dir,
+ 'librevideoconverter-%s/debian' % __version__)
shutil.copytree(debian_dir, dest)
+
setup(
cmdclass={
'sdist_deb': sdist_deb,
diff --git a/setup-files/osx/setup.py b/setup-files/osx/setup.py
index 9b14a05..de2c2e3 100644
--- a/setup-files/osx/setup.py
+++ b/setup-files/osx/setup.py
@@ -101,14 +101,15 @@ class py2app_lvc(py2app_cmd):
"""
os.unlink(os.path.join(self.python_lib_root, 'site.py'))
+
plist = plistlib.readPlist(os.path.join(SETUP_DIR, 'Info.plist'))
plist['NSHumanReadableCopyright'] = 'Copyright (C) Jesús E.'
plist['CFBundleGetInfoString'] = 'Libre Video Converter'
plist['CFBundleIdentifier'] = 'org.participatoryculture.MiroVideoConverter'
-plist['CFBundleShortVersionString'] = '3.0'
+plist['CFBundleShortVersionString'] = '1.1'
plist['CFBundleExecutable'] = 'Libre Video Converter'
plist['CFBundleName'] = 'Libre Video Converter'
-plist['CFBundleVersion'] = '1.0.1'
+plist['CFBundleVersion'] = '1.1.0'
plist['SUFeedURL'] = ('http://miro-updates.participatoryculture.org/'
'lvc-appcast-osx.xml')
plist['SUPublicDSAKeyFile'] = 'dsa_pub.pem'
@@ -123,7 +124,13 @@ setup(
cmdclass={'py2app': py2app_lvc},
ext_modules=[
Extension("lvc.widgets.osx.fasttypes",
- [os.path.join(ROOT_DIR, 'lvc', 'widgets',
- 'osx', 'fasttypes.c')])],
+ [
+ os.path.join(
+ ROOT_DIR,
+ 'lvc', 'widgets',
+ 'osx', 'fasttypes.c'
+ )
+ ])
+ ],
**SETUP_ARGS
)
diff --git a/setup-files/windows/lvc.nsi b/setup-files/windows/lvc.nsi
index 9115fd5..8fd953d 100755
--- a/setup-files/windows/lvc.nsi
+++ b/setup-files/windows/lvc.nsi
@@ -1,5 +1,5 @@
; Passed in from command line:
-!define CONFIG_VERSION "2.0.0"
+!define CONFIG_VERSION "1.1.0"
; TODO: Add MIROBAR_EXE
!define CONFIG_PROJECT_URL "http://www.mirovideoconverter.com/"
diff --git a/setup.py b/setup.py
index 01b6f44..b41ceb4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,17 +1,20 @@
import os
import sys
-version = '1.0.1'
+from lvc.variables import (
+ __version__
+)
+
# platform-independent arguments for setup()
setup_args = {
'name': 'librevideoconverter',
- 'description': 'A simple video converter for WebM (vp8, vp9), Ogg Theora, MP4 and others',
- 'author': 'Jesus Eduardo (Heckyel)',
+ 'description': 'A simple video converter for WebM, Ogg Theora and others',
+ 'author': 'Jesus E.',
'author_email': 'heckyel@riseup.net',
'url': 'https://notabug.org/heckyel/librevideoconverter',
- 'license': 'GPL',
- 'version': version,
+ 'license': 'GPL-3',
+ 'version': __version__,
'packages': [
'lvc',
'lvc.osx',
@@ -44,7 +47,7 @@ root_dir = os.path.abspath(os.path.dirname(__file__))
setup_dir = os.path.join(root_dir, 'setup-files', platform)
script_vars = {
- 'VERSION': version,
+ 'VERSION': __version__,
'ROOT_DIR': root_dir,
'SETUP_DIR': setup_dir,
'SETUP_ARGS': setup_args,
diff --git a/sign.sh b/sign.sh
index b1eb0ad..832078f 100644
--- a/sign.sh
+++ b/sign.sh
@@ -3,7 +3,7 @@
for i in "dist/Libre Video Converter.app/Contents/Helpers"/*
do
codesign -fs \
- 'Fredom Operating System: Heckyel | 2017' \
+ 'Fredom Operating System: Jesús E. 2017 - 2020' \
"${i}"
done
diff --git a/test/base.py b/test/base.py
index 397274e..5eddb8f 100644
--- a/test/base.py
+++ b/test/base.py
@@ -1,6 +1,7 @@
import os.path
import unittest
+
class Test(unittest.TestCase):
def setUp(self):
diff --git a/test/mock.py b/test/mock.py
index 58e8a87..c31bdf2 100644
--- a/test/mock.py
+++ b/test/mock.py
@@ -359,6 +359,8 @@ _deleted = sentinel.DELETED
class OldStyleClass:
pass
+
+
ClassType = type(OldStyleClass)
diff --git a/test/testdata/fake_converter.py b/test/testdata/fake_converter.py
index 9f89d47..bd049bc 100644
--- a/test/testdata/fake_converter.py
+++ b/test/testdata/fake_converter.py
@@ -5,27 +5,27 @@ import json
filename, output = sys.argv[1:3]
if 'error' in filename:
- print json.dumps({'finished': True, 'error': 'test error'})
+ print(json.dumps({'finished': True, 'error': 'test error'}))
sys.exit(1)
if os.path.exists(output):
- print json.dumps({'finished': True,
- 'error': '%r existed when we started' % (
- output,)})
+ print(json.dumps({
+ 'finished': True,
+ 'error': '%r existed when we started' % (output,)}))
sys.exit(1)
time.sleep(0.5)
RANGE = 5
for i in range(RANGE):
- print json.dumps({
+ print(json.dumps({
'filename': filename,
'output': output,
'duration': RANGE,
'progress': i,
'eta': RANGE - i
- })
+ }))
time.sleep(0.1)
with file(output, 'w') as f:
f.write('blank')
-print json.dumps({'finished': True})
+print(json.dumps({'finished': True}))
diff --git a/test/uitests.sikuli/config.py b/test/uitests.sikuli/config.py
index e326c17..27e7a74 100644
--- a/test/uitests.sikuli/config.py
+++ b/test/uitests.sikuli/config.py
@@ -30,7 +30,7 @@ def get_os_name():
elif "LINUX" in str(Env.getOS()):
return "lin"
else:
- print ("I don't know how to handle platform '%s'", Env.getOS())
+ print("I don't know how to handle platform '%s'", Env.getOS())
def launch_cmd():
@@ -46,6 +46,6 @@ def launch_cmd():
"Libre Video Converter",
"LibreConverter.exe")
else:
- print get_os_name()
- print launch_cmd
+ print(get_os_name())
+ print(launch_cmd)
return launch_cmd
diff --git a/test/uitests.sikuli/datafiles.py b/test/uitests.sikuli/datafiles.py
index 6226154..5d11ed0 100644
--- a/test/uitests.sikuli/datafiles.py
+++ b/test/uitests.sikuli/datafiles.py
@@ -166,5 +166,5 @@ class TestData(object):
if not many:
TESTFILES = TESTFILES[:1]
- print TESTFILES
+ print(TESTFILES)
return (DATADIR, TESTFILES)
diff --git a/test/uitests.sikuli/lvc_steps.py b/test/uitests.sikuli/lvc_steps.py
index edb8a9a..5723b6a 100644
--- a/test/uitests.sikuli/lvc_steps.py
+++ b/test/uitests.sikuli/lvc_steps.py
@@ -21,7 +21,7 @@ def test_data(many=False, new=False):
if not many:
TESTFILES = TESTFILES[:1]
- print TESTFILES
+ print(TESTFILES)
return DATADIR, TESTFILES
@@ -38,7 +38,7 @@ def device_output(option):
@step('I browse for (?:a|several)( new)? file(s)?')
def browse_for_files(step, new, several): # file or files determines 1 or many
datadir, testfiles = test_data(several, new)
- print testfiles
+ print(testfiles)
world.lvc.browse_for_files(datadir, testfiles)
diff --git a/test/uitests.sikuli/test_android_conversions.py b/test/uitests.sikuli/test_android_conversions.py
index cb86066..b904374 100644
--- a/test/uitests.sikuli/test_android_conversions.py
+++ b/test/uitests.sikuli/test_android_conversions.py
@@ -32,7 +32,7 @@ def test_android_size_output_default():
def device_defaults(device_output, lvc):
- print device_output
+ print(device_output)
lvc.choose_device_conversion(device_output)
width = device.device_attr(device_output, 'width')
height = device.device_attr(device_output, 'height')
@@ -44,7 +44,7 @@ def device_defaults(device_output, lvc):
def convert_to_format(device_output):
"""Scenario: Test items are converted to the specified format.
"""
- print device_output
+ print(device_output)
lvc = MVCGui()
lvc.lvc_focus()
expected_failures = ['fake_video.mp4']
diff --git a/test/uitests.sikuli/test_apple_conversions.py b/test/uitests.sikuli/test_apple_conversions.py
index 4761a05..7b9bc3a 100644
--- a/test/uitests.sikuli/test_apple_conversions.py
+++ b/test/uitests.sikuli/test_apple_conversions.py
@@ -33,7 +33,7 @@ def test_apple_size_output_default():
def device_defaults(device_output, lvc):
- print device_output
+ print(device_output)
lvc.choose_device_conversion(device_output)
width = device.device_attr(device_output, 'width')
height = device.device_attr(device_output, 'height')
@@ -43,7 +43,7 @@ def device_defaults(device_output, lvc):
def convert_to_format(device_output):
- print device_output
+ print(device_output)
expected_failures = ['fake_video.mp4']
lvc = MVCGui()
lvc.lvc_focus()
diff --git a/test/uitests.sikuli/test_choose_files.py b/test/uitests.sikuli/test_choose_files.py
index 8140a60..1a93da0 100644
--- a/test/uitests.sikuli/test_choose_files.py
+++ b/test/uitests.sikuli/test_choose_files.py
@@ -22,7 +22,7 @@ class Test_Choose_Files(unittest.TestCase):
"""
self.lvc = MVCGui()
self.lvc.lvc_focus()
- print "starting test: ", self.shortDescription()
+ print("starting test: ", self.shortDescription())
self.output_dir = tempfile.mkdtemp()
self.lvc.choose_save_location(self.output_dir)
diff --git a/test/uitests.sikuli/test_clear_finished_conversions.py b/test/uitests.sikuli/test_clear_finished_conversions.py
index 9a0ff52..3962deb 100644
--- a/test/uitests.sikuli/test_clear_finished_conversions.py
+++ b/test/uitests.sikuli/test_clear_finished_conversions.py
@@ -26,7 +26,7 @@ class Test_Clear_Finished_Conversions(unittest.TestCase):
"""
self.lvc = MVCGui()
self.lvc.lvc_focus()
- print "starting test: ", self.shortDescription()
+ print("starting test: ", self.shortDescription())
datadir, testfiles = data.test_data()
self.lvc.browse_for_files(datadir, testfiles)
self.output_dir = tempfile.mkdtemp()
diff --git a/test/uitests.sikuli/test_conversions.py b/test/uitests.sikuli/test_conversions.py
index c186c62..449c6d5 100644
--- a/test/uitests.sikuli/test_conversions.py
+++ b/test/uitests.sikuli/test_conversions.py
@@ -26,7 +26,7 @@ class Test_Conversions(unittest.TestCase):
"""
self.lvc = MVCGui()
self.lvc.lvc_focus()
- print "starting test: ", self.shortDescription()
+ print("starting test: ", self.shortDescription())
datadir, testfiles = data.test_data(many=True)
self.lvc.browse_for_files(datadir, testfiles)
self.output_dir = tempfile.mkdtemp()
diff --git a/test/uitests.sikuli/test_other_conversions.py b/test/uitests.sikuli/test_other_conversions.py
index 9d866e5..f02be43 100644
--- a/test/uitests.sikuli/test_other_conversions.py
+++ b/test/uitests.sikuli/test_other_conversions.py
@@ -20,7 +20,7 @@ def test_other_conversions():
def convert_to_format(device_output):
- print device_output
+ print(device_output)
expected_failures = ['fake_video.mp4']
lvc = MVCGui()
lvc.lvc_focus()
diff --git a/test/uitests.sikuli/test_output_settings.py b/test/uitests.sikuli/test_output_settings.py
index 532cd4d..b44e5a0 100644
--- a/test/uitests.sikuli/test_output_settings.py
+++ b/test/uitests.sikuli/test_output_settings.py
@@ -24,7 +24,7 @@ class Test_Custom_Settings(unittest.TestCase):
"""
self.lvc = MVCGui()
self.lvc.lvc_focus()
- print "starting test: ", self.shortDescription()
+ print("starting test: ", self.shortDescription())
datadir, testfiles = data.test_data(many=True)
self.lvc.browse_for_files(datadir, testfiles)
self.output_dir = tempfile.mkdtemp()
diff --git a/test/uitests.sikuli/test_remove_files.py b/test/uitests.sikuli/test_remove_files.py
index 94bad9c..e3e4a06 100644
--- a/test/uitests.sikuli/test_remove_files.py
+++ b/test/uitests.sikuli/test_remove_files.py
@@ -22,7 +22,7 @@ class Test_Remove_Files(unittest.TestCase):
"""
lvc = MVCGui()
lvc.lvc_focus()
- print "starting test: ", self.shortDescription()
+ print("starting test: ", self.shortDescription())
datadir, testfiles = data.test_data()
lvc.browse_for_files(datadir, testfiles)