logilab/common

changeset 614:e9b4d22793f2

merge
author Sylvain Thenault <sylvain.thenault@logilab.fr>
date Wed, 20 Aug 2008 19:36:38 +0200
parents 009efd4d8011 8420d29eaadb
children 42c8cae57420 a972d8578916
files ChangeLog
diffstat 6 files changed, 23 insertions(+), 9 deletions(-) [+]
line diff
     1.1 --- a/.hgtags	Wed Aug 20 19:35:14 2008 +0200
     1.2 +++ b/.hgtags	Wed Aug 20 19:36:38 2008 +0200
     1.3 @@ -28,3 +28,5 @@
     1.4  cf354f801890c4d7d51c23c1a0721def94e954bb logilab-common-debian-version-0_32_0-1
     1.5  ece71bc8f823930b9de5449c082f787bd8b9ea90 logilab-common-version-0_33_0
     1.6  ed2becf2a5f5ee19b4c4e200a0a4ae08ca552c17 logilab-common-debian-version-0_33_0-1
     1.7 +0c5aef704be7ba995667d42ada315ef36b14e7fa logilab-common-version-0_34_0
     1.8 +01e2980c4f88dec4b4a50906db02519778f203c8 logilab-common-debian-version-0_34_0-1
     2.1 --- a/ChangeLog	Wed Aug 20 19:35:14 2008 +0200
     2.2 +++ b/ChangeLog	Wed Aug 20 19:36:38 2008 +0200
     2.3 @@ -4,6 +4,7 @@
     2.4    --
     2.5      * shellutils: new simple unzip function
     2.6  	
     2.7 +2008-08-07  --  0.34.0
     2.8      * changelog: properly adds new line at the end of each entry
     2.9  
    2.10      * testlib: add a with_tempdir decorator ensuring all temporary files and dirs are removed
     3.1 --- a/__pkginfo__.py	Wed Aug 20 19:35:14 2008 +0200
     3.2 +++ b/__pkginfo__.py	Wed Aug 20 19:36:38 2008 +0200
     3.3 @@ -8,7 +8,7 @@
     3.4  
     3.5  distname = 'logilab-common'
     3.6  modname = 'common'
     3.7 -numversion = (0, 33, 0)
     3.8 +numversion = (0, 34, 0)
     3.9  version = '.'.join([str(num) for num in numversion])
    3.10  
    3.11  license = 'GPL'
     4.1 --- a/clcommands.py	Wed Aug 20 19:35:14 2008 +0200
     4.2 +++ b/clcommands.py	Wed Aug 20 19:36:38 2008 +0200
     4.3 @@ -68,7 +68,7 @@
     4.4      except IndexError:
     4.5          raise BadCommandUsage(msg)
     4.6      if expected_size_after is not None and len(args_list) > expected_size_after:
     4.7 -        raise BadCommandUsage('Too much arguments')
     4.8 +        raise BadCommandUsage('too many arguments')
     4.9      return value
    4.10  
    4.11  
     5.1 --- a/debian/changelog	Wed Aug 20 19:35:14 2008 +0200
     5.2 +++ b/debian/changelog	Wed Aug 20 19:36:38 2008 +0200
     5.3 @@ -1,3 +1,9 @@
     5.4 +logilab-common (0.34.0-1) unstable; urgency=low
     5.5 +
     5.6 +  * new upstream release
     5.7 +
     5.8 + -- Nicolas Chauvat <nicolas.chauvat@logilab.fr>  Thu,  7 Aug 2008 19:15:00 +0200
     5.9 +
    5.10  logilab-common (0.33.0-1) unstable; urgency=low
    5.11  
    5.12    * new upstream release
     6.1 --- a/graph.py	Wed Aug 20 19:35:14 2008 +0200
     6.2 +++ b/graph.py	Wed Aug 20 19:36:38 2008 +0200
     6.3 @@ -12,6 +12,7 @@
     6.4  
     6.5  import os.path as osp
     6.6  import os
     6.7 +import tempfile
     6.8  
     6.9  def escape(value):
    6.10      """Make <value> usable in a dot file."""
    6.11 @@ -69,23 +70,27 @@
    6.12          :rtype: str
    6.13          :return: a path to the generated file
    6.14          """
    6.15 +        name = self.graphname
    6.16 +        dotfile = dotfile or ('%s.dot' % name)
    6.17          if outputfile is not None:
    6.18              storedir, basename, target = target_info_from_filename(outputfile)
    6.19 +            if target != "dot":
    6.20 +                pdot, dot_sourcepath = tempfile.mkstemp(".dot", name)
    6.21 +            else:
    6.22 +                dot_sourcepath = osp.join(storedir, dotfile)
    6.23          else:
    6.24 -            storedir = '/tmp'
    6.25 -            basename = '%s.png' % (self.graphname)
    6.26              target = 'png'
    6.27 -            outputfile = osp.join(storedir, basename)
    6.28 -        dotfile = dotfile or ('%s.dot' % self.graphname)
    6.29 -        dot_sourcepath = osp.join(storedir, dotfile)
    6.30 -        pdot = file(dot_sourcepath, 'w')
    6.31 +            pdot, dot_sourcepath = tempfile.mkstemp(".dot", name)
    6.32 +            ppng, outputfile = tempfile.mkstemp(".png", name)
    6.33 +        pdot = open(dot_sourcepath,'w')
    6.34          if isinstance(self.source, unicode):
    6.35              pdot.write(self.source.encode('UTF8'))
    6.36          else:
    6.37              pdot.write(self.source)
    6.38          pdot.close()
    6.39          if target != 'dot':
    6.40 -            os.system('%s -T%s %s -o%s' % (self.renderer, target, dot_sourcepath, outputfile))
    6.41 +            os.system('%s -T%s %s -o%s' % (self.renderer, target, 
    6.42 +                        dot_sourcepath, outputfile))
    6.43              os.unlink(dot_sourcepath)
    6.44          return outputfile
    6.45