Merge branch 'release/0.3.2'

CHANGES

@@ -1,6 +1,11 @@
 Change History
 --------------
 
+0.3.2 (2011-05-09)
+******************
+- More hacks to use pre-generated lex and yacc tables when called from
+  the command line
+
 0.3.1 (2011-05-09)
 ******************
 - Use pre-generated lex and yacc tables when called from the command line

README.rst

@@ -13,22 +13,25 @@ Let's minify some code
 
 From the command line:
 
-$ slimit -h
-Usage: slimit [input file]
-
-If no input file is provided STDIN is used by default.
-Minified JavaScript code is printed to STDOUT.
-
-$ cat test.js
-var a = function( obj ) {
-        for ( var name in obj ) {
-                return false;
-        }
-        return true;
-};
-$
-$ slimit < test.js
-var a=function(obj){for(var name in obj){return false;}return true;};
+::
+
+    $ slimit -h
+    Usage: slimit [input file]
+
+    If no input file is provided STDIN is used by default.
+    Minified JavaScript code is printed to STDOUT.
+
+    $ cat test.js
+    var a = function( obj ) {
+            for ( var name in obj ) {
+                    return false;
+            }
+            return true;
+    };
+    $
+    $ slimit < test.js
+    var a=function(obj){for(var name in obj){return false;}return true;};
+
 
 Or using library API:
 

setup.py

@@ -17,7 +17,7 @@ def read(*rel_names):
 
 setup(
     name='slimit',
-    version='0.3.1',
+    version='0.3.2',
     url='http://slimit.org',
     license='MIT',
     description='SlimIt - JavaScript minifier',

src/slimit/minifier.py

@@ -51,11 +51,12 @@ def main():
     # Hack to load lextab and yacctab when installed via pip/easy_install
     # and used from the command line via call to 'slimit'
     try:
-        lextab = __import__('lextab')
-        yacctab = __import__('yacctab')
+        __import__('slimit.lextab')
+        __import__('slimit.yacctab')
     except ImportError:
-        lextab = 'lextab'
-        yacctab = 'yacctab'
+        pass
+    lextab = sys.modules.get('slimit.lextab', 'lextab')
+    yacctab = sys.modules.get('slimit.yacctab', 'yacctab')
 
     if len(args) == 1:
         text = open(args[1]).read()