Reformat for newer version of Black

Author: russss

emv/cap.py

@@ -26,11 +26,11 @@
 
 
 def get_arqc_req(app_data, value=None, challenge=None):
-    """ Generate the data to send with the generate application cryptogram request.
-        This data is in the format requested by the card in the CDOL1 field of the
-        application data.
+    """Generate the data to send with the generate application cryptogram request.
+    This data is in the format requested by the card in the CDOL1 field of the
+    application data.
 
-        This is the algorithm that barclays_pinsentry.c uses.
+    This is the algorithm that barclays_pinsentry.c uses.
     """
     if Tag.CDOL1 not in app_data:
         raise CAPError("Application data doesn't include CDOL1 field: %r" % app_data)
@@ -57,12 +57,12 @@ def get_arqc_req(app_data, value=None, challenge=None):
 
 
 def get_cap_value(response, ipb, psn):
-    """ Generate a CAP value from the ARQC response.
+    """Generate a CAP value from the ARQC response.
 
-        The ARQC response is traditionally a data structure returned to the terminal by the
-        card during a payment transaction. CAP (mis)uses it to generate an 8-digit one-time
-        code. This is done by bitwise masking the values in this structure with the Issuer
-        Proprietary Bitmap (IPB) provided by the card in the Application Data structure.
+    The ARQC response is traditionally a data structure returned to the terminal by the
+    card during a payment transaction. CAP (mis)uses it to generate an 8-digit one-time
+    code. This is done by bitwise masking the values in this structure with the Issuer
+    Proprietary Bitmap (IPB) provided by the card in the Application Data structure.
     """
 
     if Tag.RMTF1 in response.data:

emv/card.py

@@ -37,8 +37,8 @@ def list_applications(self):
             return self._list_applications_static_aid()
 
     def _list_applications_static_aid(self):
-        """ Try to find applications by trying to select a static application ID.
-            This is an older method of app discovery which is still used by some cards.
+        """Try to find applications by trying to select a static application ID.
+        This is an older method of app discovery which is still used by some cards.
         """
         STATIC_AIDS = [
             [0xA0, 0x00, 0x00, 0x00, 0x25, 0x01],  # Amex
@@ -68,10 +68,10 @@ def _list_applications_static_aid(self):
         return apps
 
     def _list_applications_sfi(self):
-        """ List applications on the card using the SFI method.
+        """List applications on the card using the SFI method.
 
-            This fetches the SFI (short file identifier) from the PSE (Payment System Environment)
-            file, and uses it to locate all the apps on the card.
+        This fetches the SFI (short file identifier) from the PSE (Payment System Environment)
+        file, and uses it to locate all the apps on the card.
         """
         pse = self.get_pse()
         sfi = pse.data[Tag.FCI][Tag.FCI_PROP][Tag.SFI][0]

emv/command/client.py

@@ -187,9 +187,7 @@ def cap(ctx, challenge, amount):
 
     card = get_reader(ctx.obj["reader"])
     try:
-        click.echo(
-            card.generate_cap_value(pin, challenge=challenge, value=amount)
-        )
+        click.echo(card.generate_cap_value(pin, challenge=challenge, value=amount))
     except InvalidPINException:
         click.secho("Invalid PIN", fg="red")
         sys.exit(1)

emv/protocol/command.py

@@ -9,11 +9,11 @@ def assert_valid_byte(val):
 
 
 class CAPDU(object):
-    """ Command APDU.
+    """Command APDU.
 
-        Defined in: EMV 4.3 Book 1 sections:
-            - 9.4.1
-            - 11.1
+    Defined in: EMV 4.3 Book 1 sections:
+        - 9.4.1
+        - 11.1
     """
 
     # Map the class name of the command to the CLA,INS bytes.
@@ -79,9 +79,9 @@ def __repr__(self):
 
 
 class SelectCommand(CAPDU):
-    """ Select an application or file on the card.
+    """Select an application or file on the card.
 
-        Defined in: EMV 4.3 Book 1 section 11.3
+    Defined in: EMV 4.3 Book 1 section 11.3
     """
 
     name = "Select"
@@ -116,9 +116,9 @@ def __repr__(self):
 
 
 class ReadCommand(CAPDU):
-    """ Read a record from an application or file.
+    """Read a record from an application or file.
 
-        Defined in: EMV 4.3 Book 1 section 11.2
+    Defined in: EMV 4.3 Book 1 section 11.2
     """
 
     name = "Read"
@@ -140,9 +140,9 @@ def __init__(self, record_number, sfi=None):
 
 
 class GetDataCommand(CAPDU):
-    """ Get miscellaneous data
+    """Get miscellaneous data
 
-        Defined in: EMV 4.3 Book 3 section 6.5.7
+    Defined in: EMV 4.3 Book 3 section 6.5.7
     """
 
     name = "Get Data"
@@ -161,9 +161,9 @@ def __init__(self, obj):
 
 
 class VerifyCommand(CAPDU):
-    """ Verify the PIN.
+    """Verify the PIN.
 
-        Defined in: EMV 4.3 Book 3 section 6.5.12
+    Defined in: EMV 4.3 Book 3 section 6.5.12
     """
 
     name = "Verify"

emv/protocol/data.py

@@ -18,8 +18,8 @@
 
 
 def is_two_byte(val):
-    """ A tag is at least two bytes long if the least significant
-        5 bits of the first byte are set. """
+    """A tag is at least two bytes long if the least significant
+    5 bits of the first byte are set."""
     return val & 0b00011111 == 0b00011111
 
 
@@ -34,11 +34,11 @@ def is_constructed(val):
 
 
 def read_tag(data):
-    """ Read a variable-length tag from a list of bytes, starting at the
-        first byte. Returns the tag, plus the number of bytes read from
-        the list.
+    """Read a variable-length tag from a list of bytes, starting at the
+    first byte. Returns the tag, plus the number of bytes read from
+    the list.
 
-        EMV 4.3 Book 3 Annex B1
+    EMV 4.3 Book 3 Annex B1
     """
     i = 0
     tag = [data[i]]
@@ -55,10 +55,10 @@ def read_tag(data):
 
 
 def read_length(data):
-    """ Read length from a list of bytes, starting at the first byte.
-        Returns the length, plus the number of bytes read from the list.
+    """Read length from a list of bytes, starting at the first byte.
+    Returns the length, plus the number of bytes read from the list.
 
-        EMV 4.3 Book 3 Annex B2
+    EMV 4.3 Book 3 Annex B2
     """
     i = 0
     length = data[i]

emv/protocol/response.py

@@ -2,9 +2,9 @@
 
 
 class RAPDU(object):
-    """ Response Application Protocol Data Unit
+    """Response Application Protocol Data Unit
 
-        Defined in: EMV 4.3 Book 3 section 6.3.3
+    Defined in: EMV 4.3 Book 3 section 6.3.3
     """
 
     @classmethod

emv/protocol/structures.py

@@ -29,10 +29,10 @@ def parse_element(tag, value):
 
 
 class TLV(OrderedDict):
-    """ BER-TLV
-        A serialisation format.
+    """BER-TLV
+    A serialisation format.
 
-        Documented in EMV 4.3 Book 3 Annex B
+    Documented in EMV 4.3 Book 3 Annex B
     """
 
     @classmethod
@@ -92,12 +92,12 @@ def __repr__(self):
 
 
 class ASRPD(dict):
-    """ Application Selection Registered Proprietary Data list.
+    """Application Selection Registered Proprietary Data list.
 
-        An almost-TLV structure used in the FCI Discretionary Data object.
-        The tags here are fixed-length.
+    An almost-TLV structure used in the FCI Discretionary Data object.
+    The tags here are fixed-length.
 
-        https://www.emvco.com/wp-content/uploads/2017/05/BookB_Entry_Point_Specification_v2_6_20160809023257319.pdf
+    https://www.emvco.com/wp-content/uploads/2017/05/BookB_Entry_Point_Specification_v2_6_20160809023257319.pdf
     """
 
     @classmethod
