Fix for command line usage using short interpretatons.

scott-griffiths · scott-griffiths · commit b4c929cf97ef · 2022-11-26T18:21:28.000Z
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -156,6 +156,6 @@ jobs:
       - test
     steps:
       - name: Require all successes
-        uses: re-actors/alls-green@v1
+        uses: re-actors/alls-green@v1.2.2
         with:
           jobs: ${{ toJSON(needs) }}
diff --git a/bitstring.py b/bitstring.py
@@ -930,14 +930,17 @@ def __new__(cls, auto: Optional[BitsType] = None, length: Optional[int] = None,
 
         # Dictionary that maps token names to the function that reads them
         cls._name_to_read = {'uint': Bits._readuint,
+                             'u': Bits._readuint,
                              'uintle': Bits._readuintle,
                              'uintbe': Bits._readuintbe,
                              'uintne': Bits._readuintne,
                              'int': Bits._readint,
+                             'i': Bits._readint,
                              'intle': Bits._readintle,
                              'intbe': Bits._readintbe,
                              'intne': Bits._readintne,
                              'float': Bits._readfloatbe,
+                             'f': Bits._readfloatbe,
                              'floatbe': Bits._readfloatbe,  # floatbe is a synonym for float
                              'floatle': Bits._readfloatle,
                              'floatne': Bits._readfloatne,
@@ -946,8 +949,11 @@ def __new__(cls, auto: Optional[BitsType] = None, length: Optional[int] = None,
                              'bfloatle': Bits._readbfloatle,
                              'bfloatne': Bits._readbfloatne,
                              'hex': Bits._readhex,
+                             'h': Bits._readhex,
                              'oct': Bits._readoct,
+                             'o': Bits._readoct,
                              'bin': Bits._readbin,
+                             'b': Bits._readbin,
                              'bits': Bits._readbits,
                              'bytes': Bits._readbytes,
                              'ue': Bits._readue,
@@ -4742,7 +4748,8 @@ def main() -> None:
 $ python -m bitstring hex=01, uint:12=352.hex
 01160
         """)
-    elif fp in dummy._name_to_read.keys():
+        return
+    if fp in dummy._name_to_read.keys():
         # concatenate all other parameters and interpret using the final one
         b1 = Bits(','.join(sys.argv[1: -1]))
         print(b1._readtoken(fp, 0, b1.__len__())[0])
diff --git a/tests/test_bitstring.py b/tests/test_bitstring.py
@@ -106,21 +106,29 @@ def testRunningModuleWithSingleParameter(self):
 
     def testRunningModuleWithSingleParameterAndInterpretation(self):
         with redirect_stdout(io.StringIO()) as f:
-            with mock.patch('sys.argv', ['ignored', 'u12=352', 'int']):
+            with mock.patch('sys.argv', ['ignored', 'u12=352', 'i']):
                 bitstring.main()
         s = f.getvalue()
         self.assertEqual(s, '352\n')
 
     def testRunningModuleWithMultipleParameters(self):
         with redirect_stdout(io.StringIO()) as f:
-            with mock.patch('sys.argv', ['b.py', 'uint:12=352', '0b101', '0o321', 'f32=51', 'bin:1=1']):
+            with mock.patch('sys.argv', ['b.py', 'uint12=352', '0b101', '0o321', 'f32=51', 'bool=1']):
                 bitstring.main()
         s = f.getvalue()
         self.assertEqual(s, '0x160ad1424c0000, 0b1\n')
 
-    # def testRunningModuleWithMultipleParametersAndInterpretation(self):
-    #     with redirect_stdout(io.StringIO()) as f:
-    #         with mock.patch('sys.argv', ['b.py', 'ue=1000', '0xff.b']):
-    #             bitstring.main()
-    #     s = f.getvalue()
-    #     self.assertEqual(s, '000000000111110100111111111\n')
+    def testRunningModuleWithMultipleParametersAndInterpretation(self):
+        with redirect_stdout(io.StringIO()) as f:
+            with mock.patch('sys.argv', ['b.py', 'ue=1000', '0xff.bin']):
+                bitstring.main()
+        s = f.getvalue()
+        self.assertEqual(s, '000000000111110100111111111\n')
+
+    def testShortInterpretations(self):
+        with redirect_stdout(io.StringIO()) as f:
+            with mock.patch('sys.argv', ['b.py', 'bin=001.b']):
+                bitstring.main()
+        s = f.getvalue()
+        self.assertEqual(s, '001\n')
+
