From 3cd862b4240685bdee7e7711797880c5ba797fe3 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Nov 28 2016 15:05:32 +0000 Subject: Drop the encoding of the email and name in the Signature when committing --- diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 5b70118..410d297 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -792,8 +792,8 @@ def add_file_to_git(repo, issue, ticketfolder, user, filename, filestream): # Author/commiter will always be this one author = pygit2.Signature( - name=user.username.encode('utf-8'), - email=user.default_email.encode('utf-8') + name=user.username, + email=user.email ) # Actually commit @@ -884,8 +884,8 @@ def update_file_in_git( # Author/commiter will always be this one author = pygit2.Signature( - name=user.fullname.encode('utf-8'), - email=email.encode('utf-8') + name=user.fullname, + email=email ) # Actually commit @@ -1192,8 +1192,8 @@ def merge_pull_request( tree = new_repo.index.write_tree() user_obj = pagure.lib.get_user(session, username) author = pygit2.Signature( - user_obj.fullname.encode('utf-8'), - user_obj.default_email.encode('utf-8')) + user_obj.fullname, + user_obj.default_email) commit = new_repo.create_commit( 'refs/heads/%s' % request.branch, author, @@ -1229,8 +1229,8 @@ def merge_pull_request( head = new_repo.lookup_reference('HEAD').get_object() user_obj = pagure.lib.get_user(session, username) author = pygit2.Signature( - user_obj.fullname.encode('utf-8'), - user_obj.default_email.encode('utf-8')) + user_obj.fullname, + user_obj.default_email) commit = new_repo.create_commit( 'refs/heads/%s' % request.branch, author,