Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 45DFA200CBB for ; Tue, 4 Jul 2017 14:49:38 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 44A5F16119B; Tue, 4 Jul 2017 12:49:38 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 92C17161190 for ; Tue, 4 Jul 2017 14:49:37 +0200 (CEST) Received: (qmail 41820 invoked by uid 500); 4 Jul 2017 12:49:36 -0000 Mailing-List: contact commits-help@ariatosca.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ariatosca.incubator.apache.org Delivered-To: mailing list commits@ariatosca.incubator.apache.org Received: (qmail 41809 invoked by uid 99); 4 Jul 2017 12:49:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jul 2017 12:49:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AE6B2DF9AB; Tue, 4 Jul 2017 12:49:36 +0000 (UTC) From: mxmrlv To: commits@ariatosca.apache.org Reply-To: commits@ariatosca.apache.org References: In-Reply-To: Subject: [GitHub] incubator-ariatosca pull request #143: ARIA-254 Create multiple nodes per te... Content-Type: text/plain Message-Id: <20170704124936.AE6B2DF9AB@git1-us-west.apache.org> Date: Tue, 4 Jul 2017 12:49:36 +0000 (UTC) archived-at: Tue, 04 Jul 2017 12:49:38 -0000 Github user mxmrlv commented on a diff in the pull request: https://github.com/apache/incubator-ariatosca/pull/143#discussion_r125461884 --- Diff: extensions/aria_extension_tosca/simple_v1_0/modeling/capabilities.py --- @@ -52,12 +52,13 @@ def get_inherited_capability_definitions(context, presentation, for_presentation Allows overriding all aspects of parent capability properties except data type. """ + if for_presentation is None: + for_presentation = presentation + # Get capability definitions from parent parent = presentation._get_parent(context) - capability_definitions = get_inherited_capability_definitions(context, parent, - for_presentation=presentation) \ - if parent is not None \ - else OrderedDict() + capability_definitions = get_inherited_capability_definitions( + context, parent, for_presentation) if parent is not None else OrderedDict() # Add/merge our capability definitions our_capability_definitions = presentation.capabilities --- End diff -- it's really hard to follow with name like capability_definitions and our_capability_definitions --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---