@@ -130,13 +130,13 @@ def __repr__(self):
 
 
 class DOL(OrderedDict):
-    """ Data Object List.
-        This is sent by the card to the terminal to define a structure for
-        future transactions, consisting of an ordered list of data elements and lengths.
+    """Data Object List.
+    This is sent by the card to the terminal to define a structure for
+    future transactions, consisting of an ordered list of data elements and lengths.
 
-        It's essentially a TLV object without the values.
+    It's essentially a TLV object without the values.
 
-        EMV 4.3 Book 3 section 5.4 """
+    EMV 4.3 Book 3 section 5.4"""
 
     @classmethod
     def unmarshal(cls, data):
@@ -172,8 +172,8 @@ def unserialise(self, data):
         return tlv
 
     def serialise(self, data):
-        """ Given a dictionary of tag -> value, write this data out
-            according to the DOL. Missing data will be null.
+        """Given a dictionary of tag -> value, write this data out
+        according to the DOL. Missing data will be null.
         """
         output = []
         for tag, length in self.items():
@@ -264,7 +264,7 @@ class CVMList(object):
 
         It doesn't seem to get much interesting use on many of the cards I've seen though.
 
-    EMV 4.3 book 3 section 10.5 """
+    EMV 4.3 book 3 section 10.5"""
 
     def __init__(self):
         self.x = None

emv/transmission.py

@@ -4,10 +4,10 @@
 
 
 class TransmissionProtocol(object):
-    """ Transport layer. Only currently supports T0 transport.
+    """Transport layer. Only currently supports T0 transport.
 
-        Defined in: EMV 4.3 Book 1 section 9
-        See also Annex A for examples.
+    Defined in: EMV 4.3 Book 1 section 9
+    See also Annex A for examples.
     """
 
     def __init__(self, connection):
@@ -19,22 +19,22 @@ def __init__(self, connection):
         self.log.info("Connected to reader")
 
     def transmit(self, tx_data):
-        """ Send raw data to the card, and receive the reply.
+        """Send raw data to the card, and receive the reply.
 
-            tx_data should be a list of bytes.
+        tx_data should be a list of bytes.
 
-            Returns a tuple of (data, sw1, sw2) where sw1 and sw2
-            are the protocol status bytes.
+        Returns a tuple of (data, sw1, sw2) where sw1 and sw2
+        are the protocol status bytes.
         """
         self.log.debug("Tx: %s", format_bytes(tx_data))
         data, sw1, sw2 = self.connection.transmit(tx_data)
         self.log.debug("Rx: %s, SW1: %02x, SW2: %02x", format_bytes(data), sw1, sw2)
         return data, sw1, sw2
 
     def exchange(self, capdu):
-        """ Send a command to the card and return the response.
+        """Send a command to the card and return the response.
 
-            Accepts a CAPDU object and returns a RAPDU.
+        Accepts a CAPDU object and returns a RAPDU.
         """
         send_data = capdu.marshal()
         data, sw1, sw2 = self.transmit(send_data)

emv/util.py

@@ -2,13 +2,13 @@
 
 
 def hex_int(val):
-    """ Convert an integer into a decimal-encoded hex integer as bytes,
-        which the EMV spec seems awfully keen on.
+    """Convert an integer into a decimal-encoded hex integer as bytes,
+    which the EMV spec seems awfully keen on.
 
-        >>> hex_int(123456)
-        [0x12, 0x34, 0x56]
-        >>> hex_int(65432)
-        [0x06, 0x54, 0x32]
+    >>> hex_int(123456)
+    [0x12, 0x34, 0x56]
+    >>> hex_int(65432)
+    [0x06, 0x54, 0x32]
     """
     s = str(val)
     if len(s) % 2 != 0:
@@ -17,10 +17,10 @@ def hex_int(val):
 
 
 def from_hex_int(val):
-    """ Convert hex digits to decimal.
+    """Convert hex digits to decimal.
 
-        >>> from_hex_int([0x12, 0x34])
-        1234
+    >>> from_hex_int([0x12, 0x34])
+    1234
     """
     return int("".join(["%02x" % i for i in val]))