Merge remote-tracking branch 'JacobSwanson/signature-repr-fix'

Author: jdavid

pygit2/_pygit2.pyi

@@ -506,15 +506,15 @@ class RevSpec:
     to_object: Object
 
 class Signature:
-    _encoding: str
+    _encoding: str | None
     _pointer: bytes
     email: str
     name: str
     offset: int
     raw_email: bytes
     raw_name: bytes
     time: int
-    def __init__(self, name: str, email: str, time: int, offset: int, encoding: str) -> None: ...
+    def __init__(self, name: str, email: str, time: int, offset: int, encoding: str | None) -> None: ...
     def __eq__(self, other) -> bool: ...
     def __ge__(self, other) -> bool: ...
     def __gt__(self, other) -> bool: ...

src/signature.c

@@ -45,12 +45,13 @@ Signature_init(Signature *self, PyObject *args, PyObject *kwds)
     int offset = 0;
 
     if (!PyArg_ParseTupleAndKeywords(
-            args, kwds, "Os|Lis", keywords,
+            args, kwds, "Os|Liz", keywords,
             &py_name, &email, &time, &offset, &encoding))
         return -1;
 
     PyObject *tname;
-    const char *name = pgit_borrow_encoding(py_name, encoding, NULL, &tname);
+    const char *name = pgit_borrow_encoding(
+        py_name, value_or_default(encoding, "utf-8"), NULL, &tname);
     if (name == NULL)
         return -1;
 
@@ -104,13 +105,10 @@ PyDoc_STRVAR(Signature__encoding__doc__, "Encoding.");
 PyObject *
 Signature__encoding__get__(Signature *self)
 {
-    const char *encoding;
+    if (self->encoding)
+        return to_encoding(self->encoding);
 
-    encoding = self->encoding;
-    if (encoding == NULL)
-        encoding = "utf-8";
-
-    return to_encoding(encoding);
+    Py_RETURN_NONE;
 }
 
 
@@ -199,7 +197,9 @@ Signature_richcompare(PyObject *a, PyObject *b, int op)
         strcmp(sa->signature->email, sb->signature->email) == 0 &&
         sa->signature->when.time == sb->signature->when.time &&
         sa->signature->when.offset == sb->signature->when.offset &&
-        sa->signature->when.sign == sb->signature->when.sign);
+        sa->signature->when.sign == sb->signature->when.sign &&
+        strcmp(value_or_default(sa->encoding, "utf-8"),
+               value_or_default(sb->encoding, "utf-8")) == 0);
 
     switch (op) {
         case Py_EQ:
@@ -239,7 +239,13 @@ Signature__repr__(Signature *self)
     PyObject *name, *email, *encoding, *str;
     name = to_unicode(self->signature->name, self->encoding, NULL);
     email = to_unicode(self->signature->email, self->encoding, NULL);
-    encoding = to_unicode(self->encoding, self->encoding, NULL);
+
+    if (self->encoding) {
+        encoding = to_unicode(self->encoding, self->encoding, NULL);
+    } else {
+        encoding = Py_None;
+    }
+
     str = PyUnicode_FromFormat(
         "pygit2.Signature(%R, %R, %lld, %ld, %R)",
         name,

src/utils.h

@@ -84,6 +84,8 @@ to_unicode_n(const char *value, size_t len, const char *encoding,
     return PyUnicode_Decode(value, len, encoding, errors);
 }
 
+#define value_or_default(x, _default) ((x) == NULL ? (_default) : (x))
+
 const char* pgit_borrow(PyObject *value);
 const char* pgit_borrow_encoding(PyObject *value, const char *encoding, const char *errors, PyObject **tvalue);
 char* pgit_encode(PyObject *value, const char *encoding);

test/test_commit.py

@@ -142,8 +142,10 @@ def test_amend_commit_metadata(barerepo):
 
     encoding = 'iso-8859-1'
     amended_message = "Amended commit message.\n\nMessage with non-ascii chars: ééé.\n"
-    amended_author = Signature('Jane Author', '[email protected]', 12345, 0)
-    amended_committer = Signature('John Committer', '[email protected]', 12346, 0)
+    amended_author = Signature(
+        'Jane Author', '[email protected]', 12345, 0, encoding=encoding)
+    amended_committer = Signature(
+        'John Committer', '[email protected]', 12346, 0, encoding=encoding)
 
     amended_oid = repo.amend_commit(
         commit, 'HEAD', message=amended_message, author=amended_author,

test/test_signature.py

@@ -54,6 +54,14 @@ def test_latin1():
     assert signature.email == signature.raw_email.decode(encoding)
     assert signature.email.encode(encoding) == signature.raw_email
 
+def test_none():
+    signature = Signature('Foo Ibáñez', '[email protected]', encoding=None)
+    assert signature._encoding is None
+    assert signature.name == signature.raw_name.decode('utf-8')
+    assert signature.name.encode('utf-8') == signature.raw_name
+    assert signature.email == signature.raw_email.decode('utf-8')
+    assert signature.email.encode('utf-8') == signature.raw_email
+
 def test_now():
     encoding = 'utf-8'
     signature = Signature(
@@ -75,3 +83,15 @@ def test_repr():
     expected_signature = \
         "pygit2.Signature('Foo Ibáñez', '[email protected]', 1322174594, 60, 'utf-8')"
     assert repr(signature) == expected_signature
+
+def test_repr_from_commit(barerepo):
+    repo = barerepo
+    signature = Signature('Foo Ibáñez', '[email protected]', encoding=None)
+    tree = '967fce8df97cc71722d3c2a5930ef3e6f1d27b12'
+    parents = ['5fe808e8953c12735680c257f56600cb0de44b10']
+    sha = repo.create_commit(
+        None, signature, signature, 'New commit.', tree, parents)
+    commit = repo[sha]
+
+    assert repr(signature) == repr(commit.author)
+    assert repr(signature) == repr(commit.committer)