Changeset 35f995c

Timestamp:

Mar 23, 2017, 4:55:13 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, sampler

Children:

27fdf81

Parents:

38f3d04

Message:

this_version.py: always return a string, not unicode

Files:

• this_version.py (modified) (1 diff)
• wscript (modified) (2 diffs)

this_version.py

@@ -71 +71 @@
     if add_status and vdict['AUBIO_VERSION_STATUS']:
         verstr += vdict['AUBIO_VERSION_STATUS']
-    return verstr
+    return str(verstr)
 
 

wscript

@@ -426 +426 @@
         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}'
@@ -457 +457 @@
     # 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}`',