[pitivi] Remove the file names from the header comment and add utf-8 spec

From: Alexandru Băluț <alexbalut src gnome org>
To: commits-list gnome org
Cc:
Subject: [pitivi] Remove the file names from the header comment and add utf-8 spec
Date: Tue, 31 May 2016 10:35:33 +0000 (UTC)
commit f1c12301aa69b8ea82526da6294e25b4a12563a5
Author: Jakub Brindza <jakub brindza gmail com>
Date:   Tue May 31 11:24:20 2016 +0200

    Remove the file names from the header comment and add utf-8 spec
    
    Also updated the ignored files list in pre-commit.hook and made some
    very small fixes required by pep8 to be able to commit.
    
    Differential Revision: https://phabricator.freedesktop.org/D1033

 bin/pitivi.in                         |    8 +-
 pitivi/application.py                 |    3 -
 pitivi/autoaligner.py                 |    4 +-
 pitivi/check.py                       |    3 -
 pitivi/clipproperties.py              |    4 +-
 pitivi/configure.py.in                |    4 +-
 pitivi/dialogs/clipmediaprops.py      |    4 +-
 pitivi/dialogs/depsmanager.py         |    3 -
 pitivi/dialogs/filelisterrordialog.py |    4 +-
 pitivi/dialogs/prefs.py               |    4 +-
 pitivi/dialogs/startupwizard.py       |    4 +-
 pitivi/effects.py                     |    4 +-
 pitivi/mainwindow.py                  |    3 -
 pitivi/mediafilespreviewer.py         |    3 -
 pitivi/medialibrary.py                |    3 -
 pitivi/preset.py                      |    4 +-
 pitivi/project.py                     |    4 +-
 pitivi/render.py                      |    3 -
 pitivi/settings.py                    |    4 +-
 pitivi/tabsmanager.py                 |    4 +-
 pitivi/timeline/elements.py           |    5 +-
 pitivi/timeline/layer.py              |    5 +-
 pitivi/timeline/previewers.py         |    3 -
 pitivi/timeline/ruler.py              |    3 -
 pitivi/timeline/timeline.py           |    3 -
 pitivi/titleeditor.py                 |    4 +-
 pitivi/transitions.py                 |    3 -
 pitivi/undo/project.py                |    4 +-
 pitivi/undo/timeline.py               |    4 +-
 pitivi/undo/undo.py                   |    4 +-
 pitivi/utils/extract.py               |    4 +-
 pitivi/utils/loggable.py              |   37 ++++-----
 pitivi/utils/misc.py                  |    4 +-
 pitivi/utils/proxy.py                 |    4 +-
 pitivi/utils/ripple_update_group.py   |    4 +-
 pitivi/utils/system.py                |    4 +-
 pitivi/utils/threads.py               |    4 +-
 pitivi/utils/timeline.py              |    4 +-
 pitivi/utils/ui.py                    |    3 -
 pitivi/utils/validate.py              |    4 +-
 pitivi/utils/widgets.py               |    3 -
 pitivi/viewer/move_scale_overlay.py   |    3 -
 pitivi/viewer/overlay.py              |    3 -
 pitivi/viewer/overlay_stack.py        |    5 +-
 pitivi/viewer/title_overlay.py        |    3 -
 pitivi/viewer/viewer.py               |    4 +-
 pre-commit.hook                       |  143 +++++++++++++++++----------------
 tests/common.py                       |    4 +-
 tests/test_application.py             |    3 -
 tests/test_check.py                   |    3 -
 tests/test_clipproperties.py          |    2 +-
 tests/test_common.py                  |    4 +-
 tests/test_mainwindow.py              |    2 +-
 tests/test_media_library.py           |    2 +-
 tests/test_misc.py                    |    2 +-
 tests/test_pipeline.py                |    2 +-
 tests/test_prefs.py                   |    2 +-
 tests/test_preset.py                  |    3 -
 tests/test_previewers.py              |    2 +-
 tests/test_project.py                 |    3 +-
 tests/test_system.py                  |    3 -
 tests/test_timeline_elements.py       |    3 -
 tests/test_timeline_layer.py          |    2 +-
 tests/test_timeline_timeline.py       |    2 +-
 tests/test_undo.py                    |    4 +-
 tests/test_undo_project.py            |    5 +-
 tests/test_undo_timeline.py           |    4 +-
 tests/test_utils.py                   |    5 +-
 tests/test_utils_timeline.py          |    2 +-
 tests/test_widgets.py                 |    2 +-
 win32/configure.py                    |    6 +-
 win32/pitivi                          |   13 ++-
 72 files changed, 155 insertions(+), 281 deletions(-)
