From 082fea6de1fd413f805def4490431d83c42de184 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Wed, 20 May 2015 14:15:11 +0300 Subject: [PATCH] Fix bugs, enforce first letter of variables to be a character --- src/mapcss/__init__.py | 6 +++--- src/test_stylesheet.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mapcss/__init__.py b/src/mapcss/__init__.py index 507dbdb..f1de7f4 100644 --- a/src/mapcss/__init__.py +++ b/src/mapcss/__init__.py @@ -41,7 +41,7 @@ CONDITION = re.compile(r'^ \[(.+?)\] \s* ', re.S | re.X) OBJECT = re.compile(r'^ (\*|[\w]+) \s* ', re.S | re.X) DECLARATION = re.compile(r'^ \{(.+?)\} \s* ', re.S | re.X) IMPORT = re.compile(r'^@import\("(.+?)"\); \s* ', re.S | re.X) -VARIABLE_SET = re.compile(r'^@(\w[\w\d]*) \s* : \s* (.+?) \s* ; \s* ', re.S | re.X) +VARIABLE_SET = re.compile(r'^@([a-z][\w\d]*) \s* : \s* (.+?) \s* ; \s* ', re.S | re.X | re.I) UNKNOWN = re.compile(r'^ (\S+) \s* ', re.S | re.X) ZOOM_MINMAX = re.compile(r'^ (\d+)\-(\d+) $', re.S | re.X) @@ -86,7 +86,7 @@ CAPS = re.compile(r'^uppercase$/i') CENTER = re.compile(r'^center$/i') HEX = re.compile(r'^#([0-9a-f]+)$/i') -VARIABLE = re.compile(r'@(\w[\w\d]*)') +VARIABLE = re.compile(r'@([a-z][\w\d]*)') class MapCSS(): def __init__(self, minscale=0, maxscale=19): @@ -182,7 +182,7 @@ class MapCSS(): def get_variable(self, m): name = m.group()[1:] if not name in self.variables: - log.error("Variable not found: {}".format(name)) + logging.error("Variable not found: {}".format(name)) return self.variables[name] if name in self.variables else m.group() diff --git a/src/test_stylesheet.py b/src/test_stylesheet.py index 506065b..f9bcb29 100644 --- a/src/test_stylesheet.py +++ b/src/test_stylesheet.py @@ -198,6 +198,7 @@ has_darker_casings({'highway': 'residential'}) has_darker_casings({'highway': 'unclassified'}) -print "Failed tests: %s (%s%%)" % (FAILED_TESTS, 100 * FAILED_TESTS / TOTAL_TESTS) +if TOTAL_TESTS > 0: + print "Failed tests: %s (%s%%)" % (FAILED_TESTS, 100 * FAILED_TESTS / TOTAL_TESTS) print "Passed tests:", TOTAL_TESTS - FAILED_TESTS print "Total tests:", TOTAL_TESTS