[pitivi/ges: 56/287] Misc minor fixes after GES port

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit cfadae356cb966fa274c9f180124fc6532d50f47
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Wed Oct 5 18:49:02 2011 -0300

    Misc minor fixes after GES port

 pitivi/application.py |    2 +-
 pitivi/encode.py      |    2 ++
 pitivi/project.py     |   11 +++++------
 3 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/pitivi/application.py b/pitivi/application.py
index cba9a4b..e45abe4 100644
--- a/pitivi/application.py
+++ b/pitivi/application.py
@@ -26,13 +26,13 @@ Main application
 """
 import gobject
 import gtk
-from optparse import OptionParser
 import os
 import sys
 import urllib
 import ges
 
 from gettext import gettext as _
+from optparse import OptionParser
 
 import pitivi.instance as instance
 
diff --git a/pitivi/encode.py b/pitivi/encode.py
index b36ca0f..06f7eec 100644
--- a/pitivi/encode.py
+++ b/pitivi/encode.py
@@ -24,6 +24,7 @@ Encoding-related utilities and classes
 """
 
 import gst
+
 import pitivi.log.log as log
 
 
@@ -51,6 +52,7 @@ def get_compatible_sink_pad(factoryname, caps):
     return None
 
 
+#FIME GES port make it obselete, handle it properly again
 def get_compatible_sink_caps(factoryname, caps):
     """
     Returns the compatible caps between 'caps' and the sink pad caps of 'factoryname'
diff --git a/pitivi/project.py b/pitivi/project.py
index 59dec87..d21c7cb 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -23,13 +23,14 @@
 Project class
 """
 
+import gst
+import ges
+
 from pitivi.log.loggable import Loggable
 from pitivi.sourcelist import SourceList
 from pitivi.settings import ExportSettings
 from pitivi.signalinterface import Signallable
 from pitivi.utils import Seeker
-import gst
-import ges
 
 
 class ProjectError(Exception):
@@ -47,11 +48,9 @@ class Project(Signallable, Loggable):
     @ivar sources: The sources used by this project
     @type sources: L{SourceList}
     @ivar timeline: The timeline
-    @type timeline: L{Timeline}
+    @type timeline: L{ges.Timeline}
     @ivar pipeline: The timeline's pipeline
-    @type pipeline: L{Pipeline}
-    @ivar factory: The timeline factory
-    @type factory: L{TimelineSourceFactory}
+    @type pipeline: L{ges.Pipeline}
     @ivar format: The format under which the project is currently stored.
     @type format: L{FormatterClass}
     @ivar loaded: Whether the project is fully loaded or not.