---
diff --git a/bin/pitivi.in b/bin/pitivi.in
index 8484c25..4be01a9 100644
--- a/bin/pitivi.in
+++ b/bin/pitivi.in
@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
@@ -76,7 +74,7 @@ def _add_pitivi_path():
         root = os.path.join(LIBDIR, 'pitivi', 'python')
         localedir = os.path.join(DATADIR, "locale")
 
-    if not root in sys.path:
+    if root not in sys.path:
         sys.path.append(root)
 
     # prepend any directories found at configure time if they're not
@@ -122,12 +120,14 @@ def _initialize_modules():
         print("Failed to initialize modules")
         raise
 
+
 def _check_requirements():
     from pitivi.check import check_requirements
 
     if not check_requirements():
         sys.exit(2)
 
+
 def _run_pitivi():
     from pitivi import application
 
diff --git a/pitivi/application.py b/pitivi/application.py
index 915df95..b7d2463 100644
--- a/pitivi/application.py
+++ b/pitivi/application.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/application.py
-#
 # Copyright (c) 2005-2009 Edward Hervey <bilboed bilboed com>
 # Copyright (c) 2008-2009 Alessandro Decina <alessandro d gmail com>
 # Copyright (c) 2014 Alexandru Băluț<alexandru balut gmail com>
diff --git a/pitivi/autoaligner.py b/pitivi/autoaligner.py
index 6973da9..d380f5d 100644
--- a/pitivi/autoaligner.py
+++ b/pitivi/autoaligner.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/autoaligner.py
-#
 # Copyright (c) 2011, Benjamin M. Schwartz <bens alum mit edu>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/check.py b/pitivi/check.py
index ba97e12..8f378ed 100644
--- a/pitivi/check.py
+++ b/pitivi/check.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/check.py
-#
 # Copyright (c) 2014, Mathieu Duponchelle <mduponchelle1 gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/clipproperties.py b/pitivi/clipproperties.py
index 5d57750..8982294 100644
--- a/pitivi/clipproperties.py
+++ b/pitivi/clipproperties.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/clipproperties.py
-#
 # Copyright (C) 2010 Thibault Saunier <tsaunier gnome org>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/configure.py.in b/pitivi/configure.py.in
index c987e8e..33720f6 100644
--- a/pitivi/configure.py.in
+++ b/pitivi/configure.py.in
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/configure.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/dialogs/clipmediaprops.py b/pitivi/dialogs/clipmediaprops.py
index 6035d0a..9c4869f 100644
--- a/pitivi/dialogs/clipmediaprops.py
+++ b/pitivi/dialogs/clipmediaprops.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/dialogs/clipmediaprops.py
-#
 # Copyright (c) 2011, Parthasarathi Susarla <partha collabora co uk>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/dialogs/depsmanager.py b/pitivi/dialogs/depsmanager.py
index dcee257..1a49442 100644
--- a/pitivi/dialogs/depsmanager.py
+++ b/pitivi/dialogs/depsmanager.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/dialogs/depsmanager.py
-#
 # Copyright (c) 2011 Jean-François Fortin Tam <nekohayo gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/dialogs/filelisterrordialog.py b/pitivi/dialogs/filelisterrordialog.py
index 9801571..d8e8185 100644
--- a/pitivi/dialogs/filelisterrordialog.py
+++ b/pitivi/dialogs/filelisterrordialog.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/dialogs/filelisterrordialog.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/dialogs/prefs.py b/pitivi/dialogs/prefs.py
index 0747d33..4901789 100644
--- a/pitivi/dialogs/prefs.py
+++ b/pitivi/dialogs/prefs.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/dialogs/prefs.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/dialogs/startupwizard.py b/pitivi/dialogs/startupwizard.py
index 1647341..c2fc9df 100644
--- a/pitivi/dialogs/startupwizard.py
+++ b/pitivi/dialogs/startupwizard.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/dialogs/startupwizard.py
-#
 # Copyright (c) 2010 Mathieu Duponchelle <seeed laposte net>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/effects.py b/pitivi/effects.py
index b3239bb..71e8bd8 100644
--- a/pitivi/effects.py
+++ b/pitivi/effects.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/effects.py
-#
 # Copyright (c) 2010, Thibault Saunier <tsaunier gnome org>
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
diff --git a/pitivi/mainwindow.py b/pitivi/mainwindow.py
index 098029e..c4b3885 100644
--- a/pitivi/mainwindow.py
+++ b/pitivi/mainwindow.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/mainwindow.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/mediafilespreviewer.py b/pitivi/mediafilespreviewer.py
index 9f56f8e..ad37163 100644
--- a/pitivi/mediafilespreviewer.py
+++ b/pitivi/mediafilespreviewer.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/mediafilespreviewer.py
-#
 # Copyright (c) 2011, Pier Carteri <pier carteri gmail com>
 # Copyright (c) 2012, Thibault Saunier <tsaunier gnome org>
 #
