| 1 | diff --git a/waflib/Context.py b/waflib/Context.py
|
| 2 | index 77f310e..2c00cfc 100644
|
| 3 | |
| 4 | |
| 5 | @@ -2,7 +2,7 @@
|
| 6 | # encoding: utf-8
|
| 7 | # WARNING! Do not edit! https://waf.io/book/index.html#_obtaining_the_waf_file
|
| 8 |
|
| 9 | -import os,re,imp,sys
|
| 10 | +import os,re,types,sys
|
| 11 | from waflib import Utils,Errors,Logs
|
| 12 | import waflib.Node
|
| 13 | HEXVERSION=0x1090300
|
| 14 | @@ -338,7 +338,7 @@ def load_module(path,encoding=None):
|
| 15 | return cache_modules[path]
|
| 16 | except KeyError:
|
| 17 | pass
|
| 18 | - module=imp.new_module(WSCRIPT_FILE)
|
| 19 | + module=types.ModuleType(WSCRIPT_FILE)
|
| 20 | try:
|
| 21 | code=Utils.readf(path,m='r',encoding=encoding)
|
| 22 | except EnvironmentError:
|
| 23 | diff --git a/wscript b/wscript
|
| 24 | index fd4dcea..bdac47b 100644
|
| 25 | |
| 26 | |
| 27 | @@ -43,13 +43,13 @@ def options(opt):
|
| 28 | opt.load('compiler_c')
|
| 29 | opt.load('compiler_cxx')
|
| 30 |
|
| 31 | - opt.add_option('--with-flavors', type = 'string', action='callback',
|
| 32 | + opt.add_option('--with-flavors', type = 'str', action='callback',
|
| 33 | callback=option_list_cb,
|
| 34 | dest = 'flavors',
|
| 35 | help = "a list of flavors to build (%s, all-linux (except dispmanx-glesv2), all-win32)" % FLAVORS_STR)
|
| 36 | opt.parser.set_default('flavors', [])
|
| 37 |
|
| 38 | - opt.parser.add_option('--version-suffix', type='string', action='store', dest='versionsuffix',
|
| 39 | + opt.parser.add_option('--version-suffix', type='str', action='store', dest='versionsuffix',
|
| 40 | default='', help='add a suffix to the version number')
|
| 41 |
|
| 42 | opt.add_option('--no-debug', action='store_false', dest = 'debug',
|