pep8

3 files changed, 34 insertions, 18 deletions

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/"