diff --git a/pitivi/medialibrary.py b/pitivi/medialibrary.py
index c969ca0..86e0cee 100644
--- a/pitivi/medialibrary.py
+++ b/pitivi/medialibrary.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/medialibrary.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 # Copyright (c) 2009, Alessandro Decina <alessandro d gmail com>
 # Copyright (c) 2012, Jean-François Fortin Tam <nekohayo gmail com>
diff --git a/pitivi/preset.py b/pitivi/preset.py
index b183bbb..9114bff 100644
--- a/pitivi/preset.py
+++ b/pitivi/preset.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/preset.py
-#
 # Copyright (c) 2010, Brandon Lewis <brandon_lewis berkeley edu>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/project.py b/pitivi/project.py
index cb8e31c..a397d74 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/project.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 # Copyright (c) 2013, 2014, 2015, Thibault Saunier <tsaunier gnome org>
 #
diff --git a/pitivi/render.py b/pitivi/render.py
index ef4cd03..f8789da 100644
--- a/pitivi/render.py
+++ b/pitivi/render.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/render.py
-#
 # Copyright (c) 2009, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/settings.py b/pitivi/settings.py
index 1ed9354..171cd2b 100644
--- a/pitivi/settings.py
+++ b/pitivi/settings.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/settings.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/tabsmanager.py b/pitivi/tabsmanager.py
index 6ad5136..8000f94 100644
--- a/pitivi/tabsmanager.py
+++ b/pitivi/tabsmanager.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/tabsmanager.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/timeline/elements.py b/pitivi/timeline/elements.py
index 52c6554..1b55d6c 100644
--- a/pitivi/timeline/elements.py
+++ b/pitivi/timeline/elements.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/timeline/elements.py
-#
 # Copyright (c) 2013, Mathieu Duponchelle <mduponchelle1 gmail com>
 # Copyright (c) 2016, Thibault Saunier <tsaunier gnome org>
 #
@@ -515,7 +512,7 @@ class TimelineElement(Gtk.Layout, timelineUtils.Zoomable, Loggable):
         self.__removeKeyframes()
         self.keyframe_curve = KeyframeCurve(self.timeline, binding)
         self.keyframe_curve.connect("plot-changed",
-                                     self.__keyframePlotChangedCb)
+                                    self.__keyframePlotChangedCb)
         self.keyframe_curve.connect("enter", self.__curveEnterCb)
         self.keyframe_curve.connect("leave", self.__curveLeaveCb)
         self.add(self.keyframe_curve)
diff --git a/pitivi/timeline/layer.py b/pitivi/timeline/layer.py
index 5ca1a88..0e501ef 100644
--- a/pitivi/timeline/layer.py
+++ b/pitivi/timeline/layer.py
@@ -1,8 +1,5 @@
-# -- coding: utf-8 --
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/timeline/layer.py
-#
 # Copyright (c) 2012, Paul Lange <palango gmx de>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/timeline/previewers.py b/pitivi/timeline/previewers.py
index 76f6f59..c574a0f 100644
--- a/pitivi/timeline/previewers.py
+++ b/pitivi/timeline/previewers.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/timeline/previewers.py
-#
 # Copyright (c) 2013, Daniel Thul <daniel thul gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/timeline/ruler.py b/pitivi/timeline/ruler.py
index 7f3cb2b..9ccac12 100644
--- a/pitivi/timeline/ruler.py
+++ b/pitivi/timeline/ruler.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/timeline/ruler.py
-#
 # Copyright (c) 2006, Edward Hervey <bilboed bilboed com>
 # Copyright (c) 2014, Alex Băluț <alexandru balut gmail com>
 #
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 7378067..2d1d2bd 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/timeline/timeline.py
-#
 # Copyright (c) 2013, Mathieu Duponchelle <mduponchelle1 gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/titleeditor.py b/pitivi/titleeditor.py
index 07f1ffb..50378ee 100644
--- a/pitivi/titleeditor.py
+++ b/pitivi/titleeditor.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/titleeditor.py
-#
 # Copyright (c) 2012, Matas Brazdeikis <matas brazdeikis lt>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/transitions.py b/pitivi/transitions.py
index 79f0920..8a2f4c3 100644
--- a/pitivi/transitions.py
+++ b/pitivi/transitions.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/transitions.py
-#
 # Copyright (c) 2012, Jean-François Fortin Tam <nekohayo gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/undo/project.py b/pitivi/undo/project.py
index aa2f56e..e946c5e 100644
--- a/pitivi/undo/project.py
+++ b/pitivi/undo/project.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/undo/project.py
-#
 # Copyright (c) 2012, Thibault Saunier <tsaunier gnome org>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/undo/timeline.py b/pitivi/undo/timeline.py
index c39f973..b9cbeda 100644
--- a/pitivi/undo/timeline.py
+++ b/pitivi/undo/timeline.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/undo/timeline.py
-#
 # Copyright (c) 2009, Alessandro Decina <alessandro d gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/undo/undo.py b/pitivi/undo/undo.py
index ad35435..27bedb0 100644
--- a/pitivi/undo/undo.py
+++ b/pitivi/undo/undo.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/undo/undo.py
-#
 # Copyright (c) 2009, Alessandro Decina <alessandro d gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/utils/extract.py b/pitivi/utils/extract.py
index a25e558..310b599 100644
--- a/pitivi/utils/extract.py
+++ b/pitivi/utils/extract.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/utils/extract.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 # Copyright (c) 2011, Benjamin M. Schwartz <bens alum mit edu>
 #
diff --git a/pitivi/utils/loggable.py b/pitivi/utils/loggable.py
index 3a4d57f..fd257a3 100644
--- a/pitivi/utils/loggable.py
+++ b/pitivi/utils/loggable.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/utils/loggable.py
-#
 # Copyright (c) 2009, Alessandro Decina <alessandro decina collabora co uk>
 #
 # This program is free software; you can redistribute it and/or
@@ -648,23 +646,24 @@ def logLevelName(level):
 
 
 def _preformatLevels(enableColorOutput):
-
-    if enableColorOutput:
-        t = TerminalController()
-
-        if type(t.BOLD) == bytes:
-            formatter = lambda level: ''.join(
-                (t.BOLD.decode(), getattr(t, COLORS[level]).decode(),
-                 logLevelName(level), t.NORMAL.decode()))
-        else:
-            formatter = lambda level: ''.join(
-                (t.BOLD, getattr(t, COLORS[level]),
-                 logLevelName(level), t.NORMAL))
-    else:
-        formatter = lambda level: logLevelName(level)
-
+    terminal_controller = TerminalController()
     for level in ERROR, WARN, FIXME, INFO, DEBUG, LOG:
-        _FORMATTED_LEVELS.append(formatter(level))
+        if enableColorOutput:
+            if type(terminal_controller.BOLD) == bytes:
+                formatter = ''.join(
+                    (terminal_controller.BOLD.decode(),
+                     getattr(terminal_controller, COLORS[level]).decode(),
+                     logLevelName(level),
+                     terminal_controller.NORMAL.decode()))
+            else:
+                formatter = ''.join(
+                    (terminal_controller.BOLD,
+                     getattr(terminal_controller, COLORS[level]),
+                     logLevelName(level),
+                     terminal_controller.NORMAL))
+        else:
+            formatter = logLevelName(level)
+        _FORMATTED_LEVELS.append(formatter)
 
 # "public" useful API
 
diff --git a/pitivi/utils/misc.py b/pitivi/utils/misc.py
index e637285..87d082e 100644
--- a/pitivi/utils/misc.py
+++ b/pitivi/utils/misc.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/utils/misc.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 # Copyright (c) 2009, Alessandro Decina <alessandro d gmail com>
 #
diff --git a/pitivi/utils/proxy.py b/pitivi/utils/proxy.py
index 941433d..b4e0eaa 100644
--- a/pitivi/utils/proxy.py
+++ b/pitivi/utils/proxy.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/proxying.py
-#
 # Copyright (c) 2015, Thibault Saunier <tsaunier gnome org>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/utils/ripple_update_group.py b/pitivi/utils/ripple_update_group.py
index a2fe821..7865b03 100644
--- a/pitivi/utils/ripple_update_group.py
+++ b/pitivi/utils/ripple_update_group.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/utils/ripple_update_group.py
-#
 # Copyright (c) 2010, Brandon Lewis <brandon lewis collabora co uk>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/utils/system.py b/pitivi/utils/system.py
index 64c1932..83e7fbe 100644
--- a/pitivi/utils/system.py
+++ b/pitivi/utils/system.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/utils/system.py
-#
 # Copyright (c) 2010, Stephen Griffiths <scgmk5 gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/utils/threads.py b/pitivi/utils/threads.py
index 69df09f..2558c2e 100644
--- a/pitivi/utils/threads.py
+++ b/pitivi/utils/threads.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       threads.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/utils/timeline.py b/pitivi/utils/timeline.py
index 9f02c76..f39a3c2 100644
--- a/pitivi/utils/timeline.py
+++ b/pitivi/utils/timeline.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/utils/timeline.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 # Copyright (c) 2009, Alessandro Decina <alessandro decina collabora co uk>
 #
