shithub: aubio

Info  •  Files  •  Log  •  Branches

this_version.py: always return a string, not unicode

--- a/this_version.py

+++ b/this_version.py

@@ -70,7 +70,7 @@

     verstr = '%s.%s.%s' % get_aubio_version_tuple()

     if add_status and vdict['AUBIO_VERSION_STATUS']:

         verstr += vdict['AUBIO_VERSION_STATUS']

-    return verstr

+    return str(verstr)

 def get_aubio_pyversion(add_status=True):

--- a/wscript

+++ b/wscript

@@ -425,7 +425,7 @@

         from waflib import TaskGen

         if 'MANDIR' not in bld.env:

             bld.env['MANDIR'] = bld.env['DATAROOTDIR'] + '/man'

-        bld.env.VERSION = str(VERSION)

+        bld.env.VERSION = VERSION

         rule_str = '${TXT2MAN} -t `basename ${TGT} | cut -f 1 -d . | tr a-z A-Z`'

         rule_str += ' -r ${PACKAGE}\\ ${VERSION} -P ${PACKAGE}'

         rule_str += ' -v ${PACKAGE}\\ User\\\'s\\ manual'

@@ -456,7 +456,7 @@

     # build documentation from source files using sphinx-build

     # note: build in ../doc/_build/html, otherwise waf wont install unsigned files

     if bld.env['SPHINX']:

-        bld.env.VERSION = str(VERSION)

+        bld.env.VERSION = VERSION

         bld( name = 'sphinx',

                 rule = '${SPHINX} -b html -D release=${VERSION} -D version=${VERSION} -a -q `dirname ${SRC}` `dirname ${TGT}`',

                 source = 'doc/conf.py',