fixed error handling for _read_vid_file().

Author: NetworkJack2

generate_mac/__init__.py

@@ -32,7 +32,7 @@ def _read_vid_file(vid_file):
             file_lines = in_file.readlines()
             in_file.close()
         except FileNotFoundError:
-            raise FileNotFoundError("ERROR: Cannot read VID file " + in_file)
+            raise FileNotFoundError("Cannot read VID file " + vid_file)
 
         # Sanitize inputs
         file_lines = generate_mac._strip_comments(file_lines)
@@ -195,20 +195,23 @@ def vid_file_vendor(vid_file,vendor,desc=None):
     def vid_provided(vid_bytes):
         '''Generates only the Device bytes, given specified VID bytes'''
         test_vid = []
-        i = ""
         rand_bytes = ""
         output = ""
         ## Start with error checking
         #remove any trailing :
-        vid_bytes = vid_bytes.rstrip(":")
-        test_vid = vid_bytes.split(":")
+        try:
+            vid_bytes = vid_bytes.rstrip(":")
+            test_vid = vid_bytes.split(":")
+        except:
+            raise ValueError(str(vid_bytes) + ' are not valid VID bytes')
         # If there aren't precisely three bytes, its not a VID
         if len(test_vid) != 3:
             raise ValueError(vid_bytes + ' are not valid VID bytes')
-        for i in test_vid:
-            if generate_mac._is_byte(i) == False:
-                raise ValueError(vid_bytes + ' are not valid VID bytes')
-        
+        for byte in test_vid:
+            if generate_mac._is_byte(byte) == False:
+                raise ValueError(str(vid_bytes) + ' are not valid VID bytes')
+
+        # generate some new device bytes        
         rand_bytes = generate_mac._gen_rand_bytes(3)
         output = vid_bytes + ":" + rand_bytes
         return output