diff --git a/pitivi/utils/ui.py b/pitivi/utils/ui.py
index 0bede77..65b7ab5 100644
--- a/pitivi/utils/ui.py
+++ b/pitivi/utils/ui.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/utils/ui.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 # Copyright (c) 2012, Thibault Saunier <thibault saunier collabora com>
 #
diff --git a/pitivi/utils/validate.py b/pitivi/utils/validate.py
index 83a5464..0ab9e87 100644
--- a/pitivi/utils/validate.py
+++ b/pitivi/utils/validate.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/utils/validate.py
-#
 # Copyright (c) 2014, Thibault Saunier <thibault saunier collabora com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/utils/widgets.py b/pitivi/utils/widgets.py
index f30a393..298be69 100644
--- a/pitivi/utils/widgets.py
+++ b/pitivi/utils/widgets.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/utils/widgets.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/viewer/move_scale_overlay.py b/pitivi/viewer/move_scale_overlay.py
index a953053..59d332b 100644
--- a/pitivi/viewer/move_scale_overlay.py
+++ b/pitivi/viewer/move_scale_overlay.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/viewer/move_scale_overlay.py
-#
 # Copyright (c) 2016, Lubosz Sarnecki <lubosz sarnecki collabora co uk>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/viewer/overlay.py b/pitivi/viewer/overlay.py
index e481677..f6c04c8 100644
--- a/pitivi/viewer/overlay.py
+++ b/pitivi/viewer/overlay.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/viewer/overlay.py
-#
 # Copyright (c) 2016, Lubosz Sarnecki <lubosz sarnecki collabora co uk>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/viewer/overlay_stack.py b/pitivi/viewer/overlay_stack.py
index 5b48270..6880416 100644
--- a/pitivi/viewer/overlay_stack.py
+++ b/pitivi/viewer/overlay_stack.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/viewer/overlay_stack.py
-#
 # Copyright (c) 2016, Lubosz Sarnecki <lubosz sarnecki collabora co uk>
 #
 # This program is free software; you can redistribute it and/or
@@ -143,7 +140,7 @@ class OverlayStack(Gtk.Overlay, Loggable):
         try:
             cursor = Gdk.Cursor.new_from_name(display, name)
         except TypeError:
-            self.warning ("Cursor '%s' not found.", name)
+            self.warning("Cursor '%s' not found.", name)
         self.app.gui.get_window().set_cursor(cursor)
 
     def reset_cursor(self):
diff --git a/pitivi/viewer/title_overlay.py b/pitivi/viewer/title_overlay.py
index adb069f..ffbbbce 100644
--- a/pitivi/viewer/title_overlay.py
+++ b/pitivi/viewer/title_overlay.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/viewer/title_overlay.py
-#
 # Copyright (c) 2016, Lubosz Sarnecki <lubosz sarnecki collabora co uk>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pitivi/viewer/viewer.py b/pitivi/viewer/viewer.py
index b57a234..0892f24 100644
--- a/pitivi/viewer/viewer.py
+++ b/pitivi/viewer/viewer.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi/viewer/viewer.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/pre-commit.hook b/pre-commit.hook
index bc49404..afcf34d 100755
--- a/pre-commit.hook
+++ b/pre-commit.hook
@@ -2,73 +2,79 @@
 
 RCFILE=$(git rev-parse --show-toplevel)/docs/pylint.rc
 
