added profiler, made modelfactory use 2.5 compliant import

git-svn-id: file:///Users/arjan/backup/gaphor/gaphor/trunk@2659 a8418922-720d-0410-834f-a69b97ada669

gaphor/UML/modelfactory.py

@@ -9,7 +9,7 @@ Functions collected in this module allow to
 """
 
 import itertools
-from .uml2 import *
+from gaphor.UML.uml2 import *
 
 def stereotypes_str(element, stereotypes=()):
     """

gaphor/__init__.py

@@ -52,7 +52,15 @@ def main():
     """
     import sys
     if len(sys.argv) > 1:
-        launch(sys.argv[1])
+        if sys.argv[1] in ('-p', '--profile'):
+            print 'Starting profiler...'
+            import cProfile
+            import pstats
+            cProfile.run('import gaphor; gaphor.launch()', 'gaphor.prof')
+            p = pstats.Stats('gaphor.prof')
+            p.strip_dirs().sort_stats('time').print_stats(40)
+        else:
+            launch(sys.argv[1])
     else:
         launch()
 

setup.py

@@ -209,7 +209,7 @@ It uses the GTK+ environment for user interaction.
               'run': run,
     },
 
-    setup_requires = ['nose == 0.9.3'] + platform_setup_requires,
+    setup_requires = ['nose >= 0.9.3'] + platform_setup_requires,
 
     test_suite = 'nose.collector',