diff --git a/Makefile b/Makefile index b97a2653f4..e55f2334af 100644 --- a/Makefile +++ b/Makefile @@ -120,8 +120,7 @@ install: build/timestamps/node-modules-timestamp .PHONY: lint lint: build/timestamps/eslint-timestamp \ - build/timestamps/check-requires-timestamp \ - build/timestamps/check-whitespace-timestamp + build/timestamps/check-requires-timestamp .PHONY: npm-install npm-install: build/timestamps/node-modules-timestamp @@ -192,13 +191,6 @@ build/timestamps/check-requires-timestamp: $(SRC_JS) $(EXAMPLES_JS) \ @python bin/check-requires.py $(CLOSURE_LIB) $^ @touch $@ -build/timestamps/check-whitespace-timestamp: $(SRC_JS) $(EXAMPLES_JS) \ - $(SPEC_JS) $(SPEC_RENDERING_JS) \ - $(SRC_JSDOC) - @mkdir -p $(@D) - @python bin/check-whitespace.py $^ - @touch $@ - build/compiled-examples/all.js: $(EXAMPLES_JS) @mkdir -p $(@D) @python bin/combine-examples.py $^ > $@ diff --git a/bin/check-whitespace.py b/bin/check-whitespace.py deleted file mode 100644 index e8a123ba3c..0000000000 --- a/bin/check-whitespace.py +++ /dev/null @@ -1,46 +0,0 @@ -import logging -import re -import sys - -logging.basicConfig(format='%(asctime)s %(name)s: %(message)s', - level=logging.INFO) - -logger = logging.getLogger('check-whitespace') - -CR_RE = re.compile(r'\r') -LEADING_WHITESPACE_RE = re.compile(r'\s+') -TRAILING_WHITESPACE_RE = re.compile(r'\s+\n\Z') -NO_NEWLINE_RE = re.compile(r'[^\n]\Z') -ALL_WHITESPACE_RE = re.compile(r'\s+\Z') - - -def check_whitespace(*filenames): - errors = 0 - for filename in sorted(filenames): - whitespace = False - for lineno, line in enumerate(open(filename, 'rU')): - if lineno == 0 and LEADING_WHITESPACE_RE.match(line): - logger.info('%s:%d: leading whitespace', filename, lineno + 1) - errors += 1 - if CR_RE.search(line): - logger.info('%s:%d: carriage return character in line', - filename, lineno + 1) - errors += 1 - if TRAILING_WHITESPACE_RE.search(line): - logger.info('%s:%d: trailing whitespace', filename, lineno + 1) - errors += 1 - if NO_NEWLINE_RE.search(line): - logger.info('%s:%d: no newline at end of file', filename, - lineno + 1) - errors += 1 - whitespace = ALL_WHITESPACE_RE.match(line) - if whitespace: - logger.info('%s: trailing whitespace at end of file', filename) - errors += 1 - return errors - -if __name__ == "__main__": - errors = check_whitespace(*sys.argv[1:]) - if errors > 0: - logger.error('%d whitespace errors' % (errors,)) - sys.exit(1)