From 4c31eea6ddc6bb64bcf4f72687a73715818b1ce8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 23 May 2018 21:08:20 +0100 Subject: Python 3 fix for wscript. --- wscript | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 62bbb1413..824cfa9dc 100644 --- a/wscript +++ b/wscript @@ -24,7 +24,12 @@ import sys 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' @@ -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] - os.system('curl https://dcpomatic.com/supporters.cc?%s > src/wx/supporters.cc' % urllib.urlencode({"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) -- cgit v1.2.3