Minor script cleanup.

Ralph Moritz · Ralph Moritz · commit a24d1c6c2c18 · 2013-06-16T23:42:20.000+02:00
Fix inconsistencies in uncompyle2 script, rename to scripts/uncompyle2 &amp; add to
setup.py (these are all changes from wibiti). Also, change script headers so
they work on Windows too. Remove build folder from repo &amp; add .gitignore so it
doesn't inadvertently get added again.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*~
+build
diff --git a/scripts/uncompyle2 b/scripts/uncompyle2
@@ -1,27 +1,27 @@
-#!/usr/bin/python2.7
+#! python
 # Mode: -*- python -*-
 #
 # Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
 #
-"""
-Usage: uncompyle [OPTIONS]... [ FILE | DIR]...
+'''
+Usage: uncompyle2 [OPTIONS]... [ FILE | DIR]...
 
 Examples:
-  uncompyle      foo.pyc bar.pyc       # uncompyle foo.pyc, bar.pyc to stdout
-  uncompyle -o . foo.pyc bar.pyc       # uncompyle to ./foo.dis and ./bar.dis
-  uncompyle -o /tmp /usr/lib/python1.5 # uncompyle whole library
+  uncompyle2      foo.pyc bar.pyc       # decompile foo.pyc, bar.pyc to stdout
+  uncompyle2 -o . foo.pyc bar.pyc       # decompile to ./foo.pyc_dis and ./bar.pyc_dis
+  uncompyle2 -o /tmp /usr/lib/python1.5 # decompile whole library
 
 Options:
   -o <path>     output decompiled files to this path:
                 if multiple input files are decompiled, the common prefix
                 is stripped from these names and the remainder appended to
                 <path>
                   uncompyle -o /tmp bla/fasel.pyc bla/foo.pyc
-                    -> /tmp/fasel.dis, /tmp/foo.dis
+                    -> /tmp/fasel.pyc_dis, /tmp/foo.pyc_dis
                   uncompyle -o /tmp bla/fasel.pyc bar/foo.pyc
-                    -> /tmp/bla/fasel.dis, /tmp/bar/foo.dis
+                    -> /tmp/bla/fasel.pyc_dis, /tmp/bar/foo.pyc_dis
                   uncompyle -o /tmp /usr/lib/python1.5
-                    -> /tmp/smtplib.dis ... /tmp/lib-tk/FixTk.dis
+                    -> /tmp/smtplib.pyc_dis ... /tmp/lib-tk/FixTk.pyc_dis
   -c <file>     attempts a disassembly after compiling <file>
   -d            do not print timestamps
   -p <integer>  use <integer> number of processes
@@ -35,13 +35,13 @@ Debugging Options:
   --showast   -t  include AST (abstract syntax tree) (disables --verify)
 
 Extensions of generated files:
-  '.dis'             successfully decompiled (and verified if --verify)
-  '.dis_unverified'  successfully decompile but --verify failed
-  '.nodis'           uncompyle failed (contact author for enhancement)
-"""
+  '.pyc_dis' '.pyo_dis'   successfully decompiled (and verified if --verify)
+    + '_unverified'       successfully decompile but --verify failed
+    + '_failed'           decompile failed (contact author for enhancement)
+'''
 
 Usage_short = \
-"decomyple [--help] [--verify] [--showasm] [--showast] [-o <path>] FILE|DIR..."
+"uncompyle2 [--help] [--verify] [--showasm] [--showast] [-o <path>] FILE|DIR..."
 
 import sys, os, getopt
 import os.path
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#! python
 
 """Setup script for the 'uncompyle' distribution."""
 
@@ -10,5 +10,6 @@
        author = "Mysterie",
        author_email = "kajusska@gmail.com",
        url = "http://github.com/Mysterie/uncompyle2",
-       packages=['uncompyle2', 'uncompyle2.opcode']
+       packages=['uncompyle2', 'uncompyle2.opcode'],
+       scripts=['scripts/uncompyle2']
       )
diff --git a/test/compile_tests b/test/compile_tests
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.5
+#! python
 """
 compile_tests -- compile test patterns for the decompyle test suite
 """
diff --git a/test_pythonlib.py b/test_pythonlib.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#! python
 
 '''
 test_pythonlib -- uncompyle and verify Python libraries
diff --git a/uncompyle2.py b/uncompyle2.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python2.5`
	`1`	`+#! python`
`2`	`2`	`"""`
`3`	`3`	`compile_tests -- compile test patterns for the decompyle test suite`
`4`	`4`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python2.7`
	`1`	`+#! python`
`2`	`2`
`3`	`3`	`'''`
`4`	`4`	`test_pythonlib -- uncompyle and verify Python libraries`