-IGNORED_FILES=" \
-tests/test_check.py \
-tests/test_system.py \
-tests/test_timeline_layer.py \
-tests/runtests.py \
-tests/test_utils_timeline.py \
-tests/test_prefs.py \
-mests/test_undo.py \
-tests/test_utils.py \
-tests/test_project.py \
-tests/test_clipproperties.py \
-tests/test_preset.py \
-tests/test_previewers.py \
-tests/test_undo_timeline.py \
-tests/validate-tests/pitivi.py \
-tests/validate-tests/pitivivalidate.py \
-tests/test_media_library.py \
-tests/test_misc.py \
-tests/test_widgets.py \
-tests/test_common.py \
-tests/common.py \
-tests/test_timeline_elements.py \
-tests/test_timeline_timeline.py \
-tests/test_pipeline.py \
-tests/test_application.py \
-tests/test_log.py \
-pitivi/titleeditor.py \
-pitivi/settings.py \
-pitivi/project.py \
-pitivi/check.py \
-pitivi/medialibrary.py \
-pitivi/preset.py \
-pitivi/configure.py \
-pitivi/utils/validate.py \
-pitivi/utils/loggable.py \
-pitivi/utils/widgets.py \
-pitivi/utils/proxy.py \
-pitivi/utils/system.py \
-pitivi/utils/timeline.py \
-pitivi/utils/threads.py \
-pitivi/utils/pipeline.py \
-pitivi/utils/extract.py \
-pitivi/utils/misc.py \
-pitivi/utils/ripple_update_group.py \
-pitivi/utils/ui.py \
-pitivi/dialogs/startupwizard.py \
-pitivi/dialogs/clipmediaprops.py \
-pitivi/dialogs/prefs.py \
-pitivi/dialogs/depsmanager.py \
-pitivi/dialogs/filelisterrordialog.py \
-pitivi/transitions.py \
-pitivi/application.py \
-pitivi/effects.py \
-pitivi/viewer/viewer.py \
-pitivi/clipproperties.py \
-pitivi/timeline/timeline.py \
-pitivi/timeline/layer.py \
-pitivi/timeline/ruler.py \
-pitivi/timeline/elements.py \
-pitivi/autoaligner.py \
-pitivi/mainwindow.py \
-pitivi/mediafilespreviewer.py \
-pitivi/undo/undo.py \
-pitivi/undo/timeline.py \
-pitivi/render.py \
-pitivi/viewer/move_scale_overlay.py \
-pitivi/viewer/overlay_stack.py \
+IGNORED_FILES="
+bin/pitivi.in
+pitivi/application.py
+pitivi/autoaligner.py
+pitivi/check.py
+pitivi/clipproperties.py
+pitivi/configure.py
+pitivi/dialogs/clipmediaprops.py
+pitivi/dialogs/depsmanager.py
+pitivi/dialogs/filelisterrordialog.py
+pitivi/dialogs/prefs.py
+pitivi/dialogs/startupwizard.py
+pitivi/effects.py
+pitivi/mainwindow.py
+pitivi/mediafilespreviewer.py
+pitivi/medialibrary.py
+pitivi/preset.py
+pitivi/project.py
+pitivi/render.py
+pitivi/settings.py
+pitivi/timeline/elements.py
+pitivi/timeline/layer.py
+pitivi/timeline/ruler.py
+pitivi/timeline/timeline.py
+pitivi/titleeditor.py
+pitivi/transitions.py
+pitivi/undo/project.py
+pitivi/undo/timeline.py
+pitivi/undo/undo.py
+pitivi/utils/extract.py
+pitivi/utils/loggable.py
+pitivi/utils/misc.py
+pitivi/utils/pipeline.py
+pitivi/utils/proxy.py
+pitivi/utils/ripple_update_group.py
+pitivi/utils/system.py
+pitivi/utils/threads.py
+pitivi/utils/timeline.py
+pitivi/utils/ui.py
+pitivi/utils/validate.py
+pitivi/utils/widgets.py
+pitivi/viewer/move_scale_overlay.py
+pitivi/viewer/overlay_stack.py
+pitivi/viewer/title_overlay.py
+pitivi/viewer/viewer.py
+tests/common.py
+tests/runtests.py
+tests/test_application.py
+tests/test_check.py
+tests/test_clipproperties.py
+tests/test_common.py
+tests/test_log.py
+tests/test_media_library.py
+tests/test_misc.py
+tests/test_pipeline.py
+tests/test_prefs.py
+tests/test_preset.py
+tests/test_previewers.py
+tests/test_project.py
+tests/test_system.py
+tests/test_timeline_elements.py
+tests/test_timeline_layer.py
+tests/test_timeline_timeline.py
+tests/test_undo.py
+tests/test_undo_project.py
+tests/test_undo_timeline.py
+tests/test_utils.py
+tests/test_utils_timeline.py
+tests/test_widgets.py
+tests/validate-tests/pitivi.py
+tests/validate-tests/pitivivalidate.py
+win32/configure.py
+win32/pitivi
 "
 
 git-pylint-commit-hook --help |grep ignore > /dev/null 2>&1
@@ -81,7 +87,8 @@ elif [ -z $PYLINT ]; then
   for f in $IGNORED_FILES; do
     IGNORE_ARGS="$IGNORE_ARGS --ignore=$f"
   done
-  echo "Pylint ignoring files:$IGNORED_FILES"
+  echo "Pylint ignoring files:$IGNORED_FILES" | tr "\n" " "
+  echo
 fi
 
 export PYTHONPATH=$(git rev-parse --show-toplevel)/pitivi/coptimizations/.libs:$PYTHONPATH
diff --git a/tests/common.py b/tests/common.py
index 12d13a4..167b36a 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2015, Thibault Saunier <tsaunier gnome org>
 #
 # This program is free software; you can redistribute it and/or
@@ -196,6 +196,7 @@ class TestCase(unittest.TestCase, Loggable):
                          expect_selected)
         self.assertEqual(ges_clip.selected.selected, expect_selected)
 
