[GNUnet-SVN] r25092 - monkey/trunk/seaspider

[gnunet]

Author: teichm
Date: 2012-11-22 02:16:53 +0100 (Thu, 22 Nov 2012)
New Revision: 25092

Modified:
   monkey/trunk/seaspider/seasp2_convert
Log:
fixed some ugly python code in seasp2_convert

Modified: monkey/trunk/seaspider/seasp2_convert
===================================================================
--- monkey/trunk/seaspider/seasp2_convert       2012-11-21 20:56:49 UTC (rev 
25091)
+++ monkey/trunk/seaspider/seasp2_convert       2012-11-22 01:16:53 UTC (rev 
25092)
@@ -32,11 +32,9 @@
 if args.outfile== None:
        if os.path.isdir(args.INPUT):
                in_dir = os.path.abspath(args.INPUT)
-               (crap, tmp_name) = os.path.split(in_dir)
-               outfilename = in_dir + '/' + tmp_name + '.sqlite'
+               outfilename = in_dir + '/' + os.path.split(in_dir)[1] + 
'.sqlite'
        elif os.path.isfile(args.INPUT):
-               (outfilename, ext) = os.path.splitext(args.INPUT)
-               outfilename += '.sqlite'
+               outfilename = os.path.splitext(args.INPUT)[0] + '.sqlite'
        else:
                print 'unknown output target, writing to expressions.sqlite'
                outfilename = 'expressions.sqlite'
@@ -83,9 +81,7 @@
                infile.close()
                return
        
-       (tmp, ext) = os.path.splitext(filename)
-       (crap, cfilename) = os.path.split(tmp)
-       cfilename += '.c'
+       cfilename = os.path.split(os.path.splitext(filename)[0])[1] + '.c'
 
        lines = infile.readlines(10000)
        while lines: