Small fixes to make python2.6 happy

Ignore-this: cfd1840daabf3437811171be126929bb

darcs-hash:20090507132703-20ca2-ef21f62dc25fd6e1497beae6128727114394e0bf.gz

src/plugins/Core.py

@@ -217,7 +217,8 @@ def display(self,query,result):
 
 ## IO subsystem unit tests:
 import unittest
-import md5,random,time
+import random,time
+from hashlib import md5
 import pyflag.tests as tests
 from pyflag.FileSystem import DBFS
 

src/plugins/DiskForensics/FileSystems/Sleuthkit.py

@@ -401,7 +401,8 @@ def reset(self, dbh, case):
         SKCACHE.expire(cache_key)
 
 ## Unit Tests:
-import unittest, md5
+import unittest
+from hashlib import md5
 import pyflag.pyflagsh as pyflagsh
 import pyflag.tests as tests
 

src/plugins/DiskForensics/HashComparison.py

@@ -33,7 +33,7 @@
 from pyflag.Scanner import *
 from pyflag.ColumnTypes import StringType, TimestampType, InodeIDType, FilenameType, ColumnType
 
-import md5
+from hashlib import md5
 
 config.add_option('hashdb', short_option='H', default="nsrldb",
                   help = "The database which will be used to store hash sets (like nsrl)")

src/plugins/Flash/BasicCommands.py

@@ -694,7 +694,8 @@ def execute(self):
         yield "Created Case %s" % case
 
 ## Unit tests:
-import unittest,md5
+import unittest
+from hashlib import md5
 import pyflag.pyflagsh as pyflagsh
 import pyflag.tests
 

src/plugins/LoadData.py

@@ -635,7 +635,8 @@ def reset(self,query):
 
 
 ## Unit Tests:
-import unittest, md5
+import unittest
+from hashlib import md5
 import pyflag.pyflagsh as pyflagsh
 from pyflag.FileSystem import DBFS
 

src/plugins/MemoryForensics/Volatility-1.3_Linux_rc.1/forensics/win32/crashdump.py

@@ -28,7 +28,6 @@
 """
 import os,optparse
 import struct
-import sha
 from time import gmtime, strftime
 
 from vutils import is_crash_dump

src/plugins/TableRenderers/HTMLBundle.py

@@ -586,11 +586,14 @@ def export(self, case, inode_id, table_renderer):
         result.heading("How to derive inode %s" % fd.inode)
 
         filename = "inodes/%s_explain.html" % inode_id
+        if not table_renderer.filename_in_archive(filename):        
+            result = HTMLUI.HTMLUI(initial = True)
+            result.heading("How to derive inode %s" % fd.inode)
+
+            result.decoration='naked'
+            fd.explain(None, result)
 
-        result.decoration='naked'
-        fd.explain(None, result)
-
-        table_renderer.add_file_from_string(filename, result.display())
+            table_renderer.add_file_from_string(filename, result.display())
 
 def render_html(self, inode_id, table_renderer):
     dbh = DB.DBO()

src/plugins/Urwid/urwid/listbox.py

@@ -28,7 +28,7 @@ class ListWalkerError(Exception):
 	pass
 
 class ListWalker(object):
-	__metaclass__ = MetaSignals
+	#__metaclass__ = MetaSignals
 
 	signals = ["modified"]
 

src/pyflag/IO.py

@@ -155,7 +155,8 @@ def open(case, iosource):
 
 ## IO subsystem unit tests:
 import unittest
-import md5,random,time
+import random,time
+from hashlib import md5
 
 def test_read_random(io1,io2, size, sample_size, number):
     """ Tests if both ios return the same data for random input """

src/pyflag/ScannerUtils.py

@@ -66,6 +66,7 @@ def find_dependencies(scanner, dependancies):
             find_dependencies(s, dependancies)
         elif s in groups:
             for g in groups[s]:
+                print g
                 #name = ("%s" % g).split(".")[-1]
                 name = g.name
                 dependancies.append(name)

tests/launch

@@ -10,6 +10,6 @@ INSTALL_DIR=/var/tmp/build/pyflag/
 ## can find it itself) 
 
 export PYFLAG_PLUGINS=$SRC_DIR/src/plugins
-export PYTHONPATH=$SRC_DIR/src/pyflag:$SRC_DIR/src/:/usr/loca/lib/python2.5/site-packages/:$INSTALL_DIR/lib/python2.5/site-packages/pyflag:$INSTALL_DIR/lib/python2.4/site-packages/pyflag
+export PYTHONPATH=$SRC_DIR/src/pyflag:$SRC_DIR/src/:/usr/local/lib/python2.6/site-packages/:/usr/local/lib/python2.5/site-packages/:$INSTALL_DIR/lib/python2.5/site-packages/pyflag:$INSTALL_DIR/lib/python2.4/site-packages/pyflag:$INSTALL_DIR/lib/python2.6/site-packages/pyflag
 
 $@

tests/pyflag

@@ -6,6 +6,6 @@ INSTALL_DIR=/var/tmp/build/pyflag/
 
 ######### END CONFIGURATION ####################
 
-export PYTHONPATH=$SRC_DIR/src/pyflag:$SRC_DIR/src/:/usr/loca/lib/python2.5/site-packages/:$INSTALL_DIR/lib/python2.5/site-packages/pyflag
+export PYTHONPATH=$SRC_DIR/src/pyflag:$SRC_DIR/src/:/usr/loca/lib/python2.6/site-packages/:$INSTALL_DIR/lib/python2.6/site-packages/pyflag
 
-exec /usr/bin/python2.5 $SRC_DIR/src/pyflag/FlagHTTPServer.py --plugins=$SRC_DIR/src/plugins $@
+exec /usr/bin/python2.6 $SRC_DIR/src/pyflag/FlagHTTPServer.py --plugins=$SRC_DIR/src/plugins $@