+
 @contextlib.contextmanager
 def created_project_file(asset_uri="file:///icantpossiblyexist.png"):
     """
@@ -243,6 +244,7 @@ def clean_proxy_samples():
             f = os.path.join(_dir, f)
             os.remove(f)
 
+
 def create_test_clip(clip_type):
     clip = clip_type()
     clip.selected = Selected()
diff --git a/tests/test_application.py b/tests/test_application.py
index 81bb592..4e750d5 100644
--- a/tests/test_application.py
+++ b/tests/test_application.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       tests/test_application.py
-#
 # Copyright (c) 2014, Alex Băluț <alexandru balut gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_check.py b/tests/test_check.py
index 293bcee..cdc1185 100644
--- a/tests/test_check.py
+++ b/tests/test_check.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       tests/test_check.py
-#
 # Copyright (c) 2014, Alex Băluț <alexandru balut gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_clipproperties.py b/tests/test_clipproperties.py
index 7340605..2a8f189 100644
--- a/tests/test_clipproperties.py
+++ b/tests/test_clipproperties.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2014, Alex Băluț <alexandru balut gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_common.py b/tests/test_common.py
index 0c6a730..7b01e52 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       tests/test_common.py
-#
 # Copyright (c) 2011 Google <aleb google com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_mainwindow.py b/tests/test_mainwindow.py
index e2e8b6e..413f8a0 100644
--- a/tests/test_mainwindow.py
+++ b/tests/test_mainwindow.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2013, Alex Băluț <alexandru balut gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_media_library.py b/tests/test_media_library.py
index fcdd3c6..27745d1 100644
--- a/tests/test_media_library.py
+++ b/tests/test_media_library.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2015, Thibault Saunier <tsaunier gnome org>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 11ef580..4229e58 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2013, Alex Băluț <alexandru balut gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_pipeline.py b/tests/test_pipeline.py
index 71dbc4f..9ac8767 100644
--- a/tests/test_pipeline.py
+++ b/tests/test_pipeline.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2016, Thibault Saunier <tsaunier gnome org>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_prefs.py b/tests/test_prefs.py
index 1e44146..8cb036d 100644
--- a/tests/test_prefs.py
+++ b/tests/test_prefs.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2009, Brandon Lewis <brandon_lewis berkeley edu>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_preset.py b/tests/test_preset.py
index c47aa33..3ecdc14 100644
--- a/tests/test_preset.py
+++ b/tests/test_preset.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       tests/test_preset.py
-#
 # Copyright (c) 2011, Alex Băluț <alexandru balut gmail com>
 # Copyright (c) 2011, Jean-François Fortin Tam <nekohayo gmail com>
 #
diff --git a/tests/test_previewers.py b/tests/test_previewers.py
index 1173048..d434741 100644
--- a/tests/test_previewers.py
+++ b/tests/test_previewers.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2015, Thibault Saunier <tsaunier gnome org>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_project.py b/tests/test_project.py
index a6b3ffa..ee491a8 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2009, Alessandro Decina <alessandro d gmail com>
 # Copyright (c) 2013, Alex Băluț <alexandru balut gmail com>
 #
@@ -335,7 +335,6 @@ class TestProjectLoading(common.TestCase):
 
         proxy_manager.connect("proxy-ready", proxy_ready_cb)
 
-
         uris = [common.get_sample_uri("tears_of_steel.webm")]
         project.addUris(uris)
 
diff --git a/tests/test_system.py b/tests/test_system.py
index 3d07e8c..a8e95d8 100644
--- a/tests/test_system.py
+++ b/tests/test_system.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       tests/test_system.py
-#
 # Copyright (c) 2012, Jean-François Fortin Tam <nekohayo gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_timeline_elements.py b/tests/test_timeline_elements.py
index 079a87a..fa82c5b 100644
--- a/tests/test_timeline_elements.py
+++ b/tests/test_timeline_elements.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       tests/test_timeline_elements.py
-#
 # Copyright (c) 2016, Jakub Brindza <jakub brindza gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_timeline_layer.py b/tests/test_timeline_layer.py
index db728d0..e732aeb 100644
--- a/tests/test_timeline_layer.py
+++ b/tests/test_timeline_layer.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2015, Alex Băluț <alexandru balut gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_timeline_timeline.py b/tests/test_timeline_timeline.py
index c6f1661..c44d81e 100644
--- a/tests/test_timeline_timeline.py
+++ b/tests/test_timeline_timeline.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2015, Alex Băluț <alexandru balut gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_undo.py b/tests/test_undo.py
index 33ba6ee..f189fd8 100644
--- a/tests/test_undo.py
+++ b/tests/test_undo.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       tests/test_undo.py
-#
 # Copyright (c) 2009, Alessandro Decina <alessandro d gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_undo_project.py b/tests/test_undo_project.py
index 02a04cf..480d5db 100644
--- a/tests/test_undo_project.py
+++ b/tests/test_undo_project.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
-#
-#       tests/test_undo_project.py
-#
+# Pitivi video editor
 # Copyright (c) 2016, Alex Băluț <alexandru balut gmail com>
 #
 # This program is free software; you can redistribute it and/or
@@ -83,7 +81,6 @@ class TestProjectUndo(TestCase):
             self.assertEqual(self.project.author, author)
             self.assertEqual(self.project.year, year)
 
-
         dialog.title_entry.set_text("t1")
         dialog.author_entry.set_text("a1")
         dialog.year_spinbutton.set_value(2001)
diff --git a/tests/test_undo_timeline.py b/tests/test_undo_timeline.py
index 3b3c167..0e8a2e0 100644
--- a/tests/test_undo_timeline.py
+++ b/tests/test_undo_timeline.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
-#
-#       tests/test_undo_timeline.py
-#
+# Pitivi video editor
 # Copyright (c) 2009, Alessandro Decina <alessandro d gmail com>
 # Copyright (c) 2014, Alex Băluț <alexandru balut gmail com>
 #
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 0cc0384..4e638c7 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,8 +1,5 @@
-#!/usr/bin/python3
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       test_utils.py
-#
 # Copyright (c) 2009, Alessandro Decina <alessandro decina collabora co uk>
 # Copyright (c) 2014, Mathieu Duponchelle <mduponchelle1 gmail com>
 #
diff --git a/tests/test_utils_timeline.py b/tests/test_utils_timeline.py
index 93caf11..15fc920 100644
--- a/tests/test_utils_timeline.py
+++ b/tests/test_utils_timeline.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2013, Alex Băluț <alexandru balut gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/tests/test_widgets.py b/tests/test_widgets.py
index e608f65..af88897 100644
--- a/tests/test_widgets.py
+++ b/tests/test_widgets.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-#
+# Pitivi video editor
 # Copyright (c) 2013, Alex Băluț <alexandru balut gmail com>
 #
 # This program is free software; you can redistribute it and/or
diff --git a/win32/configure.py b/win32/configure.py
index 7ff6359..b65d283 100644
--- a/win32/configure.py
+++ b/win32/configure.py
@@ -1,7 +1,5 @@
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       configure.py
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
@@ -53,7 +51,7 @@ def get_pixmap_dir():
         root = _dir
     else:
         root = PKGDATADIR
-    print (os.path.join(root, 'pixmaps'))
+    print(os.path.join(root, 'pixmaps'))
     return os.path.join(root, 'pixmaps')
 
 
diff --git a/win32/pitivi b/win32/pitivi
index b641413..45ca0e6 100644
--- a/win32/pitivi
+++ b/win32/pitivi
@@ -1,8 +1,6 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 # Pitivi video editor
-#
-#       pitivi
-#
 # Copyright (c) 2005, Edward Hervey <bilboed bilboed com>
 #
 # This program is free software; you can redistribute it and/or
@@ -34,15 +32,18 @@ localedir = ""
 # Add the path of pitivi stuff
 # TODO : change it when it's finally in cvs
 
+
 def _get_root_dir():
     return '/'.join(os.path.dirname(os.path.abspath(os.getcwd())).split('/')[:-1])
 
+
 def _in_devel():
     rd = _get_root_dir()
     return (os.path.exists(os.path.join(rd, '.svn')) or
             os.path.exists(os.path.join(rd, 'CVS')) or
             os.path.exists(os.path.join(rd, '.git')))
 
+
 def _add_pitivi_path():
     global localedir
     dir = os.path.dirname(os.path.abspath(os.getcwd()))
@@ -54,7 +55,7 @@ def _add_pitivi_path():
         root = os.path.join(LIBDIR, 'pitivi', 'python')
         localedir = os.path.join('../share/locale')
 
-    if not root in sys.path:
+    if root not in sys.path:
         sys.path.insert(0, root)
 
     # prepend any directories found at configure time if they're not
@@ -73,7 +74,8 @@ def _add_pitivi_path():
         gettext.bindtextdomain('pitivi', localedir)
         gettext.textdomain('pitivi')
     except:
-        print "Couldn't set locale !, reverting to C locale"
+        print("Couldn't set locale !, reverting to C locale")
+
 
 def _init_gobject_gtk_gst():
     global localedir
@@ -98,6 +100,7 @@ def _init_gobject_gtk_gst():
     except ImportError:
         raise SystemExit("Gst-Python couldn't be found!")
 
+
 def _run_pitivi():
     import pitivi.application as ptv
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]