From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- scripts/build/complay.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'scripts/build/complay.py') diff --git a/scripts/build/complay.py b/scripts/build/complay.py index b89ca98e19a..dff981e65c9 100644 --- a/scripts/build/complay.py +++ b/scripts/build/complay.py @@ -455,18 +455,10 @@ class LayoutChecker(Minifyer): self.handleError('Element %s has inputtag attribute without inputmask attribute' % (name, )) self.checkTag(attrs['inputtag'], name, 'inputtag') elif 'inputmask' in attrs: - self.handleError('Element %s has inputmask attribute without inputtag attribute' % (name, )) + self.handleError('Element %s has inputmask attribute without inputtag attirbute' % (name, )) inputmask = self.checkIntAttribute(name, attrs, 'inputmask', None) if (inputmask is not None) and (0 == inputmask): self.handleError('Element %s has attribute inputmask "%s" is zero' % (name, attrs['inputmask'])) - inputraw = self.checkIntAttribute(name, attrs, 'inputraw', None) - if (inputraw is not None): - if 'inputmask' not in attrs: - self.handleError('Element %s has inputraw attribute without inputmask attribute' % (name, )) - if 'inputtag' not in attrs: - self.handleError('Element %s has inputraw attribute without inputtag attribute' % (name, )) - if ((0 > inputraw) or (1 < inputraw)): - self.handleError('Element %s attribute inputraw "%s" not in valid range 0-1' % (name, attrs['inputraw'])) self.handlers.append((self.objectStartHandler, self.objectEndHandler)) self.have_bounds.append(False) self.have_orientation.append(False) -- cgit v1.2.3-70-g09d2