Skip to content

Commit 141eecb

Browse files
author
4b796c65
committed
A quick fix with string decoding.
1 parent d17263d commit 141eecb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ def getVersion():
1212
REVISION = None
1313
if os.path.exists('.svn'): # if .svn/ doesn't even exist, don't bother running svnversion
1414
svnversion = subprocess.Popen('svnversion -n', shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
15-
REVISION = svnversion.communicate()[0] # get stdout
16-
15+
REVISION = svnversion.communicate()[0].decode() # get stdout
16+
print(REVISION)
1717
if not REVISION or not any([c.isdigit() for c in REVISION]):
1818
# no numbers so assume an error
1919
# but likely a real user install, so get version from file
2020
VERSION = open('tdl/VERSION', 'r').read()
2121
return VERSION
2222
# building on the svn, save version in a file for user installs
23-
if b':' in REVISION:
24-
REVISION = REVISION.split(b':')[-1] # take "latest" revision, I think
25-
REVISION = b''.join((c for c in REVISION if c.isdigit())) # remove letters
23+
if ':' in REVISION:
24+
REVISION = REVISION.split(':')[-1] # take "latest" revision, I think
25+
REVISION = ''.join((c for c in REVISION if c.isdigit())) # remove letters
2626
VERSION = '1.0r%s' % REVISION
2727
open('tdl/VERSION', 'w').write(VERSION)
2828
return VERSION

tdl/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0r16
1+
1.0r19

0 commit comments

Comments
 (0)