Remove old code for 3.5 compat

libgit2 · Oct 15, 2020 · da8e114 · da8e114
1 parent e57dd6e
commit da8e114
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/utils.c b/src/utils.c
@@ -75,15 +75,15 @@ pgit_borrow_encoding(PyObject *value, const char *encoding, PyObject **tvalue)
     PyObject *py_value = NULL;
     PyObject *py_str = NULL;
 
-#if defined(HAS_FSPATH_SUPPORT)
+#if defined(PYPY_VERSION) && PYPY_VERSION_NUM < 0x07030000
+    py_value = value;
+    Py_INCREF(value);
+#else
     py_value = PyOS_FSPath(value);
     if (py_value == NULL) {
         Error_type_error("unexpected %.200s", value);
         return NULL;
     }
-#else
-    py_value = value;
-    Py_INCREF(value);
 #endif
 
     // Get new PyBytes reference from value

diff --git a/src/utils.h b/src/utils.h
@@ -39,10 +39,6 @@
 #  define PYGIT2_FN_UNUSED
 #endif
 
-#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 6 && (!defined(PYPY_VERSION) || PYPY_VERSION_NUM >= 0x07030000)
-#define HAS_FSPATH_SUPPORT
-#endif
-
 #define to_path(x) to_unicode(x, Py_FileSystemDefaultEncoding, "strict")
 #define to_encoding(x) PyUnicode_DecodeASCII(x, strlen(x), "strict")