Merge pull request #4 from dokthar/fix_strdesc

Fix DeviceDescriptorCollection always adding a language descriptor

usb_protocol/emitters/descriptors/standard.py

@@ -264,7 +264,7 @@ class DeviceDescriptorCollection:
 
         # If we're not automatically adding a language descriptor, we shouldn't do anything,
         # and we'll just ignore this.
-        if not self._ensure_has_language_descriptor:
+        if not self._automatic_language_descriptor:
             return
 
         # If we don't have a language descriptor, add our default one.
@@ -401,5 +401,16 @@ class EmitterTests(unittest.TestCase):
         # Configuration descriptor, with subordinates.
         self.assertIn((2, 0, b'\t\x02 \x00\x01\x01\x00\x80\xfa\t\x04\x01\x00\x02\xff\xff\xff\x00\x07\x05\x81\x02@\x00\xff\x07\x05\x01\x02@\x00\xff'), results)
 
+
+    def test_empty_descriptor_collection(self):
+        collection = DeviceDescriptorCollection(automatic_language_descriptor=False)
+        results = list(collection)
+        self.assertEqual(len(results), 0)
+
+    def test_automatic_language_descriptor(self):
+        collection = DeviceDescriptorCollection(automatic_language_descriptor=True)
+        results = list(collection)
+        self.assertEqual(len(results), 1)
+
 if __name__ == "__main__":
     unittest.main()