Commits

Mark Story committed ab44f8b Merge

Merge with upstream

Comments (0)

Files changed (16)

 5a9f42f9f6247630920c3c9ba7ca713a6c64901e nwdiag-0.5.0
 da27292b23b4ef4d23ea3f6bf50bffbd5546fb87 doxylink-1.3
 7d3315a99d45b02685635cfd59a02ce6e987c002 slide-0.1.1
+586d484bcd1790f65078ad1ea0eb0f9dbddc8817 actdiag-0.5.0
+586d484bcd1790f65078ad1ea0eb0f9dbddc8817 blockdiag-1.2.0
+586d484bcd1790f65078ad1ea0eb0f9dbddc8817 nwdiag-0.6.0
+586d484bcd1790f65078ad1ea0eb0f9dbddc8817 seqdiag-0.5.0
 This module needs actdiag_.
 '''
 
-requires = ['actdiag>=0.3.0', 'Sphinx>=0.6']
+requires = ['actdiag>=0.4.0', 'Sphinx>=0.6', 'setuptools']
 
 setup(
     name='sphinxcontrib-actdiag',
-    version='0.4.3',
+    version='0.5.0',
     url='http://bitbucket.org/birkenfeld/sphinx-contrib',
     download_url='http://pypi.python.org/pypi/sphinxcontrib-actdiag',
     license='BSD',

actdiag/sphinxcontrib/actdiag.py

 import re
 import os
 import codecs
+import traceback
 try:
     from hashlib import sha1 as sha
 except ImportError:
         draw = drawer.DiagramDraw(format, screen, filename,
                                   fontmap=fontmap, antialias=antialias)
     except Exception, e:
+        if self.builder.config.actdiag_debug:
+            traceback.print_exc()
+
         raise ActdiagError('actdiag error:\n%s\n' % e)
 
     return draw
     app.add_config_value('actdiag_fontpath', None, 'html')
     app.add_config_value('actdiag_fontmap', None, 'html')
     app.add_config_value('actdiag_antialias', False, 'html')
+    app.add_config_value('actdiag_debug', False, 'html')
     app.add_config_value('actdiag_html_image_format', 'PNG', 'html')
     app.add_config_value('actdiag_tex_image_format', 'PNG', 'html')
     app.connect("doctree-resolved", on_doctree_resolved)

autorun/sphinxcontrib/autorun.py

         # Process output 
         if stdout:
             out = ''.join(stdout).decode(output_encoding)
-        else:
+        if stderr:
             out = ''.join(stderr).decode(output_encoding)
         
         # Get the original code with prefixes

blockdiag/setup.py

 This module needs blockdiag_.
 '''
 
-requires = ['blockdiag>=1.1.0', 'Sphinx>=0.6']
+requires = ['blockdiag>=1.2.0', 'Sphinx>=0.6', 'setuptools']
 
 setup(
     name='sphinxcontrib-blockdiag',
-    version='1.1.2',
+    version='1.2.0',
     url='http://bitbucket.org/birkenfeld/sphinx-contrib',
     download_url='http://pypi.python.org/pypi/sphinxcontrib-blockdiag',
     license='BSD',

blockdiag/sphinxcontrib/blockdiag.py

 import re
 import os
 import codecs
+import traceback
 try:
     from hashlib import sha1 as sha
 except ImportError:
                                   fontmap=fontmap, antialias=antialias)
 
     except Exception, e:
+        if self.builder.config.blockdiag_debug:
+            traceback.print_exc()
+
         raise BlockdiagError('blockdiag error:\n%s\n' % e)
 
     return draw
     app.add_config_value('blockdiag_fontpath', None, 'html')
     app.add_config_value('blockdiag_fontmap', None, 'html')
     app.add_config_value('blockdiag_antialias', False, 'html')
+    app.add_config_value('blockdiag_debug', False, 'html')
     app.add_config_value('blockdiag_html_image_format', 'PNG', 'html')
     app.add_config_value('blockdiag_tex_image_format', 'PNG', 'html')
     app.connect("doctree-resolved", on_doctree_resolved)

googlechart/setup.py

 
 '''
 
-requires = ['Sphinx>=0.6', 'funcparserlib']
+requires = ['Sphinx>=0.6', 'funcparserlib', 'setuptools']
 
 setup(
     name='sphinxcontrib-googlechart',

googlemaps/setup.py

 .. _Google Maps: http://maps.google.com/
 '''
 
