From 82dd3aa3a2d6295e7149383c47b1660049d846b8 Mon Sep 17 00:00:00 2001 From: Scott Searcy Date: Wed, 27 Apr 2016 17:56:32 -0700 Subject: [PATCH 1/2] Unicode fix for Python 2/3 based on https://github.com/nvie/pip-tools/commit/3a439045c71851151c51953b79f5994d3a12d9fe --- bumpversion/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bumpversion/__init__.py b/bumpversion/__init__.py index 757e4f7..273c7dc 100644 --- a/bumpversion/__init__.py +++ b/bumpversion/__init__.py @@ -72,7 +72,7 @@ def commit(cls, message): f.write(message.encode('utf-8')) f.close() subprocess.check_output(cls._COMMIT_COMMAND + [f.name], env=dict( - list(os.environ.items()) + [(b'HGENCODING', b'utf-8')] + list(os.environ.items()) + [(str('HGENCODING'), str('utf-8'))] )) os.unlink(f.name) From 4c9b782d369cded4cda9231e0304a1f10f58b8e3 Mon Sep 17 00:00:00 2001 From: Scott Searcy Date: Wed, 27 Apr 2016 22:08:54 -0700 Subject: [PATCH 2/2] Updated environment string for test cases. --- tests/test_cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_cli.py b/tests/test_cli.py index 4d03806..c060193 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -21,7 +21,7 @@ split_args_in_optional_and_positional SUBPROCESS_ENV = dict( - list(environ.items()) + [(b'HGENCODING', b'utf-8')] + list(environ.items()) + [(str('HGENCODING'), str('utf-8'))] ) call = partial(subprocess.call, env=SUBPROCESS_ENV)