[SCM] master: Cleanup python imports.

[SCM] master: Cleanup python imports.

[scox]

The branch, master has been updated
       via  ae5acf615f1c91eec8e564581ea6b146a1f5a1b3 (commit)
       via  707aa035b7188dea11be87dd24235f61d74a52df (commit)
      from  df8582eb828ed33a9263be3cdd69cbbd767af4ff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit ae5acf615f1c91eec8e564581ea6b146a1f5a1b3
Merge: 707aa035b7188dea11be87dd24235f61d74a52df df8582eb828ed33a9263be3cdd69cbbd767af4ff
Author: Stan Cox <scox@redhat.com>
Date:   Mon Nov 26 11:21:20 2007 -0500

    Cleanup python imports.

commit 707aa035b7188dea11be87dd24235f61d74a52df
Author: Stan Cox <scox@redhat.com>
Date:   Mon Nov 26 11:20:15 2007 -0500

    Cleanup python imports.
    
    * gen-type-expect-tests.py: Cleanup imports.
    * gen-type-funit-tests.py: Cleanup imports.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/frysk/debuginfo/ChangeLog               |    4 +++
 .../frysk/debuginfo/gen-type-expect-tests.py       |    4 +--
 frysk-core/frysk/pkglibdir/ChangeLog               |    4 +++
 frysk-core/frysk/pkglibdir/gen-type-funit-tests.py |   24 +++----------------
 4 files changed, 13 insertions(+), 23 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
index 47e4b91..801e378 100644
--- a/frysk-core/frysk/debuginfo/ChangeLog
+++ b/frysk-core/frysk/debuginfo/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-26  Stan Cox  <scox@redhat.com>
+
+	* gen-type-expect-tests.py: Cleanup imports.
+
 2007-11-23  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	* DebugInfoFrame.java: Added ".../" befor abbrivated file path.
diff --git a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py
index 58593ce..7a8db24 100644
--- a/frysk-core/frysk/debuginfo/gen-type-expect-tests.py
+++ b/frysk-core/frysk/debuginfo/gen-type-expect-tests.py
@@ -39,9 +39,7 @@
 # version and license this file solely under the GPL without
 # exception.
 
-import os,posix,sys
-import re
-from os.path import *
+import os,sys
 
 ########################################################################
 # Manage creation of the java file
diff --git a/frysk-core/frysk/pkglibdir/ChangeLog b/frysk-core/frysk/pkglibdir/ChangeLog
index a01c217..47a460b 100644
--- a/frysk-core/frysk/pkglibdir/ChangeLog
+++ b/frysk-core/frysk/pkglibdir/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-26  Stan Cox  <scox@redhat.com>
+
+	* gen-type-funit-tests.py: Cleanup imports.
+
 2007-11-22  Sami Wagiaalla  <swagiaal@toner.toronto.redhat.com>
 
 	* funit-long-stack.c: New.
diff --git a/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py b/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py
index e4fc9c9..4145923 100644
--- a/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py
+++ b/frysk-core/frysk/pkglibdir/gen-type-funit-tests.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python
-import os,posix,sys
-from os.path import *
+import sys
 
 ########################################################################
 # Manage creation of the C file
@@ -31,7 +30,7 @@ class c:
     def add_decl(self,str):
         self.c_file.write("static " + str)
     def prologue(self,):
-        self.c_file.write('''// Generated by gen-typetests.py
+        self.c_file.write('''// Generated by gen-type-funit-tests.py
 
 #include <stdint.h>
 #include <values.h>
@@ -50,14 +49,10 @@ crash () {
 // struct_arr_arr_int_var - Struct of 2 dimension arrays of int
 
 ''')
-    def epilogue(self,debug):
+    def epilogue(self):
         self.c_file.write("\n")
-        if (debug):
-            self.c_file.write("volatile int x = 1;\n")
         self.c_file.write("int\n")
         self.c_file.write("main (int argc, char **argv) {\n")
-        if (debug):
-            self.c_file.write("while (x);\n")
         self.c_file.write("    crash ();\n    return 0;\n}\n")
 
 
@@ -65,17 +60,6 @@ crash () {
 # main
 ########################################################################
 
-def usage ():
-    print "Usage " + sys.argv[0] + " -debug"
-    sys.exit(1)
-
-debug=0
-for t in sys.argv:
-    if (t == "-debug"):
-        debug=1
-    elif (t.startswith("-")):
-        usage()
-
 # base types we generate variables for.  used to index into limits map
 base_types=('char','short int','int','long int','long long int','float','double')
 # Used for variable initialization
@@ -725,4 +709,4 @@ c_file.add('''enum colors {\n  orange = 0,\n  yellow = 1,\n  violet = 2,\n  indi
 c_file.add('''enum  {\n  chevy = 0,\n  dodge = 44,\n  ford = 55\n}''', "usa_cars", "chevy")
 c_file.add('''enum cars {\n  bmw = 0,\n  mercedes = 1,\n  porsche = 2\n}''', "sports_cars", "bmw")
 
-c_file.epilogue(debug)
+c_file.epilogue()


hooks/post-receive
--
frysk system monitor/debugger