-requires = ['Sphinx>=0.6']
+requires = ['Sphinx>=0.6', 'setuptools']
 
 setup(
     name='sphinxcontrib-googlemaps',

nicovideo/setup.py

 .. add description here ..
 '''
 
-requires = ['Sphinx>=0.6']
+requires = ['Sphinx>=0.6', 'setuptools']
 
 setup(
     name='sphinxcontrib-nicovideo',
 This module needs nwdiag_.
 '''
 
-requires = ['nwdiag>=0.8.1', 'Sphinx>=0.6']
+requires = ['nwdiag>=0.9.0', 'Sphinx>=0.6', 'setuptools']
 
 setup(
     name='sphinxcontrib-nwdiag',
-    version='0.5.0',
+    version='0.6.0',
     url='http://bitbucket.org/birkenfeld/sphinx-contrib',
     download_url='http://pypi.python.org/pypi/sphinxcontrib-nwdiag',
     license='BSD',

nwdiag/sphinxcontrib/nwdiag.py

 import posixpath
 import os
 import codecs
+import traceback
 try:
     from hashlib import sha1 as sha
 except ImportError:
         draw = drawer.DiagramDraw(format, screen, filename,
                                   fontmap=fontmap, antialias=antialias)
     except Exception, e:
+        if self.builder.config.nwdiag_debug:
+            traceback.print_exc()
+
         raise NwdiagError('nwdiag error:\n%s\n' % e)
 
     return draw
     app.add_config_value('nwdiag_fontpath', None, 'html')
     app.add_config_value('nwdiag_fontmap', None, 'html')
     app.add_config_value('nwdiag_antialias', False, 'html')
+    app.add_config_value('nwdiag_debug', False, 'html')
     app.add_config_value('nwdiag_html_image_format', 'PNG', 'html')
     app.add_config_value('nwdiag_tex_image_format', 'PNG', 'html')
     app.connect("doctree-resolved", on_doctree_resolved)

nwdiag/sphinxcontrib/packetdiag.py

 import posixpath
 import os
 import codecs
+import traceback
 try:
     from hashlib import sha1 as sha
 except ImportError:
         draw = drawer.DiagramDraw(format, screen, filename,
                                   fontmap=fontmap, antialias=antialias)
     except Exception, e:
+        if self.builder.config.packetdiag_debug:
+            traceback.print_exc()
+
         raise PacketdiagError('packetdiag error:\n%s\n' % e)
 
     return draw
     app.add_config_value('packetdiag_fontpath', None, 'html')
     app.add_config_value('packetdiag_fontmap', None, 'html')
     app.add_config_value('packetdiag_antialias', False, 'html')
+    app.add_config_value('packetdiag_debug', False, 'html')
     app.add_config_value('packetdiag_html_image_format', 'PNG', 'html')
     app.add_config_value('packetdiag_tex_image_format', 'PNG', 'html')
     app.connect("doctree-resolved", on_doctree_resolved)

nwdiag/sphinxcontrib/rackdiag.py

 import posixpath
 import os
 import codecs
+import traceback
 try:
     from hashlib import sha1 as sha
 except ImportError:
         draw = drawer.DiagramDraw(format, screen, filename,
                                   fontmap=fontmap, antialias=antialias)
     except Exception, e:
+        if self.builder.config.rackdiag_debug:
+            traceback.print_exc()
+
         raise RackdiagError('rackdiag error:\n%s\n' % e)
 
     return draw
     app.add_config_value('rackdiag_fontpath', None, 'html')
     app.add_config_value('rackdiag_fontmap', None, 'html')
     app.add_config_value('rackdiag_antialias', False, 'html')
+    app.add_config_value('rackdiag_debug', False, 'html')
     app.add_config_value('rackdiag_html_image_format', 'PNG', 'html')
     app.add_config_value('rackdiag_tex_image_format', 'PNG', 'html')
     app.connect("doctree-resolved", on_doctree_resolved)
 This module needs seqdiag_.
 '''
 
-requires = ['seqdiag>=0.7.0', 'Sphinx>=0.6']
+requires = ['seqdiag>=0.8.0', 'Sphinx>=0.6', 'setuptools']
 
 setup(
     name='sphinxcontrib-seqdiag',
-    version='0.4.2',
+    version='0.5.0',
     url='http://bitbucket.org/birkenfeld/sphinx-contrib',
     download_url='http://pypi.python.org/pypi/sphinxcontrib-seqdiag',
     license='BSD',

seqdiag/sphinxcontrib/seqdiag.py

 import posixpath
 import os
 import codecs
+import traceback
 try:
     from hashlib import sha1 as sha
 except ImportError:
         draw = drawer.DiagramDraw(format, screen, filename,
                                   fontmap=fontmap, antialias=antialias)
     except Exception, e:
+        if self.builder.config.seqdiag_debug:
+            traceback.print_exc()
+
         raise SeqdiagError('seqdiag error:\n%s\n' % e)
 
     return draw
     app.add_config_value('seqdiag_fontpath', None, 'html')
     app.add_config_value('seqdiag_fontmap', None, 'html')
     app.add_config_value('seqdiag_antialias', False, 'html')
+    app.add_config_value('seqdiag_debug', False, 'html')
     app.add_config_value('seqdiag_html_image_format', 'PNG', 'html')
     app.add_config_value('seqdiag_tex_image_format', 'PNG', 'html')
     app.connect("doctree-resolved", on_doctree_resolved)
 .. _slideshare: http://www.slideshare.net/
 '''
 
-requires = ['Sphinx>=0.6']
+requires = ['Sphinx>=0.6', 'setuptools']
 
 setup(
     name='sphinxcontrib-slide',