Rename brcm80211fwconv

[b43-tools.git] / debug / libb43.py

diff --git a/debug/libb43.py b/debug/libb43.py
index 671ad2c6f173a141bb2bbffa984c6200f5c929e4..cf8a7cec1a8a8a781479efbe8053d52f55593348 100644 (file)
--- a/debug/libb43.py
+++ b/debug/libb43.py
@@ -19,7 +19,7 @@
 import sys
 import os
 import re
-import md5
+import hashlib
 from tempfile import *
 
 
@@ -62,7 +62,7 @@ class B43PsmDebug:
 class B43:
        """Hardware access layer. This accesses the hardware through the debugfs interface."""
 
-       def __init__(self, phy):
+       def __init__(self, phy=None):
                debugfs_path = self.__debugfs_find()
 
                # Construct the debugfs b43 path to the device
@@ -71,7 +71,11 @@ class B43:
                        b43_path += phy
                else:
                        # Get the PHY.
-                       phys = os.listdir(b43_path)
+                       try:
+                               phys = os.listdir(b43_path)
+                       except OSError:
+                               print "Could not find B43's debugfs directory: %s" % b43_path
+                               raise B43Exception
                        if not phys:
                                print "Could not find any b43 device"
                                raise B43Exception
@@ -339,7 +343,7 @@ class TextPatcher:
                        self.deleted = False
 
        def __init__(self, text, expected_md5sum):
-               sum = md5.md5(text).hexdigest()
+               sum = hashlib.md5(text).hexdigest()
                if sum != expected_md5sum:
                        print "Patcher: The text does not match the expected MD5 sum"
                        print "Expected:   " + expected_md5sum