python · codypiersall · Sep 16, 2017 · Sep 18, 2017 · Sep 18, 2017
diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py
@@ -221,16 +221,12 @@ def test_6(self):

        import t6
        self.assertEqual(fixdir(dir(t6)),
-                         ['__all__', '__cached__', '__doc__', '__file__',
-                          '__loader__', '__name__', '__package__', '__path__',
-                          '__spec__'])
+                         ['eggs', 'ham', 'spam'])
        s = """
            import t6
            from t6 import *
            self.assertEqual(fixdir(dir(t6)),
-                             ['__all__', '__cached__', '__doc__', '__file__',
-                              '__loader__', '__name__', '__package__',
-                              '__path__', '__spec__', 'eggs', 'ham', 'spam'])
+                             ['eggs', 'ham', 'spam'])
            self.assertEqual(dir(), ['eggs', 'ham', 'self', 'spam', 't6'])
            """
        self.run_code(s)

diff --git a/Misc/NEWS.d/next/Core and Builtins/2017-09-17-21-44-58.bpo-31503.jrzqsj.rst b/Misc/NEWS.d/next/Core and Builtins/2017-09-17-21-44-58.bpo-31503.jrzqsj.rst
@@ -0,0 +1 @@
+dir(some_module) now returns __all__ if it is defined.
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
@@ -730,11 +730,20 @@ module_dir(PyObject *self, PyObject *args)
 {
    _Py_IDENTIFIER(__dict__);
    PyObject *result = NULL;
+	PyObject *module_all = NULL;
    PyObject *dict = _PyObject_GetAttrId(self, &PyId___dict__);
-
-    if (dict != NULL) {
-        if (PyDict_Check(dict))
-            result = PyDict_Keys(dict);
+    PyObject *all = PyUnicode_FromString("__all__");
+    if (all != NULL && dict != NULL) {
+        if (PyDict_Check(dict)) {
+            module_all = PyDict_GetItem(dict, all);
+            if (module_all != NULL) {
+                /* We need to actually check if it's a list and then copy the items */
+				Py_INCREF(module_all);
+                result = module_all;
+            }
+            else
+                result = PyDict_Keys(dict);
+        }
        else {
            const char *name = PyModule_GetName(self);
            if (name)
@@ -743,7 +752,7 @@ module_dir(PyObject *self, PyObject *args)
                             name);
        }
    }
-
+    Py_XDECREF(all);
    Py_XDECREF(dict);
    return result;
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		dir(some_module) now returns __all__ if it is defined.