Merge branch 'master' into scss2

klen · Jun 20, 2011 · f477191 · f477191
2 parents d7ae056 + 98cfab0
commit f477191
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,7 +1,13 @@
 Changes
 =======
 
+## 2011-06-19 0.7.2
+-------------------
+* Add argv parse to tools.main
+* Fix watch mode
+
 ## 2011-02-27 0.7.0
+-------------------
 * Add link on pyScss
 * Fix None type bug
 * Add if() function

diff --git a/scss/__init__.py b/scss/__init__.py
@@ -2,7 +2,7 @@
 import operator
 
 
-VERSION_INFO = (0, 7, 0)
+VERSION_INFO = (0, 7, 2)
 
 __project__ = PROJECT = __name__
 __version__ = VERSION = '.'.join(str(i) for i in VERSION_INFO)

diff --git a/scss/tool.py b/scss/tool.py
@@ -17,7 +17,7 @@ def complete(text, state):
             else:
                 state -= 1
 
-def main():
+def main(argv=None):
 
     try:
         import atexit
@@ -67,7 +67,7 @@ def main():
         '-W', '--no-warnings', action='store_false', dest='warn',
         help="Disable warnings.")
 
-    opts, args = p.parse_args()
+    opts, args = p.parse_args(argv or sys.argv[1:])
     precache = opts.cache
 
     if opts.shell:
@@ -96,8 +96,8 @@ def main():
 
         if os.path.isdir(self):
             for f in os.listdir(self):
-                if os.path.isfile(f) and f.endswitch('.scss'):
-                    path = os.path.join(self, f)
+                path = os.path.join(self, f)
+                if os.path.isfile(path) and f.endswith('.scss'):
                     tpath = os.path.join(target or self, f[:-5] + '.css')
                     files.append([ path, tpath, 0 ])
         else: