Merge lp:~veger/ubuntu/trusty/pydot/fix-for-987934 into lp:ubuntu/trusty/pydot

[Maarten Bezemer]

I have updated the pydot package to version 1.0.28, as the current version is quite outdated (1.0.2).

The update fixes the linked bug reports and additionally it fixes #490015 bug 2. (I do not know what is causing bug 1, but this update still shows the same behavior as described by the reporter)

As the package is old, I had to update the debian/* files quite heavily as well.
I have followed the debian packaging and python library packaging guidelines, so everything should be fine. (But then again, I am not very experienced, so I might have missed something).

[Daniel Holbach (dholbach)]

Thanks a lot for your work on this. Uploaded with two small modifications:
 - changed version number to 1.0.28-0ubuntu1 (1.0.28-1 would indicate that it was in Debian already)
 - ran the "update-maintainer" script to adhere to https://wiki.ubuntu.com/DebianMaintainerField

Can you please forward your changes to Debian as well?

review: Approve

[Maarten Bezemer (veger)]

I just have forwarded the (slightly modified) patch to Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638869

Unmerged revisions

4. By Maarten Bezemer on 2014-02-15

* New upstream release. (LP: #574428, #987934)
* debian/control updated to newest standards version:
  - Removed DM-Upload-Allowed, obsolete
  - Updated Vsc-Browser field
  - Depend on python-setuptools
  - Depend on pyparsing >= 2.0.1 to prevent incompability problems with
    debian/patches/03-support-pyparsing-v2.patch
  - Add ${misc:Depends} to binary package Depends
  - Support dh-python
    o Bumped cdbs version to 0.4.90
    o Bumped python version to 2.6.6.3
    o Removed XB-Python-Version field
    o Added X-Python-Version field
    o Removed ${python:Depends} from Depends
* debian/rules:
  - do not include simple-patchsys.mk
  - Support dh-python: Remove DEB_PYTHON_SYSTEM
* debian/pyversions: not required for dh-python
* debian/pycompat: not required for dh-python
* debian/source/format: added and set to 3.0 (quilt)
* debian/patches/02-use-setuptools.patch: patched setup.py to use setuptools
  to prevent "Unknown distribution option: 'install_requires'" warning
* debian/patches/03-support-pyparsing-v2.patch: add support for pyparsing
  version 2.X, fixes "Couldn't import dot_parser" error

=== removed file '._dot_parser.py'
Binary files ._dot_parser.py	2008-05-26 15:35:04 +0000 and ._dot_parser.py	1970-01-01 00:00:00 +0000 differ
=== removed file '._pydot.py'
Binary files ._pydot.py	2008-05-26 15:35:04 +0000 and ._pydot.py	1970-01-01 00:00:00 +0000 differ
=== removed file '._setup.py'
Binary files ._setup.py	2008-05-26 15:35:04 +0000 and ._setup.py	1970-01-01 00:00:00 +0000 differ
=== removed file 'ChangeLog'
--- ChangeLog	2008-05-26 15:35:04 +0000
+++ ChangeLog	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-2004-04-28 21:50  carrer
-
-	* pydot.py: Some of the changes already made should allow pydot to
-	  run on OSX.  Bumped version to 0.9.2
-
-2004-04-24 17:52  carrer
-
-	* setup.py: Added more metainformation to the distribution.
-
-2004-04-24 17:51  carrer
-
-	* pydot.py: Added support for circo and fdp. Fixed piping mechanism
-	  to not to capture stderr.
-
-2004-04-24 13:26  carrer
-
-	* ChangeLog, LICENSE, MANIFEST, README, setup.py: Adding
-	  suplementary files to the distribution to the CVS.
-
-2004-04-24 12:57  carrer
-
-	* pydot.py: Bumped version to 0.9.1
-
-2004-04-24 01:36  carrer
-
-	* pydot.py: Implemented tweaks suggested by John B. Cole to handle
-	  non-str nodes, converting them to strings.
-
-2004-04-24 01:10  carrer
-
-	* pydot.py: Applied patch for Windows support by Kent Johnson.
-
-2004-04-24 01:05  carrer
-
-	* pydot.py: Fixed to properly handle unicode strings in attributes.
-
-2004-04-20 00:06  carrer
-
-	* pydot.py:
-	  Fixed silly error in graph_from_edges. When pasting the function
-	  into the code, the references to the pydot module were not
-	  removed, which are no longer needed since we now are _in_ the
-	  module.
-
-2004-04-19 23:33  carrer
-
-	* pydot.py:
-	  Added support to write files with the desired output format with
-	  write_[format]
-
-2004-04-19 22:53  carrer
-
-	* pydot.py:
-	  Done some clean up, no major changes.
-
-2004-04-08 00:22  carrer
-
-	* pydot.py:
-	  Initial revision.
-
-2004-04-08 00:22  carrer
-
-	* pydot.py: Initial revision
-

=== modified file 'PKG-INFO'
--- PKG-INFO	2008-05-26 15:35:04 +0000
+++ PKG-INFO	2014-02-15 16:49:34 +0000
@@ -1,12 +1,12 @@
 Metadata-Version: 1.0
 Name: pydot
-Version: 1.0.2
+Version: 1.0.28
 Summary: Python interface to Graphviz's Dot
 Home-page: http://code.google.com/p/pydot/
 Author: Ero Carrera
 Author-email: [e-mail]
 License: MIT
-Download-URL: http://pydot.googlecode.com/files/pydot-1.0.2.tar.gz
+Download-URL: http://pydot.googlecode.com/files/pydot-1.0.28.tar.gz
 Description: Graphviz's dot language Python interface.
         
         This module provides with a full interface to create handle modify
@@ -14,12 +14,13 @@
         
         References:
         
-        pydot Homepage:	http://www.dkbza.org/pydot.html
-        Graphviz:	http://www.research.att.com/sw/tools/graphviz/
-        DOT Language:	http://www.research.att.com/~erg/graphviz/info/lang.html
-        
-        Programmed and tested with Graphviz 1.16 and Python 2.3.4 on GNU/Linux
-        by Ero Carrera (c) 2004	[[e-mail]]
+        pydot Homepage: http://code.google.com/p/pydot/
+        Graphviz:       http://www.graphviz.org/
+        DOT Language:   http://www.graphviz.org/doc/info/lang.html
+        
+        Programmed and tested with Graphviz 2.26.3 and Python 2.6 on OSX 10.6.4
+        
+        Copyright (c) 2005-2011 Ero Carrera <[e-mail]>
         
         Distributed under MIT license [http://opensource.org/licenses/mit-license.html].
         

=== modified file 'debian/changelog'
--- debian/changelog	2008-05-26 15:35:04 +0000
+++ debian/changelog	2014-02-15 16:49:34 +0000
@@ -1,3 +1,32 @@
+pydot (1.0.28-1) trusty; urgency=low
+
+  * New upstream release. (LP: #574428, #987934)
+  * debian/control updated to newest standards version:
+    - Removed DM-Upload-Allowed, obsolete
+    - Updated Vsc-Browser field
+    - Depend on python-setuptools
+    - Depend on pyparsing >= 2.0.1 to prevent incompability problems with
+      debian/patches/03-support-pyparsing-v2.patch
+    - Add ${misc:Depends} to binary package Depends
+    - Support dh-python
+      o Bumped cdbs version to 0.4.90
+      o Bumped python version to 2.6.6.3
+      o Removed XB-Python-Version field
+      o Added X-Python-Version field
+      o Removed ${python:Depends} from Depends
+  * debian/rules:
+    - do not include simple-patchsys.mk
+    - Support dh-python: Remove DEB_PYTHON_SYSTEM
+  * debian/pyversions: not required for dh-python
+  * debian/pycompat: not required for dh-python
+  * debian/source/format: added and set to 3.0 (quilt)
+  * debian/patches/02-use-setuptools.patch: patched setup.py to use setuptools
+    to prevent "Unknown distribution option: 'install_requires'" warning
+  * debian/patches/03-support-pyparsing-v2.patch: add support for pyparsing
+    version 2.X, fixes "Couldn't import dot_parser" error
+
+ -- Maarten Bezemer <[e-mail]>  Sat, 15 Feb 2014 14:01:16 +0100
+
 pydot (1.0.2-1) unstable; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2008-05-26 15:35:04 +0000
+++ debian/control	2014-02-15 16:49:34 +0000
@@ -3,19 +3,18 @@
 Priority: optional
 Maintainer: Peter Collingbourne <[e-mail]>
 Uploaders: Debian Python Modules Team <[e-mail]>
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.38), python (>= 2.4~), python-support (>= 0.5.3)
-Build-Depends-Indep: python-pyparsing (>= 1.4.10)
-Standards-Version: 3.7.3
+Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 5.0.38), python (>= 2.6.6.3~), dh-python, python-setuptools
+Build-Depends-Indep: python-pyparsing (>= 2.0.1)
+Standards-Version: 3.9.5
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pydot/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pydot/trunk/?op=log
-DM-Upload-Allowed: yes
+Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pydot/trunk
 Homepage: http://dkbza.org/pydot.html
+X-Python-Version: >= 2.4
 
 Package: python-pydot
 Architecture: all
-Depends: ${python:Depends}, python-pyparsing (>= 1.4.10), graphviz
+Depends: ${misc:Depends}, ${python:Depends}, python-pyparsing (>= 2.0.1), graphviz
 Conflicts: dot2tex (<< 2.8.0)
-XB-Python-Version: ${python:Versions}
 Description: Python interface to Graphviz's dot
  This package provides you with a full Python interface for creating,
  handling, modifying and processing graphs in Graphviz's dot language.

=== modified file 'debian/patches/01-setup-py-nodata.patch'
--- debian/patches/01-setup-py-nodata.patch	2008-05-26 15:35:04 +0000
+++ debian/patches/01-setup-py-nodata.patch	2014-02-15 16:49:34 +0000
@@ -1,10 +1,11 @@
-diff -Nur pydot-1.0.2/setup.py pydot-1.0.2.new/setup.py
---- pydot-1.0.2/setup.py	2008-02-14 20:48:02.000000000 +0000
-+++ pydot-1.0.2.new/setup.py	2008-02-22 03:08:11.000000000 +0000
-@@ -27,5 +27,4 @@
+Index: pydot/setup.py
+===================================================================
+--- pydot.orig/setup.py	2014-02-15 14:10:12.113725634 +0100
++++ pydot/setup.py	2014-02-15 14:10:12.105725635 +0100
+@@ -31,5 +31,4 @@
          'Topic :: Software Development :: Libraries :: Python Modules'],
      long_description = "\n".join(pydot.__doc__.split('\n')),
      py_modules = ['pydot', 'dot_parser'],
 -    install_requires = ['pyparsing', 'setuptools'],
--    data_files = [('.', ['ChangeLog', 'LICENSE', 'README'])] )
+-    data_files = [('.', ['LICENSE', 'README'])] )
 +    install_requires = ['pyparsing', 'setuptools'] )

=== added file 'debian/patches/02-use-setuptools.patch'
--- debian/patches/02-use-setuptools.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02-use-setuptools.patch	2014-02-15 16:49:34 +0000
@@ -0,0 +1,20 @@
+Fix Unknown distribution option: 'install_requires', information from: http://stackoverflow.com/q/9810603/246263
+Author: Maarten Bezemer <[e-mail]>
+Last-Update: <2014-02-15>
+
+Index: pydot/setup.py
+===================================================================
+--- pydot.orig/setup.py	2014-02-15 16:47:04.321340325 +0100
++++ pydot/setup.py	2014-02-15 16:47:04.317340325 +0100
+@@ -1,9 +1,9 @@
+ #!/usr/bin/env python
+ 
+ try:
+-    from distutils.core import setup
+-except ImportError, excp:
+     from setuptools import setup
++except ImportError, excp:
++    from distutils.core import setup
+     
+ import pydot
+ import os

=== added file 'debian/patches/03-support-pyparsing-v2.patch'
--- debian/patches/03-support-pyparsing-v2.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03-support-pyparsing-v2.patch	2014-02-15 16:49:34 +0000
@@ -0,0 +1,18 @@
+Support pyparsing version 2, information from http://code.google.com/p/pydot/issues/detail?id=81#c9
+Author: Maarten Bezemer <[e-mail]>
+Last-Update: <2014-02-15>
+Index: pydot/dot_parser.py
+===================================================================
+--- pydot.orig/dot_parser.py	2014-02-15 15:50:30.713479250 +0100
++++ pydot/dot_parser.py	2014-02-15 15:50:30.709479250 +0100
+@@ -25,8 +25,9 @@
+ from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase, OneOrMore, ZeroOrMore,
+     Forward, NotAny, delimitedList, oneOf, Group, Optional, Combine, alphas, nums,
+     restOfLine, cStyleComment, nums, alphanums, printables, empty, quotedString,
+-    ParseException, ParseResults, CharsNotIn, _noncomma, dblQuotedString, QuotedString, ParserElement )
++    ParseException, ParseResults, CharsNotIn, dblQuotedString, QuotedString, ParserElement )
+ 
++_noncomma = "".join( [ c for c in printables if c != "," ] )
+ 
+ class P_AttrList:
+ 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-02-15 16:49:34 +0000
@@ -0,0 +1,3 @@
+01-setup-py-nodata.patch
+02-use-setuptools.patch
+03-support-pyparsing-v2.patch

=== removed file 'debian/pycompat'
--- debian/pycompat	2006-11-08 15:52:04 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed file 'debian/pyversions'
--- debian/pyversions	2008-05-26 15:35:04 +0000
+++ debian/pyversions	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2.4-

=== modified file 'debian/rules'
--- debian/rules	2008-05-26 15:35:04 +0000
+++ debian/rules	2014-02-15 16:49:34 +0000
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM = pysupport
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2014-02-15 16:49:34 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)

=== modified file 'dot_parser.py'
--- dot_parser.py	2008-05-26 15:35:04 +0000
+++ dot_parser.py	2014-02-15 16:49:34 +0000
@@ -4,9 +4,10 @@
 The dotparser parses graphviz files in dot and dot files and transforms them
 into a class representation defined by pydot.
 
-The module needs pyparsing (tested with version 1.2.2) and pydot (tested with 0.9.10)
+The module needs pyparsing (tested with version 1.2.2) and pydot
 
 Author: Michael Krause <[e-mail]>
+Fixes by: Ero Carrera <[e-mail]>
 """
 
 __author__ = ['Michael Krause', 'Ero Carrera']
@@ -17,6 +18,7 @@
 import glob
 import pydot
 import re
+import codecs
 
 from pyparsing import __version__ as pyparsing_version
 
@@ -26,7 +28,6 @@
     ParseException, ParseResults, CharsNotIn, _noncomma, dblQuotedString, QuotedString, ParserElement )
 
 
-
 class P_AttrList:
 
     def __init__(self, toks):
@@ -35,12 +36,17 @@
         i = 0
         
         while i < len(toks):
-        
             attrname = toks[i]
-            attrvalue = toks[i+1]
+            if i+2 < len(toks) and toks[i+1] == '=':
+                attrvalue = toks[i+2]
+                i += 3
+            else:
+                attrvalue = None
+                i += 1
+                
             self.attrs[attrname] = attrvalue
-            i += 2
-
+            
+            
     def __repr__(self):
 
         return "%s(%r)" % (self.__class__.__name__, self.attrs)
@@ -107,7 +113,9 @@
         else:
             raise ValueError, "Unknown element statement: %r " % element
     
-        
+    
+    for g in top_graphs:
+        update_parent_graph_hierarchy(g)
     
     if len( top_graphs ) == 1:
         return top_graphs[0]
@@ -115,6 +123,42 @@
     return top_graphs
 
 
+def update_parent_graph_hierarchy(g, parent_graph=None, level=0):
+
+
+    if parent_graph is None:
+        parent_graph = g
+        
+    for key_name in ('edges',):
+
+        if isinstance(g, pydot.frozendict):
+            item_dict = g
+        else:
+            item_dict = g.obj_dict
+            
+        if not item_dict.has_key( key_name ):
+            continue
+
+        for key, objs in item_dict[key_name].items():
+            for obj in objs:
+                if 'parent_graph' in obj and obj['parent_graph'].get_parent_graph()==g:
+                    if obj['parent_graph'] is g:
+                        pass
+                    else:
+                        obj['parent_graph'].set_parent_graph(parent_graph)
+
+                if key_name == 'edges' and len(key) == 2:
+                    for idx, vertex in enumerate( obj['points'] ):
+                        if isinstance( vertex, (pydot.Graph, pydot.Subgraph, pydot.Cluster)):
+                            vertex.set_parent_graph(parent_graph)
+                        if isinstance( vertex, pydot.frozendict):
+                            if vertex['parent_graph'] is g:
+                                pass
+                            else:
+                                vertex['parent_graph'].set_parent_graph(parent_graph)
+
+
+
 def add_defaults(element, defaults):
 
     d = element.__dict__
@@ -134,7 +178,7 @@
         defaults_edge = {}
         
     for elm_idx, element in enumerate(toks):
-    
+        
         if isinstance(element, (pydot.Subgraph, pydot.Cluster)):
         
             add_defaults(element, defaults_graph)
@@ -191,14 +235,19 @@
     return g
 
 
-def push_subgraph_stmt(str, loc, toks):	
+def push_subgraph_stmt(str, loc, toks):
 
     g = pydot.Subgraph('')
-    
     for e in toks:
         if len(e)==3:
-            g = e[2]
-            g.set_name(e[1])
+            e[2].set_name(e[1])
+            if e[0] == 'subgraph':
+                e[2].obj_dict['show_keyword'] = True
+            return e[2]
+        else:
+            if e[0] == 'subgraph':
+                e[1].obj_dict['show_keyword'] = True
+            return e[1]
 
     return g
 
@@ -208,7 +257,6 @@
     # The pydot class instances should be marked as
     # default statements to be inherited by actual
     # graphs, nodes and edges.
-    # print "push_default_stmt", toks
     #
     default_type = toks[0][0]
     if len(toks) > 1:
@@ -362,23 +410,21 @@
         
         # token definitions
         
-        identifier = Word(alphanums + "_" ).setName("identifier")
+        identifier = Word(alphanums + "_." ).setName("identifier")
         
         double_quoted_string = QuotedString('"', multiline=True, unquoteResults=False) # dblQuotedString
 
-        alphastring_ = OneOrMore(CharsNotIn(_noncomma))
+        alphastring_ = OneOrMore(CharsNotIn(_noncomma + ' '))
 
         def parse_html(s, loc, toks):
-        
             return '<%s>' % ''.join(toks[0])
             
         
         opener = '<'
         closer = '>'
         html_text = nestedExpr( opener, closer, 
-            ( CharsNotIn( 
-                opener + closer ).setParseAction( lambda t:t[0] ))
-            ).setParseAction(parse_html)
+            ( CharsNotIn( opener + closer )  ) 
+                ).setParseAction(parse_html).leaveWhitespace()
 
         ID = ( identifier | html_text | 
             double_quoted_string | #.setParseAction(strip_quotes) |
@@ -399,16 +445,16 @@
             Group(port_angle + Optional(port_location))).setName("port")
             
         node_id = (ID + Optional(port))
-        a_list = OneOrMore(ID + Optional(equals.suppress() + righthand_id) +	
+        a_list = OneOrMore(ID + Optional(equals + righthand_id) +
             Optional(comma.suppress())).setName("a_list")
-            
+        
         attr_list = OneOrMore(lbrack.suppress() + Optional(a_list) +	
             rbrack.suppress()).setName("attr_list")
-            
+        
         attr_stmt = (Group(graph_ | node_ | edge_) + attr_list).setName("attr_stmt")
-
+        
         edgeop = (Literal("--") | Literal("->")).setName("edgeop")
-
+        
         stmt_list = Forward()
         graph_stmt = Group(lbrace.suppress() + Optional(stmt_list) +	
             rbrace.suppress() + Optional(semi.suppress()) ).setName("graph_stmt")
@@ -421,17 +467,17 @@
         
         subgraph = Group(subgraph_ + Optional(ID) + graph_stmt).setName("subgraph")
         
-        edge_point << Group(subgraph | graph_stmt | node_id )
-
+        edge_point << Group( subgraph | graph_stmt | node_id ).setName('edge_point')
+        
         node_stmt = (node_id + Optional(attr_list) + Optional(semi.suppress())).setName("node_stmt")
         
-        assignment = (ID + equals.suppress() + righthand_id).setName("assignment")
+        assignment = (ID + equals + righthand_id).setName("assignment")
         stmt =  (assignment | edge_stmt | attr_stmt | subgraph | graph_stmt | node_stmt).setName("stmt")
         stmt_list << OneOrMore(stmt + Optional(semi.suppress()))
-
-        graphparser = OneOrMore( (Optional(strict_) + Group((graph_ | digraph_)) +	
+        
+        graphparser = OneOrMore( (Optional(strict_) + Group((graph_ | digraph_)) +
             Optional(ID) + graph_stmt).setResultsName("graph") )
-
+        
         singleLineComment = Group("//" + restOfLine) | Group("#" + restOfLine)
         
         
@@ -439,18 +485,18 @@
         
         graphparser.ignore(singleLineComment)
         graphparser.ignore(cStyleComment)
-
+        
         assignment.setParseAction(push_attr_list)
         a_list.setParseAction(push_attr_list)
         edge_stmt.setParseAction(push_edge_stmt)
         node_stmt.setParseAction(push_node_stmt)
         attr_stmt.setParseAction(push_default_stmt)
-
+        
         subgraph.setParseAction(push_subgraph_stmt)
         graph_stmt.setParseAction(push_graph_stmt)
         graphparser.setParseAction(push_top_graph_stmt)
-
         
+    
     return graphparser
 
 
@@ -460,6 +506,9 @@
     
     top_graphs = list()
 
+    if data.startswith(codecs.BOM_UTF8):
+        data = data.decode( 'utf-8' )
+        
     try:
     
         graphparser = graph_definition()

=== removed directory 'pydot.egg-info'
=== removed file 'pydot.egg-info/PKG-INFO'
--- pydot.egg-info/PKG-INFO	2008-05-26 15:35:04 +0000
+++ pydot.egg-info/PKG-INFO	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-Metadata-Version: 1.0
-Name: pydot
-Version: 1.0.2
-Summary: Python interface to Graphviz's Dot
-Home-page: http://code.google.com/p/pydot/
-Author: Ero Carrera
-Author-email: [e-mail]
-License: MIT
-Download-URL: http://pydot.googlecode.com/files/pydot-1.0.2.tar.gz
-Description: Graphviz's dot language Python interface.
-        
-        This module provides with a full interface to create handle modify
-        and process graphs in Graphviz's dot language.
-        
-        References:
-        
-        pydot Homepage:	http://www.dkbza.org/pydot.html
-        Graphviz:	http://www.research.att.com/sw/tools/graphviz/
-        DOT Language:	http://www.research.att.com/~erg/graphviz/info/lang.html
-        
-        Programmed and tested with Graphviz 1.16 and Python 2.3.4 on GNU/Linux
-        by Ero Carrera (c) 2004	[[e-mail]]
-        
-        Distributed under MIT license [http://opensource.org/licenses/mit-license.html].
-        
-Keywords: graphviz dot graphs visualization
-Platform: any
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Scientific/Engineering :: Visualization
-Classifier: Topic :: Software Development :: Libraries :: Python Modules

=== removed file 'pydot.egg-info/SOURCES.txt'
--- pydot.egg-info/SOURCES.txt	2008-05-26 15:35:04 +0000
+++ pydot.egg-info/SOURCES.txt	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-ChangeLog
-LICENSE
-README
-dot_parser.py
-pydot.py
-setup.py
-pydot.egg-info/PKG-INFO
-pydot.egg-info/SOURCES.txt
-pydot.egg-info/dependency_links.txt
-pydot.egg-info/requires.txt
-pydot.egg-info/top_level.txt

=== removed file 'pydot.egg-info/dependency_links.txt'
--- pydot.egg-info/dependency_links.txt	2008-05-26 15:35:04 +0000
+++ pydot.egg-info/dependency_links.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-

=== removed file 'pydot.egg-info/requires.txt'
--- pydot.egg-info/requires.txt	2008-05-26 15:35:04 +0000
+++ pydot.egg-info/requires.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-pyparsing
-setuptools
\ No newline at end of file

=== removed file 'pydot.egg-info/top_level.txt'
--- pydot.egg-info/top_level.txt	2008-05-26 15:35:04 +0000
+++ pydot.egg-info/top_level.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-dot_parser
-pydot

=== modified file 'pydot.py'
--- pydot.py	2008-05-26 15:35:04 +0000
+++ pydot.py	2014-02-15 16:49:34 +0000
@@ -6,18 +6,20 @@
 
 References:
 
-pydot Homepage:	http://www.dkbza.org/pydot.html
-Graphviz:	http://www.research.att.com/sw/tools/graphviz/
-DOT Language:	http://www.research.att.com/~erg/graphviz/info/lang.html
-
-Programmed and tested with Graphviz 1.16 and Python 2.3.4 on GNU/Linux
-by Ero Carrera (c) 2004	[[e-mail]]
+pydot Homepage: http://code.google.com/p/pydot/
+Graphviz:       http://www.graphviz.org/
+DOT Language:   http://www.graphviz.org/doc/info/lang.html
+
+Programmed and tested with Graphviz 2.26.3 and Python 2.6 on OSX 10.6.4
+
+Copyright (c) 2005-2011 Ero Carrera <[e-mail]>
 
 Distributed under MIT license [http://opensource.org/licenses/mit-license.html].
 """
 
+__revision__ = "$LastChangedRevision: 28 $"
 __author__ = 'Ero Carrera'
-__version__ = '1.0.2'
+__version__ = '1.0.%d' % int( __revision__[21:-2] )
 __license__ = 'MIT'
 
 import os
@@ -32,51 +34,53 @@
     
 
 
-GRAPH_ATTRIBUTES = set( ['Damping', 'K', 'URL', 'bb', 'bgcolor', 'center', 'charset',
-    'clusterrank', 'colorscheme', 'comment', 'compound', 'concentrate',
-    'defaultdist', 'dim', 'diredgeconstraints', 'dpi', 'epsilon', 'esep',
-    'fontcolor', 'fontname', 'fontnames', 'fontpath', 'fontsize', 'label',
-    'labeljust', 'labelloc', 'landscape', 'layers', 'layersep', 'levelsgap',
-    'lp', 'margin', 'maxiter', 'mclimit', 'mindist', 'mode', 'model',
-    'mosek', 'nodesep', 'nojustify', 'normalize', 'nslimit', 'nslimit1', 'ordering',
-    'orientation', 'outputorder', 'overlap', 'pack', 'packmode', 'pad',
-    'page', 'pagedir', 'quantum', 'rankdir', 'ranksep', 'ratio', 'remincross',
-    'resolution', 'root', 'rotate', 'searchsize', 'sep', 'showboxes', 'size',
-    'splines', 'start', 'stylesheet', 'target', 'truecolor', 'viewport',
-    'voro_margin'] + ['rank'] )
-
-
-EDGE_ATTRIBUTES = set( ['URL', 'arrowhead', 'arrowsize', 'arrowtail', 'color',
-    'colorscheme', 'comment', 'constraint', 'decorate', 'dir',
-    'edgeURL', 'edgehref', 'edgetarget', 'edgetooltip',
-    'fontcolor', 'fontname', 'fontsize', 'headURL', 'headclip',
-    'headhref', 'headlabel', 'headport', 'headtarget',
-    'headtooltip', 'href', 'label', 'labelURL', 'labelangle',
-    'labeldistance', 'labelfloat', 'labelfontcolor',
+GRAPH_ATTRIBUTES = set( ['Damping', 'K', 'URL', 'aspect', 'bb', 'bgcolor',
+    'center', 'charset', 'clusterrank', 'colorscheme', 'comment', 'compound',
+    'concentrate', 'defaultdist', 'dim', 'dimen', 'diredgeconstraints',
+    'dpi', 'epsilon', 'esep', 'fontcolor', 'fontname', 'fontnames',
+    'fontpath', 'fontsize', 'id', 'label', 'labeljust', 'labelloc',
+    'landscape', 'layers', 'layersep', 'layout', 'levels', 'levelsgap',
+    'lheight', 'lp', 'lwidth', 'margin', 'maxiter', 'mclimit', 'mindist',
+    'mode', 'model', 'mosek', 'nodesep', 'nojustify', 'normalize', 'nslimit',
+    'nslimit1', 'ordering', 'orientation', 'outputorder', 'overlap',
+    'overlap_scaling', 'pack', 'packmode', 'pad', 'page', 'pagedir',
+    'quadtree', 'quantum', 'rankdir', 'ranksep', 'ratio', 'remincross',
+    'repulsiveforce', 'resolution', 'root', 'rotate', 'searchsize', 'sep',
+    'showboxes', 'size', 'smoothing', 'sortv', 'splines', 'start', 
+    'stylesheet', 'target', 'truecolor', 'viewport', 'voro_margin',
+    # for subgraphs 
+    'rank' ] )
+
+
+EDGE_ATTRIBUTES = set( ['URL', 'arrowhead', 'arrowsize', 'arrowtail',
+    'color', 'colorscheme', 'comment', 'constraint', 'decorate', 'dir',
+    'edgeURL', 'edgehref', 'edgetarget', 'edgetooltip', 'fontcolor',
+    'fontname', 'fontsize', 'headURL', 'headclip', 'headhref', 'headlabel',
+    'headport', 'headtarget', 'headtooltip', 'href', 'id', 'label',
+    'labelURL', 'labelangle', 'labeldistance', 'labelfloat', 'labelfontcolor',
     'labelfontname', 'labelfontsize', 'labelhref', 'labeltarget',
-    'labeltooltip', 'layer', 'len', 'lhead', 'lp', 'ltail',
-    'minlen', 'nojustify', 'pos', 'samehead', 'sametail',
-    'showboxes', 'style', 'tailURL', 'tailclip', 'tailhref',
-    'taillabel', 'tailport', 'tailtarget', 'tailtooltip',
-    'target', 'tooltip', 'weight'] + ['rank'] )
+    'labeltooltip', 'layer', 'len', 'lhead', 'lp', 'ltail', 'minlen',
+    'nojustify', 'penwidth', 'pos', 'samehead', 'sametail', 'showboxes',
+    'style', 'tailURL', 'tailclip', 'tailhref', 'taillabel', 'tailport',
+    'tailtarget', 'tailtooltip', 'target', 'tooltip', 'weight',
+    'rank' ] )
 
 
 NODE_ATTRIBUTES = set( ['URL', 'color', 'colorscheme', 'comment',
     'distortion', 'fillcolor', 'fixedsize', 'fontcolor', 'fontname',
-    'fontsize', 'group', 'height', 'image', 'imagescale', 'label',
-    'layer', 'margin', 'nojustify', 'orientation', 'peripheries',
-    'pin', 'pos', 'rects', 'regular', 'root', 'samplepoints',
-    'shape', 'shapefile', 'showboxes', 'sides', 'skew', 'style',
+    'fontsize', 'group', 'height', 'id', 'image', 'imagescale', 'label',
+    'labelloc', 'layer', 'margin', 'nojustify', 'orientation', 'penwidth',
+    'peripheries', 'pin', 'pos', 'rects', 'regular', 'root', 'samplepoints',
+    'shape', 'shapefile', 'showboxes', 'sides', 'skew', 'sortv', 'style',
     'target', 'tooltip', 'vertices', 'width', 'z',
-
     # The following are attributes dot2tex
     'texlbl',  'texmode' ] )
 
 
-CLUSTER_ATTRIBUTES = set( ['K', 'URL', 'bgcolor', 'color', 'colorscheme', 'fillcolor',
-    'fontcolor', 'fontname', 'fontsize', 'label', 'labeljust',
-    'labelloc', 'lp', 'nojustify', 'pencolor', 'peripheries',
-    'style', 'target', 'tooltip'] )
+CLUSTER_ATTRIBUTES = set( ['K', 'URL', 'bgcolor', 'color', 'colorscheme',
+    'fillcolor', 'fontcolor', 'fontname', 'fontsize', 'label', 'labeljust',
+    'labelloc', 'lheight', 'lp', 'lwidth', 'nojustify', 'pencolor',
+    'penwidth', 'peripheries', 'sortv', 'style', 'target', 'tooltip'] )
             
 
 #
@@ -101,8 +105,10 @@
         for arg in args:
             if isinstance(arg, dict):
                 arg = copy.copy(arg)
-                for k, v in arg.items():
-                    if isinstance(v, dict):
+                for k, v in arg.iteritems():
+                    if isinstance(v, frozendict):
+                        arg[k] = v
+                    elif isinstance(v, dict):
                         arg[k] = frozendict(v)
                     elif isinstance(v, list):
                         v_ = list()
@@ -126,7 +132,7 @@
         try:
             return self._cached_hash
         except AttributeError:
-            h = self._cached_hash = hash(tuple(sorted(self.items())))
+            h = self._cached_hash = hash(tuple(sorted(self.iteritems())))
             return h
 
     def __repr__(self):
@@ -135,11 +141,12 @@
 
 dot_keywords = ['graph', 'subgraph', 'digraph', 'node', 'edge', 'strict']
 
-id_re_alpha_nums = re.compile('^[_a-zA-Z][a-zA-Z0-9_:,]*$')
-id_re_num = re.compile('^[0-9]+$')
-id_re_with_port = re.compile('^.*:([^"]+|[^"]*\"[^"]*\"[^"]*)$')
-id_re_dbl_quoted = re.compile('^\".*\"$', re.S)
-id_re_html = re.compile('^<.*>$', re.S)
+id_re_alpha_nums = re.compile('^[_a-zA-Z][a-zA-Z0-9_,]*$', re.UNICODE)
+id_re_alpha_nums_with_ports = re.compile('^[_a-zA-Z][a-zA-Z0-9_,:\"]*[a-zA-Z0-9_,\"]+$', re.UNICODE)
+id_re_num = re.compile('^[0-9,]+$', re.UNICODE)
+id_re_with_port = re.compile('^([^:]*):([^:]*)$', re.UNICODE)
+id_re_dbl_quoted = re.compile('^\".*\"$', re.S|re.UNICODE)
+id_re_html = re.compile('^<.*>$', re.S|re.UNICODE)
 
 
 def needs_quotes( s ):
@@ -148,40 +155,54 @@
     It will check whether the string is solely composed
     by the characters allowed in an ID or not.
     If the string is one of the reserved keywords it will
-    need quotes too.
+    need quotes too but the user will need to add them
+    manually.
     """
-        
+    
+    # If the name is a reserved keyword it will need quotes but pydot
+    # can't tell when it's being used as a keyword or when it's simply
+    # a name. Hence the user needs to supply the quotes when an element
+    # would use a reserved keyword as name. This function will return
+    # false indicating that a keyword string, if provided as-is, won't
+    # need quotes.
     if s in dot_keywords:
         return False
 
     chars = [ord(c) for c in s if ord(c)>0x7f or ord(c)==0]
-    if chars:
-        return False
+    if chars and not id_re_dbl_quoted.match(s) and not id_re_html.match(s):
+        return True
         
-    res = id_re_alpha_nums.match(s)
-    if not res:
-        res = id_re_num.match(s)
-        if not res:
-            res = id_re_dbl_quoted.match(s)
-            if not res:
-                res = id_re_html.match(s)
-                if not res:
-                    res = id_re_with_port.match(s)
-
-    if not res:
-        return True
-
-    return False
-
+    for test_re in [id_re_alpha_nums, id_re_num, id_re_dbl_quoted, id_re_html, id_re_alpha_nums_with_ports]:
+        if test_re.match(s):
+            return False
+
+    m = id_re_with_port.match(s)
+    if m:
+        return needs_quotes(m.group(1)) or needs_quotes(m.group(2))
+
+    return True
 
 
 def quote_if_necessary(s):
 
+    if isinstance(s, bool):
+        if s is True:
+            return 'True'
+        return 'False'
+
     if not isinstance( s, basestring ):
         return s
 
+    if not s:
+        return s
+        
     if needs_quotes(s):
-            
+        replace = {'"'  : r'\"',
+                   "\n" : r'\n',
+                   "\r" : r'\r'}
+        for (a,b) in replace.items():
+            s = s.replace(a, b)
+
         return '"' + s + '"'
      
     return s   
@@ -233,8 +254,18 @@
         graph = Dot(graph_type='graph')
         
     for edge in edge_list:
+        
+        if isinstance(edge[0], str):
+            src = node_prefix + edge[0]
+        else:
+            src = node_prefix + str(edge[0])
+            
+        if isinstance(edge[1], str):
+            dst = node_prefix + edge[1]
+        else:
+            dst = node_prefix + str(edge[1])
 
-        e = Edge( node_prefix + edge[0], node_prefix + edge[1] )
+        e = Edge( src, dst )
         graph.add_edge(e)
         
     return graph
@@ -328,7 +359,7 @@
     """
     
     success = False
-    progs = {'dot': '', 'twopi': '', 'neato': '', 'circo': '', 'fdp': ''}
+    progs = {'dot': '', 'twopi': '', 'neato': '', 'circo': '', 'fdp': '', 'sfdp': ''}
     
     was_quoted = False
     path = path.strip()
@@ -338,7 +369,7 @@
     
     if os.path.isdir(path) : 
     
-        for prg in progs.keys():
+        for prg in progs.iterkeys():
     
             if progs[prg]:
                 continue
@@ -399,30 +430,89 @@
     # Method 1 (Windows only)
     #
     if os.sys.platform == 'win32':
-    
+        
+        HKEY_LOCAL_MACHINE =    0x80000002
+        KEY_QUERY_VALUE =       0x0001
+
+        RegOpenKeyEx = None
+        RegQueryValueEx = None
+        RegCloseKey = None
+        
         try:
             import win32api, win32con
+            RegOpenKeyEx = win32api.RegOpenKeyEx
+            RegQueryValueEx = win32api.RegQueryValueEx
+            RegCloseKey = win32api.RegCloseKey
+
+        except ImportError:
+            # Print a messaged suggesting they install these?
+            #
+            pass
+
+        try:
+            import ctypes
+            
+            def RegOpenKeyEx(key, subkey, opt, sam):
+                result = ctypes.c_uint(0)
+                ctypes.windll.advapi32.RegOpenKeyExA(key, subkey, opt, sam, ctypes.byref(result))
+                return result.value
+                
+            def RegQueryValueEx( hkey, valuename ):
+                data_type = ctypes.c_uint(0)
+                data_len = ctypes.c_uint(1024)
+                data = ctypes.create_string_buffer( 1024 )
+                
+                res = ctypes.windll.advapi32.RegQueryValueExA(hkey, valuename, 0, 
+                    ctypes.byref(data_type), data, ctypes.byref(data_len))
+                    
+                return data.value
+            
+            RegCloseKey = ctypes.windll.advapi32.RegCloseKey
+            
+        except ImportError:
+            # Print a messaged suggesting they install these?
+            #
+            pass
+
+        if RegOpenKeyEx is not None:
             
             # Get the GraphViz install path from the registry
             #
-            hkey = win32api.RegOpenKeyEx( win32con.HKEY_LOCAL_MACHINE,
-                "SOFTWARE\ATT\Graphviz", 0, win32con.KEY_QUERY_VALUE )
-                
-            path = win32api.RegQueryValueEx( hkey, "InstallPath" )[0]
-            win32api.RegCloseKey( hkey )
-            
-            # Now append the "bin" subdirectory:
-            #
-            path = os.path.join(path, "bin")
-            progs = __find_executables(path)
-            if progs is not None :
-                #print "Used Windows registry"
-                return progs
-                
-        except ImportError :
-            # Print a messaged suggesting they install these?
-            #
-            pass
+            hkey = None
+            potentialKeys = [
+                "SOFTWARE\\ATT\\Graphviz",
+                "SOFTWARE\\AT&T Research Labs\\Graphviz",
+            ]
+            for potentialKey in potentialKeys:
+                
+                try:
+                    hkey = RegOpenKeyEx( HKEY_LOCAL_MACHINE,
+                        potentialKey, 0, KEY_QUERY_VALUE )
+                    
+                    if hkey is not None:
+                        path = RegQueryValueEx( hkey, "InstallPath" )
+                        RegCloseKey( hkey )
+                        
+                        # The regitry variable might exist, left by old installations
+                        # but with no value, in those cases we keep searching...
+                        if not path:
+                            continue
+                        
+                        # Now append the "bin" subdirectory:
+                        #
+                        path = os.path.join(path, "bin")
+                        progs = __find_executables(path)
+                        if progs is not None :
+                            #print "Used Windows registry"
+                            return progs
+                
+                except Exception, excp:
+                    #raise excp
+                    pass
+                else:
+                    break
+                    
+
 
     # Method 2 (Linux, Windows etc)
     #
@@ -464,6 +554,7 @@
 
     for path in (
         '/usr/bin', '/usr/local/bin',
+        '/opt/local/bin',
         '/opt/bin', '/sw/bin', '/usr/share',
         '/Applications/Graphviz.app/Contents/MacOS/' ):
         
@@ -487,20 +578,14 @@
 
     def __getstate__(self):
 
-        dict = copy.copy(self.__dict__)
-        for attr in self.attributes.keys():
-
-            del dict['set_'+attr]
-            del dict['get_'+attr]
+        dict = copy.copy(self.obj_dict)
    
         return dict
 
     
     def __setstate__(self, state):
     
-        for k, v in state.items():
-        
-            self.__setattr__(k, v)
+        self.obj_dict = state
 
 
     def __get_attribute__(self, attr):
@@ -517,9 +602,25 @@
             if default_node_name in ('subgraph', 'digraph', 'cluster'):
                 default_node_name = 'graph'
                 
-            defaults = self.get_parent_graph().get_node( default_node_name )
-            if defaults:
-                attr_val = defaults.obj_dict['attributes'].get(attr, None)
+            g = self.get_parent_graph()
+            if g is not None:
+                defaults = g.get_node( default_node_name )
+            else:
+                return None
+            
+            # Multiple defaults could be set by having repeated 'graph [...]'
+            # 'node [...]', 'edge [...]' statements. In such case, if the
+            # same attribute is set in different statements, only the first
+            # will be returned. In order to get all, one would call the
+            # get_*_defaults() methods and handle those. Or go node by node
+            # (of the ones specifying defaults) and modify the attributes
+            # individually.
+            #
+            if not isinstance(defaults, (list, tuple)):
+                defaults = [defaults]
+                
+            for default in defaults:
+                attr_val = default.obj_dict['attributes'].get(attr, None)
                 if attr_val:
                     return attr_val
         else:
@@ -549,14 +650,7 @@
         which are defined for all the existing attributes.
         """
 
-        if self.obj_dict['attributes'].has_key(name):
-            self.obj_dict['attributes'][name] = value
-            return True
-            
-        # Attribute is not known
-        #
-        return False
-
+        self.obj_dict['attributes'][name] = value
 
 
     def get(self, name):
@@ -664,7 +758,7 @@
             port = None
             if isinstance(name, basestring) and not name.startswith('"'):
                 idx = name.find(':')
-                if idx > 0:
+                if idx > 0 and idx+1 < len(name):
                     name, port = name[:idx], name[idx:]
 
             if isinstance(name, (long, int)):
@@ -718,8 +812,11 @@
 
         node_attr = list()
 
-        for attr, value in self.obj_dict['attributes'].items():
-            node_attr.append( attr + '=' + quote_if_necessary(value) )
+        for attr, value in self.obj_dict['attributes'].iteritems():
+            if value is not None:
+                node_attr.append( '%s=%s' % (attr, quote_if_necessary(value) ) )
+            else:
+                node_attr.append( attr )
                 
                 
         # No point in having nodes setting any defaults if the don't set
@@ -754,15 +851,22 @@
     
      set_[attribute name], i.e. set_label, set_fontname
      
-    or using the instance's attributes:
+    or directly by using the instance's special dictionary:
     
-     Edge.[attribute name], i.e. edge_instance.label, edge_instance.fontname
+     Edge.obj_dict['attributes'][attribute name], i.e. 
+     
+        edge_instance.obj_dict['attributes']['label']
+        edge_instance.obj_dict['attributes']['fontname']
+        
     """
     
 
 
     def __init__(self, src='', dst='', obj_dict=None, **attrs):
     
+        if isinstance(src, (list, tuple)) and dst == '':
+            src, dst = src
+            
         if obj_dict is not None:
         
             self.obj_dict = obj_dict
@@ -804,6 +908,11 @@
         return self.obj_dict['points'][1]
             
             
+    def __hash__(self):
+        
+         return hash( hash(self.get_source()) + hash(self.get_destination()) )
+        
+        
     def __eq__(self, edge):
         """Compare two edges.
         
@@ -823,8 +932,8 @@
             # If the graph is undirected, the edge has neither
             # source nor destination.
             #
-            if	( ( self.get_source()==edge.get_source() and self.get_destination()==edge.get_destination() ) or
-                ( edge.get_source() == get_destination() and self.get_destination() == edge.get_source() ) ):
+            if	( ( self.get_source() == edge.get_source() and self.get_destination() == edge.get_destination() ) or
+                ( edge.get_source() == self.get_destination() and edge.get_destination() == self.get_source() ) ):
                 return True
                 
         else:
@@ -841,7 +950,7 @@
         if not isinstance(node_str, str):
             return node_str
     
-        if node_str.startswith('"') and node_str.endswith('"') and node_str.count('"') % 2 != 0:
+        if node_str.startswith('"') and node_str.endswith('"'):
         
             return node_str
         
@@ -874,36 +983,42 @@
         
         if isinstance(src, frozendict):
             edge = [ Subgraph(obj_dict=src).to_string() ]
+        elif isinstance(src, (int, long)):
+            edge = [ str(src) ]
         else:
             edge = [ src ]
         
         if	(self.get_parent_graph() and
             self.get_parent_graph().get_top_graph_type() and
             self.get_parent_graph().get_top_graph_type() == 'digraph' ):
-            
+
             edge.append( '->' )
             
         else:
-        
             edge.append( '--' )
             
         if isinstance(dst, frozendict):
             edge.append( Subgraph(obj_dict=dst).to_string() )
+        elif isinstance(dst, (int, long)):
+            edge.append( str(dst) )
         else:
             edge.append( dst )
 
 
         edge_attr = list()
         
-        for attr, value in self.obj_dict['attributes'].items():
+        for attr, value in self.obj_dict['attributes'].iteritems():
         
-            edge_attr.append( attr + '=' + quote_if_necessary(value) )
+            if value is not None:
+                edge_attr.append( '%s=%s' % (attr, quote_if_necessary(value) ) )
+            else:
+                edge_attr.append( attr )
 
         edge_attr = ', '.join(edge_attr)
         
         if edge_attr:
             edge.append( ' [' + edge_attr + ']' )
-            
+
         return ' '.join(edge) + ';'
     
     
@@ -940,7 +1055,10 @@
      
     or using the instance's attributes:
     
-     Graph.[attribute name], i.e. graph_instance.label, graph_instance.fontname
+     Graph.obj_dict['attributes'][attribute name], i.e. 
+     
+        graph_instance.obj_dict['attributes']['label']
+        graph_instance.obj_dict['attributes']['fontname']
     """
     
 
@@ -960,7 +1078,7 @@
                 raise Error, 'Invalid type "%s". Accepted graph types are: graph, digraph, subgraph' % graph_type
     
     
-            self.obj_dict['name'] = graph_name
+            self.obj_dict['name'] = quote_if_necessary(graph_name)
             self.obj_dict['type'] = graph_type
             
             self.obj_dict['strict'] = strict
@@ -1003,8 +1121,12 @@
     def get_graph_defaults(self, **attrs):
     
         graph_nodes = self.get_node('graph')
-
-        return [ node.get_attributes() for node in graph_nodes ]
+        
+        if isinstance( graph_nodes, (list, tuple)):
+            return [ node.get_attributes() for node in graph_nodes ]
+            
+        return graph_nodes.get_attributes()            
+            
         
 
     def set_node_defaults(self, **attrs):
@@ -1017,7 +1139,10 @@
     
         graph_nodes = self.get_node('node')
 
-        return [ node.get_attributes() for node in graph_nodes ]
+        if isinstance( graph_nodes, (list, tuple)):
+            return [ node.get_attributes() for node in graph_nodes ]
+            
+        return graph_nodes.get_attributes()            
         
 
     def set_edge_defaults(self, **attrs):
@@ -1030,7 +1155,10 @@
     
         graph_nodes = self.get_node('edge')
 
-        return [ node.get_attributes() for node in graph_nodes ]
+        if isinstance( graph_nodes, (list, tuple)):
+            return [ node.get_attributes() for node in graph_nodes ]
+            
+        return graph_nodes.get_attributes()            
 
     
 
@@ -1106,7 +1234,7 @@
     def set_suppress_disconnected(self, val):
         """Suppress disconnected nodes in the output graph.
         
-        This option will skip nodes in the graph with no	incoming or outgoing
+        This option will skip nodes in the graph with no incoming or outgoing
         edges. This option works also for subgraphs and has effect only in the
         current graph/subgraph.
         """
@@ -1133,6 +1261,7 @@
         return seq
         
 
+
     def add_node(self, graph_node):
         """Adds a node object to the graph.
 
@@ -1141,7 +1270,7 @@
         """
         
         if not isinstance(graph_node, Node):
-            raise TypeError('add_node() received a non node class object')
+            raise TypeError('add_node() received a non node class object: ' + str(graph_node))
 
             
         node = self.get_node(graph_node.get_name())
@@ -1161,16 +1290,48 @@
 
 
 
+    def del_node(self, name, index=None):
+        """Delete a node from the graph.
+        
+        Given a node's name all node(s) with that same name
+        will be deleted if 'index' is not specified or set
+        to None.
+        If there are several nodes with that same name and
+        'index' is given, only the node in that position
+        will be deleted.
+        
+        'index' should be an integer specifying the position 
+        of the node to delete. If index is larger than the
+        number of nodes with that name, no action is taken.
+        
+        If nodes are deleted it returns True. If no action
+        is taken it returns False.
+        """
+    
+        if isinstance(name, Node):
+            name = name.get_name()
+        
+        if self.obj_dict['nodes'].has_key(name):
+        
+            if index is not None and index < len(self.obj_dict['nodes'][name]):
+                del self.obj_dict['nodes'][name][index]
+                return True
+            else:
+                del self.obj_dict['nodes'][name]
+                return True
+        
+        return False
+                        
+
     def get_node(self, name):
-        """Retrieved a node from the graph.
+        """Retrieve a node from the graph.
         
         Given a node's name the corresponding Node
         instance will be returned.
         
-        If multiple nodes exist with that name, a list of
+        If one or more nodes exist with that name a list of
         Node instances is returned.
-        If only one node exists, the instance is returned.
-        None is returned otherwise.
+        An empty list is returned otherwise.
         """
         
         match = list()
@@ -1179,14 +1340,11 @@
         
             match.extend( [ Node( obj_dict = obj_dict ) for obj_dict in self.obj_dict['nodes'][name] ])
         
-        if len(match)==1:
-            return match[0]
-            
         return match
 
 
     def get_nodes(self):
-        """Return an iterator."""
+        """Get the list of Node instances."""
         
         return self.get_node_list()
         
@@ -1200,7 +1358,7 @@
         
         node_objs = list()
         
-        for node, obj_dict_list in self.obj_dict['nodes'].items():
+        for node, obj_dict_list in self.obj_dict['nodes'].iteritems():
                 node_objs.extend( [ Node( obj_dict = obj_d ) for obj_d in obj_dict_list ] )
         
         return node_objs
@@ -1215,56 +1373,98 @@
         """
 
         if not isinstance(graph_edge, Edge):
-            raise TypeError('add_edge() received a non edge class object')
-            
+            raise TypeError('add_edge() received a non edge class object: ' + str(graph_edge))
+
         edge_points = ( graph_edge.get_source(), graph_edge.get_destination() )
 
         if self.obj_dict['edges'].has_key(edge_points):
-        
+
             edge_list = self.obj_dict['edges'][edge_points]
             edge_list.append(graph_edge.obj_dict)
-                
+
         else:
-        
+
             self.obj_dict['edges'][edge_points] = [ graph_edge.obj_dict ]
-         
+
+
         graph_edge.set_sequence( self.get_next_sequence_number() )
-        
+
         graph_edge.set_parent_graph( self.get_parent_graph() )
-            
-
-
-
-    def get_edge(self, src, dst):
+
+
+
+    def del_edge(self, src_or_list, dst=None, index=None):
+        """Delete an edge from the graph.
+        
+        Given an edge's (source, destination) node names all
+        matching edges(s) will be deleted if 'index' is not
+        specified or set to None.
+        If there are several matching edges and 'index' is
+        given, only the edge in that position will be deleted.
+        
+        'index' should be an integer specifying the position 
+        of the edge to delete. If index is larger than the
+        number of matching edges, no action is taken.
+        
+        If edges are deleted it returns True. If no action
+        is taken it returns False.
+        """
+
+        if isinstance( src_or_list, (list, tuple)):
+            if dst is not None and isinstance(dst, (int, long)):
+                index = dst
+            src, dst = src_or_list
+        else:
+            src, dst = src_or_list, dst
+    
+        if isinstance(src, Node):
+            src = src.get_name()
+
+        if isinstance(dst, Node):
+            dst = dst.get_name()
+        
+        if self.obj_dict['edges'].has_key( (src, dst) ):
+        
+            if index is not None and index < len(self.obj_dict['edges'][(src, dst)]):
+                del self.obj_dict['edges'][(src, dst)][index]
+                return True
+            else:
+                del self.obj_dict['edges'][(src, dst)]
+                return True
+        
+        return False
+        
+
+    def get_edge(self, src_or_list, dst=None):
         """Retrieved an edge from the graph.
         
         Given an edge's source and destination the corresponding
-        Edge instance will be returned.
+        Edge instance(s) will be returned.
         
-        If multiple edges exist with that source and destination,
+        If one or more edges exist with that source and destination
         a list of Edge instances is returned.
-        If only one edge exists, the instance is returned.
-        None is returned otherwise.
+        An empty list is returned otherwise.
         """
 
-        edge_points = (src, dst)
-        
+        if isinstance( src_or_list, (list, tuple)) and dst is None:
+            edge_points = tuple(src_or_list)
+            edge_points_reverse = (edge_points[1], edge_points[0])
+        else:
+            edge_points = (src_or_list, dst)
+            edge_points_reverse = (dst, src_or_list)
 
         match = list()
         
-        if self.obj_dict['edges'].has_key( (src, dst) ) or (
-            self.get_top_graph_type() == 'graph' and self.obj_dict['edges'].has_key( (dst, src) )):
+        if self.obj_dict['edges'].has_key( edge_points ) or (
+            self.get_top_graph_type() == 'graph' and self.obj_dict['edges'].has_key( edge_points_reverse )):
         
             edges_obj_dict = self.obj_dict['edges'].get(
-                (src, dst),
-                self.obj_dict['edges'].get( (dst, src), None ))
+                edge_points,
+                self.obj_dict['edges'].get( edge_points_reverse, None ))
         
             for edge_obj_dict in edges_obj_dict:
                 match.append( Edge( edge_points[0], edge_points[1], obj_dict = edge_obj_dict ) )
-        
-        if len(match)==1:
-            return match[0]
-            
+
         return match
 
 
@@ -1281,7 +1481,7 @@
         
         edge_objs = list()
         
-        for edge, obj_dict_list in self.obj_dict['edges'].items():
+        for edge, obj_dict_list in self.obj_dict['edges'].iteritems():
                 edge_objs.extend( [ Edge( obj_dict = obj_d ) for obj_d in obj_dict_list ] )
         
         return edge_objs
@@ -1296,7 +1496,7 @@
         """
 
         if not isinstance(sgraph, Subgraph) and not isinstance(sgraph, Cluster):
-            raise TypeError('add_subgraph() received a non subgraph class object')
+            raise TypeError('add_subgraph() received a non subgraph class object:' + str(sgraph))
             
         if self.obj_dict['subgraphs'].has_key(sgraph.get_name()):
         
@@ -1319,30 +1519,27 @@
         Given a subgraph's name the corresponding
         Subgraph instance will be returned.
         
-        If multiple subgraphs exist with the same name,	a list of
+        If one or more subgraphs exist with the same name, a list of
         Subgraph instances is returned.
-        If only one Subgraph exists, the instance is returned.
-        None is returned otherwise.
+        An empty list is returned otherwise.
         """
         
-        match = None
-        
-        if self.obj_dict['subgraphs'].has_key( sgraph.get_name() ):
-        
-            sgraphs_obj_dict = self.obj_dict['subgraphs'].get( sgraph.get_name() )
+        match = list()
+        
+        if self.obj_dict['subgraphs'].has_key( name ):
+        
+            sgraphs_obj_dict = self.obj_dict['subgraphs'].get( name )
         
             for obj_dict_list in sgraphs_obj_dict:
-                match = [ Subgraph( obj_dict = obj_d ) for obj_d in obj_dict_list ]
+                #match.extend( Subgraph( obj_dict = obj_d ) for obj_d in obj_dict_list )
+                match.append( Subgraph( obj_dict = obj_dict_list ) )
         
-        if len(match)==1:
-            return match[0]
-            
         return match
 
 
     def get_subgraphs(self):
     
-        return get_subgraph_list()
+        return self.get_subgraph_list()
         
         
     def get_subgraph_list(self):
@@ -1354,7 +1551,7 @@
         
         sgraph_objs = list()
         
-        for sgraph, obj_dict_list in self.obj_dict['subgraphs'].items():
+        for sgraph, obj_dict_list in self.obj_dict['subgraphs'].iteritems():
                 sgraph_objs.extend( [ Subgraph( obj_dict = obj_d ) for obj_d in obj_dict_list ] )
         
         return sgraph_objs
@@ -1365,15 +1562,15 @@
     
         self.obj_dict['parent_graph'] = parent_graph
         
-        for obj_list in self.obj_dict['nodes'].values():
-            for obj in obj_list:
-                obj['parent_graph'] = parent_graph
-
-        for obj_list in self.obj_dict['edges'].values():
-            for obj in obj_list:
-                obj['parent_graph'] = parent_graph
-
-        for obj_list in self.obj_dict['subgraphs'].values():
+        for obj_list in self.obj_dict['nodes'].itervalues():
+            for obj in obj_list:
+                obj['parent_graph'] = parent_graph
+
+        for obj_list in self.obj_dict['edges'].itervalues():
+            for obj in obj_list:
+                obj['parent_graph'] = parent_graph
+
+        for obj_list in self.obj_dict['subgraphs'].itervalues():
             for obj in obj_list:
                 Graph(obj_dict=obj).set_parent_graph(parent_graph)
 
@@ -1393,21 +1590,25 @@
             if self==self.get_parent_graph() and self.obj_dict['strict']:
             
                 graph.append('strict ')
-        
+
         if self.obj_dict['name'] == '':
-            graph.append( '{\n' )
+            if 'show_keyword' in self.obj_dict and self.obj_dict['show_keyword']:
+                graph.append( 'subgraph {\n' )
+            else:
+                graph.append( '{\n' )
         else:
             graph.append( '%s %s {\n' % (self.obj_dict['type'], self.obj_dict['name']) )
 
 
-        for attr in self.obj_dict['attributes'].keys():
+        for attr in self.obj_dict['attributes'].iterkeys():
         
             if self.obj_dict['attributes'].get(attr, None) is not None:
        
-                graph.append( '%s=' % attr )
                 val = self.obj_dict['attributes'].get(attr)
-                
-                graph.append( quote_if_necessary(val) )
+                if val is not None:
+                    graph.append( '%s=%s' % (attr, quote_if_necessary(val)) )
+                else:
+                    graph.append( attr )
                     
                 graph.append( ';\n' )
 
@@ -1415,7 +1616,7 @@
         edges_done = set()
         
         edge_obj_dicts = list()
-        for e in self.obj_dict['edges'].values():
+        for e in self.obj_dict['edges'].itervalues():
             edge_obj_dicts.extend(e)
             
         if edge_obj_dicts:
@@ -1425,11 +1626,11 @@
             edge_src_set, edge_dst_set = set(), set()
             
         node_obj_dicts = list()
-        for e in self.obj_dict['nodes'].values():
+        for e in self.obj_dict['nodes'].itervalues():
             node_obj_dicts.extend(e)
 
         sgraph_obj_dicts = list()
-        for sg in self.obj_dict['subgraphs'].values():
+        for sg in self.obj_dict['subgraphs'].itervalues():
             sgraph_obj_dicts.extend(sg)
 
         
@@ -1455,7 +1656,7 @@
 
                 edge = Edge(obj_dict=obj)
                 
-                if self.obj_dict.get('simplify', False) and elm in edges_done:
+                if self.obj_dict.get('simplify', False) and edge in edges_done:
                     continue
                 
                 graph.append( edge.to_string() + '\n' )
@@ -1496,8 +1697,10 @@
      
     or using the instance's attributes:
     
-     Subgraph.[attribute name], i.e.
-     	subgraph_instance.label, subgraph_instance.fontname
+     Subgraph.obj_dict['attributes'][attribute name], i.e. 
+     
+        subgraph_instance.obj_dict['attributes']['label']
+        subgraph_instance.obj_dict['attributes']['fontname']
     """
     
     
@@ -1541,8 +1744,10 @@
      
     or using the instance's attributes:
     
-     Cluster.[attribute name], i.e.
-     	cluster_instance.color, cluster_instance.fontname
+     Cluster.obj_dict['attributes'][attribute name], i.e. 
+     
+        cluster_instance.obj_dict['attributes']['label']
+        cluster_instance.obj_dict['attributes']['fontname']
     """
     
 
@@ -1557,6 +1762,8 @@
             self.obj_dict['type'] = 'subgraph'
             self.obj_dict['name'] = 'cluster_'+graph_name
 
+        self.create_attribute_methods(CLUSTER_ATTRIBUTES)
+
 
 
    
@@ -1603,23 +1810,19 @@
                 
             f = self.__dict__['write_'+frmt]
             f.__doc__ = '''Refer to the docstring accompanying the 'write' method for more information.'''
-
+        
+        
     
-            
     def __getstate__(self):
-
-        dict = copy.copy(self.__dict__)
-        for attr in self.attributes:
-            del dict['set_'+attr]
-            del dict['get_'+attr]
-   			
-        for k in [ x for x in dict.keys() if
-            x.startswith('write_') or  x.startswith('create_') ]:
-            
-            del dict[k]
-   
+        
+        dict = copy.copy(self.obj_dict)
+        
         return dict
     
+    def __setstate__(self, state):
+        
+        self.obj_dict = state
+        
     
     def set_shape_files(self, file_paths):
         """Add the paths of the required image files.
@@ -1691,7 +1894,19 @@
         
         dot_fd = file(path, "w+b")
         if format == 'raw':
-            dot_fd.write(self.to_string())
+            data = self.to_string()
+            if isinstance(data, basestring):
+                if not isinstance(data, unicode):
+                    try:
+                        data = unicode(data, 'utf-8')
+                    except:
+                        pass
+                        
+            try:
+                data = data.encode('utf-8')
+            except:
+                pass
+            dot_fd.write(data)
         else:
             dot_fd.write(self.create(prog, format))
         dot_fd.close()
@@ -1715,11 +1930,22 @@
             
         which are automatically defined for all the supported formats.
         [create_ps(), create_gif(), create_dia(), ...]
+        
+        If 'prog' is a list instead of a string the fist item is expected
+        to be the program name, followed by any optional command-line
+        arguments for it:
+        
+            [ 'twopi', '-Tdot', '-s10' ]
         """
         
         if prog is None:
             prog = self.prog
             
+        if isinstance(prog, (list, tuple)):
+            prog, args = prog[0], prog[1:]
+        else:
+            args = []
+            
         if self.progs is None:
             self.progs = find_graphviz()
             if self.progs is None:
@@ -1755,9 +1981,11 @@
             f = file( os.path.join( tmp_dir, os.path.basename(img) ), 'wb' )
             f.write(f_data)
             f.close()
-
+        
+        cmdline = [self.progs[prog], '-T'+format, tmp_name] + args
+        
         p = subprocess.Popen(
-            (self.progs[prog], '-T'+format, tmp_name),
+            cmdline,
             cwd=tmp_dir,
             stderr=subprocess.PIPE, stdout=subprocess.PIPE)
             
@@ -1772,8 +2000,7 @@
             stdout_output.append(data)
         stdout.close()
             
-        if stdout_output:
-            stdout_output = ''.join(stdout_output)
+        stdout_output = ''.join(stdout_output)
         
         if not stderr.closed:
             stderr_output = list()

=== removed file 'setup.cfg'
--- setup.cfg	2008-05-26 15:35:04 +0000
+++ setup.cfg	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-tag_svn_revision = 0
-

=== modified file 'setup.py'
--- setup.py	2008-05-26 15:35:04 +0000
+++ setup.py	2014-02-15 16:49:34 +0000
@@ -1,11 +1,15 @@
 #!/usr/bin/env python
 
 try:
+    from distutils.core import setup
+except ImportError, excp:
     from setuptools import setup
-except ImportError, excp:
-    from distutils.core import setup
     
 import pydot
+import os
+
+os.environ['COPY_EXTENDED_ATTRIBUTES_DISABLE'] = 'true'
+os.environ['COPYFILE_DISABLE'] = 'true'
 
 setup(	name = 'pydot',
     version = pydot.__version__,
@@ -28,4 +32,4 @@
     long_description = "\n".join(pydot.__doc__.split('\n')),
     py_modules = ['pydot', 'dot_parser'],
     install_requires = ['pyparsing', 'setuptools'],
-    data_files = [('.', ['ChangeLog', 'LICENSE', 'README'])] )
+    data_files = [('.', ['LICENSE', 'README'])] )