cleaned up the code

Author: GvozdevLeonid

python_bladerf/pybladerf_tools/pybladerf_info.py

@@ -1,6 +1,6 @@
 # MIT License
 
-# Copyright (c) 2024 GvozdevLeonid
+# Copyright (c) 2024-2025 GvozdevLeonid
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,21 +23,20 @@
 from python_bladerf import pybladerf
 
 
-def pybladerf_info(print_to_console: bool = True) -> None | str:
+def pybladerf_info(print_to_console: bool = True) -> str | None:
 
     print_info = ''
     device_list = pybladerf.PyBladeRFDeviceList()
     print_info += f'python_bladerf version: {pybladerf.python_bladerf_library_version()}\n'
     print_info += f'libbladeRF version: {pybladerf.pybladerf_library_version()}\n'
-
-    if device_list.devstrs is not None:
+    if device_list.device_count > 0:
         for i in range(device_list.device_count):
             device = pybladerf.pybladerf_open(device_list.devstrs[i])
             print_info += 'Found BladeRF:\n'
             print_info += f'Board: {device.pybladerf_get_board_name()} ({device.pybladerf_get_fpga_size()})\n'
             print_info += f'Instance: {device_list.instances[i]}\n'
             print_info += f'Serial number: {device_list.serial_numbers[i]}\n'
-            print_info += f'USB Bus Address: {device_list.usb_bus[i]} {device_list.usb_addresses[i]}\n'
+            print_info += f'USB Bus Address: {device_list.usb_buses[i]} {device_list.usb_addresses[i]}\n'
             print_info += f'Backend: {device_list.backends[i]}\n'
             print_info += f'USB Speed: {device.pybladerf_device_speed()}\n'
             print_info += f'FPGA Version: {device.pybladerf_fpga_version()}\n'
@@ -47,14 +46,16 @@ def pybladerf_info(print_to_console: bool = True) -> None | str:
 
     if print_to_console:
         print(print_info)
-    else:
-        return print_info
+        return None
+
+    return print_info
 
 
-def pybladerf_device_identifiers_list_info(print_to_console: bool = True) -> None | tuple[int, list]:
+def pybladerf_device_identifiers_list_info(print_to_console: bool = True) -> tuple[int, list] | None:
     device_list = pybladerf.PyBladeRFDeviceList()
 
     if print_to_console:
-        print(f'Device identifiers [{device_list.devicecount}]: {device_list.devstrs}')
-    else:
-        return device_list.devicecount, device_list.devstrs
+        print(f'Device identifiers [{device_list.device_count}]: {device_list.devstrs}')
+        return None
+
+    return device_list.device_count, device_list.devstrs