projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
feb24ad
)
Python 3 fix for wscript.
author
Carl Hetherington
<cth@carlh.net>
Wed, 23 May 2018 20:08:20 +0000
(21:08 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 23 May 2018 20:08:20 +0000
(21:08 +0100)
wscript
patch
|
blob
|
history
diff --git
a/wscript
b/wscript
index 62bbb141345a60d2188afd6ce5c9e59d0acfdc7d..824cfa9dc4a3bc7b8f800c137db5bee581caf7fe 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-24,7
+24,12
@@
import sys
import glob
import distutils
import distutils.spawn
import glob
import distutils
import distutils.spawn
-import urllib
+try:
+ # python 2
+ from urllib import urlencode
+except ImportError:
+ # python 3
+ from urllib.parse import urlencode
from waflib import Logs, Context
APPNAME = 'dcpomatic'
from waflib import Logs, Context
APPNAME = 'dcpomatic'
@@
-603,7
+608,7
@@
def configure(conf):
def download_supporters():
last_date = subprocess.Popen(shlex.split('git log -1 --format=%%ai %s' % last_version), stdout=subprocess.PIPE).communicate()[0]
def download_supporters():
last_date = subprocess.Popen(shlex.split('git log -1 --format=%%ai %s' % last_version), stdout=subprocess.PIPE).communicate()[0]
- os.system('curl https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % url
lib.url
encode({"until": last_date.strip()}))
+ os.system('curl https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urlencode({"until": last_date.strip()}))
def build(bld):
create_version_cc(VERSION, bld.env.CXXFLAGS)
def build(bld):
create_version_cc(VERSION, bld.env.CXXFLAGS)