Merge remote-tracking branch 'origin/master'

python/psi-api/src/com/jetbrains/python/psi/PyClass.java

@@ -181,6 +181,12 @@ public interface PyClass extends PsiNameIdentifierOwner, PyStatement, NameDefine
 
   boolean isSubclass(@NotNull String superClassQName);
 
+  /**
+   * Returns the aggregated list of names defined in __slots__ attributes of the class and its ancestors.
+   */
+  @Nullable
+  List<String> getSlots();
+
   /**
    * Returns the list of names in the class' __slots__ attribute, or null if the class
    * does not define such an attribute.
@@ -188,7 +194,7 @@ public interface PyClass extends PsiNameIdentifierOwner, PyStatement, NameDefine
    * @return the list of names or null.
    */
   @Nullable
-  List<String> getSlots();
+  List<String> getOwnSlots();
 
   @Nullable
   String getDocStringValue();