merge

2 files changed, 20 insertions, 6 deletions

diff --git a/db.py b/db.py
index fb1bac1..f912c4b 100644
--- a/db.py
+++ b/db.py
@@ -410,8 +410,18 @@ class _PySqlite2Adapter(DBAPIAdapter):
                     # DateTime used as Time?
                     return strptime(ustr, '%Y-%m-%d %H:%M:%S')
             sqlite.register_converter('time', convert_mxtime)
-        # XXX else use datetime.datetime
-    
+        # else use datetime.datetime
+        else:
+            from datetime import time
+            def adapt_time(data):
+                return data.strftime('%H:%M:%S')
+            sqlite.register_adapter(time, adapt_time)
+            def convert_time(data):
+               return time(*[int(i) for i in data.split(':')])
+            sqlite.register_converter('time', convert_time)
+
+
+
             
     def connect(self, host='', database='', user='', password='', port=None):
         """Handles sqlite connexion format"""
diff --git a/graph.py b/graph.py
index 097f503..ca45aeb 100644
--- a/graph.py
+++ b/graph.py
@@ -2,7 +2,7 @@
 
 (dot generation adapted from pypy/translator/tool/make_dot.py)
 
-:copyright: 2000-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2000-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 :license: General Public License version 2 - http://www.gnu.org/licenses
 """
@@ -22,9 +22,8 @@ def escape(value):
 
 def target_info_from_filename(filename):
     """Transforms /some/path/foo.png into ('/some/path', 'foo.png', 'png')."""
-    abspath = osp.abspath(filename)
     basename = osp.basename(filename)
-    storedir = osp.dirname(abspath)
+    storedir = osp.dirname(osp.abspath(filename))
     target = filename.split('.')[-1]
     return storedir, basename, target
 
@@ -71,7 +70,12 @@ class DotBackend:
         :return: a path to the generated file
         """
         name = self.graphname
-        dotfile = dotfile or ('%s.dot' % name)
+        if not dotfile:
+            # if 'outputfile' is a dot file use it as 'dotfile'
+            if outputfile and outputfile.endswith(".dot"):
+                dotfile = outputfile
+            else:
+                dotfile = '%s.dot' % name
         if outputfile is not None:
             storedir, basename, target = target_info_from_filename(outputfile)
             if target != "dot":