x/urfave-cli
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Attempt to better handle python(2|3) tempfile differences

Browse Source
This commit is contained in:
Dan Buch 2017-08-12 22:20:50 -04:00
parent 1505b9f046
commit d83210ca77
Signed by: meatballhat
GPG Key ID: 9685130D8B763EA7
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
generate-flag-types
View File

@ -68,6 +68,9 @@ import tempfile
import textwrap import textwrap
_PY3 = sys.version_info.major == 3
class _FancyFormatter(argparse.ArgumentDefaultsHelpFormatter, class _FancyFormatter(argparse.ArgumentDefaultsHelpFormatter,
argparse.RawDescriptionHelpFormatter): argparse.RawDescriptionHelpFormatter):
pass pass
@ -104,9 +107,7 @@ def main(sysargs=sys.argv[:]):
def _generate_flag_types(writefunc, output_go, input_json): def _generate_flag_types(writefunc, output_go, input_json):
types = json.load(input_json) types = json.load(input_json)
tmp = tempfile.NamedTemporaryFile( tmp = _get_named_tmp_go()
suffix='.go', mode='w', delete=False, encoding='utf-8'
)
writefunc(tmp, types) writefunc(tmp, types)
tmp.close() tmp.close()
@ -119,6 +120,13 @@ def _generate_flag_types(writefunc, output_go, input_json):
os.remove(tmp.name) os.remove(tmp.name)
def _get_named_tmp_go():
tmp_args = dict(suffix='.go', mode='w', delete=False)
if _PY3:
tmp_args['encoding'] = 'utf-8'
return tempfile.NamedTemporaryFile(**tmp_args)
def _set_typedef_defaults(typedef): def _set_typedef_defaults(typedef):
typedef.setdefault('doctail', '') typedef.setdefault('doctail', '')
typedef.setdefault('context_type', typedef['type']) typedef.setdefault('context_type', typedef['type'])

9
runtests
View File

@ -13,6 +13,7 @@ import tempfile
from subprocess import check_call, check_output from subprocess import check_call, check_output
_PY3 = sys.version_info.major == 3
_WINDOWS = platform.system().lower() == 'windows' _WINDOWS = platform.system().lower() == 'windows'
_PACKAGE_NAME = os.environ.get( _PACKAGE_NAME = os.environ.get(
'CLI_PACKAGE_NAME', 'github.com/urfave/cli' 'CLI_PACKAGE_NAME', 'github.com/urfave/cli'
@ -148,9 +149,11 @@ def _go_version():
def _combine_coverprofiles(coverprofiles): def _combine_coverprofiles(coverprofiles):
combined = tempfile.NamedTemporaryFile( tmp_args = dict(suffix='.coverprofile', delete=False)
suffix='.coverprofile', delete=False if _PY3:
) tmp_args['encoding'] = 'utf-8'
combined = tempfile.NamedTemporaryFile(**tmp_args)
combined.write(b'mode: set\n') combined.write(b'mode: set\n')
for coverprofile in coverprofiles: for coverprofile in coverprofiles: