let PyEval_GetBuiltins return attrwrapper

src/runtime/builtin_modules/builtins.cpp

@@ -1462,7 +1462,7 @@ extern "C" BORROWED(PyObject*) PyEval_GetGlobals(void) noexcept {
 }
 
 extern "C" BORROWED(PyObject*) PyEval_GetBuiltins(void) noexcept {
-    return builtins_module;
+    return builtins_module->getAttrWrapper();
 }
 
 Box* ellipsisRepr(Box* self) {

src/runtime/types.cpp

@@ -2990,9 +2990,7 @@ static PyObject* object_new(PyTypeObject* type, PyObject* args, PyObject* kwds)
         builtins = PyEval_GetBuiltins();
         if (builtins == NULL)
             goto error;
-        // Pyston change: builtins is a module not a dict
-        // sorted = PyDict_GetItemString(builtins, "sorted");
-        sorted = builtins->getattr(autoDecref(internStringMortal("sorted")));
+        sorted = PyDict_GetItemString(builtins, "sorted");
         if (sorted == NULL)
             goto error;
         sorted_methods = PyObject_CallFunctionObjArgs(sorted, abstract_methods, NULL);