[pitivi] application: Use quote_uri to make things simpler and a bit more robust



commit 014151bff5ea283dab7d7e6e5806c648292aa6a6
Author: Jean-François Fortin Tam <nekohayo gmail com>
Date:   Sat Aug 24 16:10:52 2013 -0400

    application: Use quote_uri to make things simpler and a bit more robust

 pitivi/application.py |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/pitivi/application.py b/pitivi/application.py
index 584dfff..c8170ef 100644
--- a/pitivi/application.py
+++ b/pitivi/application.py
@@ -26,7 +26,6 @@ Main application
 """
 import os
 import sys
-import urllib
 from gi.repository import GES
 from gi.repository import Gio
 from gi.repository import GLib
@@ -46,6 +45,7 @@ from pitivi.project import ProjectManager, ProjectLogObserver
 from pitivi.undo.undo import UndoableActionLog, DebugActionLogObserver
 from pitivi.dialogs.startupwizard import StartUpWizard
 
+from pitivi.utils.misc import quote_uri
 from pitivi.utils.signal import Signallable
 from pitivi.utils.system import getSystem
 from pitivi.utils.loggable import Loggable
@@ -275,8 +275,7 @@ class InteractivePitivi(Pitivi):
         raise NotImplementedError()
 
     def _loadProject(self, project_filename):
-        project = "file://%s" % os.path.abspath(project_filename)
-        self.projectManager.loadProject(project)
+        self.projectManager.loadProject(quote_uri(os.path.abspath(project_filename)))
 
     def run(self):
         """Runs the main loop."""
@@ -333,7 +332,7 @@ class ProjectCreatorGuiPitivi(GuiPitivi):
         # load the passed filenames, optionally adding them to the timeline
         # (useful during development)
         self.projectManager.newBlankProject(False)
-        uris = ["file://" + urllib.quote(os.path.abspath(media_filename))
+        uris = [quote_uri(os.path.abspath(media_filename))
                 for media_filename in media_filenames]
         lib = self.current.medialibrary
         lib.connect("source-added", self._sourceAddedCb, uris, add_to_timeline)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]