Fix require

klen · Mar 1, 2011 · c65145f · c65145f
1 parent b8f7cac
commit c65145f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,6 @@
+## 2011-02-25 0.3.93
+* Fix js require regexp
+
 ## 2011-02-25 0.3.92
 -------------------
 * Migrate to python-scss 0.6.6

diff --git a/zetalibrary/__init__.py b/zetalibrary/__init__.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import os.path
 
-VERSION_INFO = (0, 3, 92)
+VERSION_INFO = (0, 3, 93)
 
 __project__ = PROJECT = __name__
 __version__ = VERSION = '.'.join(str(i) for i in VERSION_INFO)

diff --git a/zetalibrary/parsers.py b/zetalibrary/parsers.py
@@ -101,7 +101,7 @@ def parse_src(self, src, curdir, linker):
 
 
 class JSParser(Parser):
-    import_re = re.compile(r'^require\(\s*[\'\"]([^\'\"]+)[\'\"]\)\s*;?\s*$', re.MULTILINE)
+    import_re = re.compile(r'^require\(\s*[\'\"]([^\'\"]+)[\'\"]\s*\)\s*;?\s*$', re.MULTILINE)
     comment_re = re.compile(r'/\*(?:[^*]|\*+[^*/])*\*+/')
     comment_template = '// %s\n'
 

diff --git a/zetalibrary/tests/zeta/_main.css b/zetalibrary/tests/zeta/_main.css
@@ -83,7 +83,7 @@ html {
 a, :active, :visited {
 	color: #607890}
 
-:hover {
+a:hover {
 	color: #036}
 
 ul, ol {

diff --git a/zetalibrary/tests/zeta/_main.css.orig b/zetalibrary/tests/zeta/_main.css.orig
@@ -83,7 +83,7 @@ html {
 a, :active, :visited {
 	color: #607890}
 
-:hover {
+a:hover {
 	color: #036}
 
 ul, ol {

diff --git a/zetalibrary/zetalib/zeta/z-base/z-base.scss b/zetalibrary/zetalib/zeta/z-base/z-base.scss
@@ -30,7 +30,7 @@ html {
 a, :active, :visited {
     color: $z-link-color; }
 
-:hover {
+a:hover {
     color: $z-link-hover-color; }
 
 ul, ol {