From b0676719a5917078f85a7861d9c0be01aa076044 Mon Sep 17 00:00:00 2001 From: Simon Forman Date: Sat, 16 May 2020 09:52:56 -0700 Subject: [PATCH] Python 3. --- joy/gui/init_joy_home.py | 2 +- joy/gui/utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/joy/gui/init_joy_home.py b/joy/gui/init_joy_home.py index ed4b1c6..103e8f8 100644 --- a/joy/gui/init_joy_home.py +++ b/joy/gui/init_joy_home.py @@ -29,7 +29,7 @@ def create_data(from_dir='./default_joy_home'): return base64.encodestring(f.getvalue()) -Z = zipfile.ZipFile(io.BytesIO(base64.decodestring('''\ +Z = zipfile.ZipFile(io.BytesIO(base64.decodestring(b'''\ UEsDBBQAAAAAAJKh9Uw/yHAgFQQAABUEAAALAAAAc2NyYXRjaC50eHRyZXNldF9sb2cgd29yZHMg bW91c2VfYmluZGluZ3Mga2V5X2JpbmRpbmdzCgpTdGFjayBDaGF0dGVyCgogZHVwIGR1cGQgZHVw ZGQgb3ZlciB0dWNrCiBwb3AgcG9wZCBwb3BkZCBwb3BvcCBwb3BvcGQgcG9wb3BkZAogc3dhcCBy diff --git a/joy/gui/utils.py b/joy/gui/utils.py index 2df86c9..01b95d7 100644 --- a/joy/gui/utils.py +++ b/joy/gui/utils.py @@ -8,7 +8,7 @@ from dulwich.errors import NotGitRepository from dulwich.repo import Repo -COMMITTER = 'Joy ' +COMMITTER = b'Joy ' DEFAULT_JOY_HOME = expanduser(join('~', '.joypy')) @@ -66,7 +66,7 @@ def init_repo(repo_dir): import joy.gui.init_joy_home joy.gui.init_joy_home.initialize(repo_dir) repo.stage([fn for fn in listdir(repo_dir) if isfile(join(repo_dir, fn))]) - repo.do_commit('Initial commit.', committer=COMMITTER) + repo.do_commit(b'Initial commit.', committer=COMMITTER) return repo