Skip to content

env must be bytes not unicode #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2015
Merged

env must be bytes not unicode #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mog_commons/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.1.11'
__version__ = '0.1.12'
12 changes: 9 additions & 3 deletions src/mog_commons/command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ def __convert_args(args, shell, cmd_encoding):
return xs, shell and not workaround


def __convert_env(env, encoding):
"""Environment variables should be bytes not unicode on Windows."""
d = dict(os.environ, **(oget(env, {})))
return dict((k.encode(encoding), v.encode(encoding)) for k, v in d.items())


def execute_command(args, shell=False, cwd=None, env=None, stdin=None, stdout=None, stderr=None, cmd_encoding='utf-8'):
"""
Execute external command
Expand All @@ -48,7 +54,7 @@ def execute_command(args, shell=False, cwd=None, env=None, stdin=None, stdout=No
:return: return code
"""
args, shell = __convert_args(args, shell, cmd_encoding)
return subprocess.call(args=args, shell=shell, cwd=cwd, env=dict(os.environ, **(oget(env, {}))),
return subprocess.call(args=args, shell=shell, cwd=cwd, env=__convert_env(env, cmd_encoding),
stdin=stdin, stdout=stdout, stderr=stderr)


Expand All @@ -65,7 +71,7 @@ def capture_command(args, shell=False, cwd=None, env=None, stdin=None, cmd_encod
"""
args, shell = __convert_args(args, shell, cmd_encoding)
p = subprocess.Popen(
args, shell=shell, cwd=cwd, env=dict(os.environ, **(oget(env, {}))),
args, shell=shell, cwd=cwd, env=__convert_env(env, cmd_encoding),
stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout_data, stderr_data = p.communicate()
return p.returncode, stdout_data, stderr_data
Expand All @@ -79,7 +85,7 @@ def execute_command_with_pid(args, pid_file=None, shell=False, cwd=None, env=Non
try:
args, shell = __convert_args(args, shell, cmd_encoding)
p = subprocess.Popen(
args, shell=shell, cwd=cwd, env=dict(os.environ, **(oget(env, {}))),
args, shell=shell, cwd=cwd, env=__convert_env(env, cmd_encoding),
stdin=stdin, stdout=stdout, stderr=stderr)
with open(pid_file, 'w') as f:
f.write(str(p.pid))
Expand Down