X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Factions%2Fparseactions.py;h=cad432a7e6f868a016db152a064411293f225e5a;hb=43ee1a487f6052811ba3076c3d7d44bf865b8a4d;hp=d0c1aec374c9ab2c498d98771f1dade63f6737df;hpb=2be64a9bb186ac02e095d65e627fcb499df8606b;p=vuplus_dvbapp

diff --git a/lib/actions/parseactions.py b/lib/actions/parseactions.py
index d0c1aec..cad432a 100644
--- a/lib/actions/parseactions.py
+++ b/lib/actions/parseactions.py
@@ -1,6 +1,6 @@
 # takes a header file, outputs action ids
 
-import token, tokenize, os, sys, string
+import tokenize, sys, string
 
 def filter(g):
 	while 1:
@@ -65,7 +65,7 @@ def do_file(f, mode):
 					except:
 						pass
 				
-					raise "action enum must be simple."
+					raise Exception("action enum must be simple.")
 			
 				counter = 0
 			
@@ -82,14 +82,14 @@ def do_file(f, mode):
 					
 					if counter:
 						if t != ",":
-							raise "no comma"
+							raise Exception("no comma")
 						t = tokens.next()
 				
 					if firsthit:
 
 						if mode == "include":
 							# hack hack hack!!
-							print "#include <lib" + f[2:] + ">"
+							print "#include <lib/" + '/'.join(f.split('/')[-2:]) + ">"
 						else:
 							print "\t// " + f