Changes between Version 11 and Version 12 of DjangoGraphviz

Timestamp:

Aug 6, 2006, 2:59:52 PM (18 years ago)

Author:

Antonio Cavedoni

Comment:

More code refactoring (no more print statements)

DjangoGraphviz

@@ -33 +33 @@
 Changelog
 
+0.5.1
+Got rid of print statements, now the generate_dot() function returns
+a string with the file contents
+
 0.5
 Cleaned up code, now the relationship arrows start from the 
@@ -52 +56 @@
 """
 
-__version__ = "0.4"
+__version__ = "0.5.1"
 __svnid__ = "$Id: modelviz.py 4 2006-08-06 19:48:42Z verbosus $"
 __license__ = "Python"
@@ -70 +74 @@
    app = models.get_app(app_label)
 
-   print "digraph %s {" % ('"' + app.__name__ + '"')
-   print """  fontname = "Helvetica"
+   graph = []
+   graph.append("digraph %s {" % ('"' + app.__name__ + '"'))
+   graph.append("""  fontname = "Helvetica"
   fontsize = 8
       
@@ -83 +88 @@
     fontsize = 8
   ]
-"""
+""")
    for o in get_models(app):
-      nodes = []
-      nodes.append(""" subgraph cluster_%(model)s {
+      graph.append(""" subgraph cluster_%(model)s {
   shape = "record";
   label = "%(model)s";
@@ -96 +100 @@
       # model attributes
       def add_attributes():
-         nodes.append("<%(model)s_%(field)s>%(field)s : %(related)s|" % \
+         graph.append("<%(model)s_%(field)s>%(field)s : %(related)s|" % \
                       {'model': o.__name__, 'field': field.name, 
                        'related': type(field).__name__})
@@ -107 +111 @@
             add_attributes()
 
-      nodes.append(""" }"] [color="white" shape="record"];\n }\n""")
-      print "".join(nodes)
+      graph.append(""" }"] [color="white" shape="record"];\n }\n""")
 
       # relations
       rel = []
-
       def add_relation(extras=""):
          _rel = """ %(model)s:%(model)s_%(field)s -> %(related)s 
-         [label="%(relationship)s"] %(extras)s;""" % {
+         [label="%(relationship)s"] %(extras)s;\n""" % {
             'model': o.__name__, 'field': field.name, 
             'related': field.rel.to.__name__, 
@@ -136 +138 @@
                add_relation(
                   '[style="dotted"] [arrowhead=normal arrowtail=normal]')
+      graph.append("".join(rel))
 
-      print "\n".join(rel)
-
-   print "}"
+   graph.append('}')
+   return "".join(graph)
 
 if __name__ == "__main__":
    import sys
    app_label = sys.argv[1]
-   generate_dot(app_label)
+   print generate_dot(app_label)
 }}}