Merge pull request #7091 from tk0miya/7090_numfig_for_custom_containers

Fix #7090: std domain: Can't assign numfig-numbers for custom container nodes

CHANGES

@@ -81,6 +81,7 @@ Bugs fixed
   module members without :impoprted-members: option
 * #6889: autodoc: Trailing comma in ``:members::`` option causes cryptic warning
 * #7055: linkcheck: redirect is treated as an error
+* #7090: std domain: Can't assign numfig-numbers for custom container nodes
 
 Testing
 --------

sphinx/domains/std.py

@@ -925,11 +925,11 @@ class StandardDomain(Domain):
 
         if isinstance(node, nodes.section):
             return 'section'
-        elif isinstance(node, nodes.container):
-            if node.get('literal_block') and has_child(node, nodes.literal_block):
-                return 'code-block'
-            else:
-                return None
+        elif (isinstance(node, nodes.container) and
+              'literal_block' in node and
+              has_child(node, nodes.literal_block)):
+            # given node is a code-block having caption
+            return 'code-block'
         else:
             figtype, _ = self.enumerable_nodes.get(node.__class__, (None, None))
             return figtype