More linting issues

diff --git a/drafthorse/models/accounting.py b/drafthorse/models/accounting.py
index 4316610be401244aa1883246acee41ccbbaab666..d3da9cc9cb3982c30d26452781fac3e59f6e0e94 100644 (file)
--- a/drafthorse/models/accounting.py
+++ b/drafthorse/models/accounting.py
@@ -1,7 +1,9 @@
 from . import BASIC, COMFORT, EXTENDED, NS_RAM
 from .elements import Element
-from .fields import (CurrencyField, DateTimeField, DecimalField,
-                     IndicatorField, MultiField, QuantityField, StringField)
+from .fields import (
+    CurrencyField, DateTimeField, DecimalField, IndicatorField, MultiField,
+    QuantityField, StringField,
+)
 
 
 class LineApplicableTradeTax(Element):

diff --git a/drafthorse/models/delivery.py b/drafthorse/models/delivery.py
index 8bec84d83e9a778c5dc0dad62682729312ac1910..ecf2a772ad9b18789e7014fbb798019d036aa4dc 100644 (file)
--- a/drafthorse/models/delivery.py
+++ b/drafthorse/models/delivery.py
@@ -1,10 +1,12 @@
 from . import BASIC, EXTENDED, NS_RAM
 from .elements import Element
 from .fields import DateTimeField, Field, IDField, StringField
-from .party import (ShipFromTradeParty, ShipToTradeParty,
-                    UltimateShipToTradeParty)
-from .references import (DeliveryNoteReferencedDocument,
-                         DespatchAdviceReferencedDocument)
+from .party import (
+    ShipFromTradeParty, ShipToTradeParty, UltimateShipToTradeParty,
+)
+from .references import (
+    DeliveryNoteReferencedDocument, DespatchAdviceReferencedDocument,
+)
 
 
 class SupplyChainEvent(Element):

diff --git a/drafthorse/models/document.py b/drafthorse/models/document.py
index c1c5b08c1fb54959e26bb99876414244245f2594..dc50883bcfef17c9c3990799687a0bf5fa5fa513 100644 (file)
--- a/drafthorse/models/document.py
+++ b/drafthorse/models/document.py
@@ -4,8 +4,10 @@ from drafthorse.models.note import IncludedNote
 
 from . import BASIC, EXTENDED, NS_RAM, NS_UDT, NS_FERD_1p0
 from .elements import Element
-from .fields import (DateTimeField, Field, IndicatorField, MultiField,
-                     MultiStringField, StringField)
+from .fields import (
+    DateTimeField, Field, IndicatorField, MultiField, MultiStringField,
+    StringField,
+)
 from .trade import TradeTransaction
 
 

diff --git a/drafthorse/models/fields.py b/drafthorse/models/fields.py
index d558370fea15003f0d5723ba346c529ccb94b3e8..079494d26cb509309dcf09892ed4b15c7bee94d0 100644 (file)
--- a/drafthorse/models/fields.py
+++ b/drafthorse/models/fields.py
@@ -1,6 +1,7 @@
 from . import BASIC
-from .container import (Container, CurrencyContainer, IDContainer,
-                        StringContainer)
+from .container import (
+    Container, CurrencyContainer, IDContainer, StringContainer,
+)
 
 
 class Field:

diff --git a/drafthorse/models/payment.py b/drafthorse/models/payment.py
index dc41d6be4e53cc09594bc2f7db37dc65878f8e34..9a36cf9bada0d825d558dc98f4c80f8f68e51535 100644 (file)
--- a/drafthorse/models/payment.py
+++ b/drafthorse/models/payment.py
@@ -1,8 +1,9 @@
 from . import BASIC, COMFORT, EXTENDED, NS_RAM
 from .elements import Element
-from .fields import (AgencyIDField, CurrencyField, DateTimeField, DecimalField,
-                     Field, MultiCurrencyField, MultiStringField,
-                     QuantityField, StringField)
+from .fields import (
+    AgencyIDField, CurrencyField, DateTimeField, DecimalField, Field,
+    MultiCurrencyField, MultiStringField, QuantityField, StringField,
+)
 
 
 class PayerFinancialAccount(Element):

diff --git a/drafthorse/models/product.py b/drafthorse/models/product.py
index d153794b39243bf816add5baef09885dba06c965..fc066d48afa94e5bd94877745e31c70f4504e02e 100644 (file)
--- a/drafthorse/models/product.py
+++ b/drafthorse/models/product.py
@@ -1,7 +1,8 @@
 from . import COMFORT, EXTENDED, NS_RAM
 from .elements import Element
-from .fields import (ClassificationField, IDField, MultiField, QuantityField,
-                     StringField)
+from .fields import (
+    ClassificationField, IDField, MultiField, QuantityField, StringField,
+)
 
 
 class ProductCharacteristic(Element):

diff --git a/drafthorse/models/trade.py b/drafthorse/models/trade.py
index 892d58bced7a94c8ffa269c5a5131735fe183099..985d78b6ab040d8d20a65a41e2659922e8032179 100644 (file)
--- a/drafthorse/models/trade.py
+++ b/drafthorse/models/trade.py
@@ -1,17 +1,20 @@
 from . import BASIC, COMFORT, EXTENDED, NS_RAM, NS_FERD_1p0
-from .accounting import (ApplicableTradeTax, AppliedTradeTax,
-                         BillingSpecifiedPeriod, MonetarySummation,
-                         ReceivableAccountingAccount, TradeAllowanceCharge)
+from .accounting import (
+    ApplicableTradeTax, AppliedTradeTax, BillingSpecifiedPeriod,
+    MonetarySummation, ReceivableAccountingAccount, TradeAllowanceCharge,
+)
 from .delivery import TradeDelivery
 from .elements import Element
 from .fields import CurrencyField, Field, MultiField, StringField
-from .party import (BuyerTradeParty, EndUserTradeParty, InvoiceeTradeParty,
-                    PayeeTradeParty, SellerTradeParty)
+from .party import (
+    BuyerTradeParty, EndUserTradeParty, InvoiceeTradeParty, PayeeTradeParty,
+    SellerTradeParty,
+)
 from .payment import PaymentMeans, PaymentTerms
-from .references import (AdditionalReferencedDocument,
-                         BuyerOrderReferencedDocument,
-                         ContractReferencedDocument,
-                         CustomerOrderReferencedDocument)
+from .references import (
+    AdditionalReferencedDocument, BuyerOrderReferencedDocument,
+    ContractReferencedDocument, CustomerOrderReferencedDocument,
+)
 from .tradelines import LineItem
 
 

diff --git a/drafthorse/models/tradelines.py b/drafthorse/models/tradelines.py
index b4082a795b8b50320defcc45d400ab395b8e9bd5..f2d05c6f336f8f60f4f06dcd18644ecd3c27e856 100644 (file)
--- a/drafthorse/models/tradelines.py
+++ b/drafthorse/models/tradelines.py
@@ -1,20 +1,22 @@
 from . import BASIC, COMFORT, EXTENDED, NS_RAM
-from .accounting import (AccountingAccount, ApplicableTradeTax,
-                         BillingSpecifiedPeriod, TradeAllowanceCharge)
+from .accounting import (
+    AccountingAccount, ApplicableTradeTax, BillingSpecifiedPeriod,
+    TradeAllowanceCharge,
+)
 from .delivery import SupplyChainEvent
 from .elements import Element
-from .fields import (CurrencyField, Field, MultiField, QuantityField,
-                     StringField)
+from .fields import (
+    CurrencyField, Field, MultiField, QuantityField, StringField,
+)
 from .note import IncludedNote
 from .party import ShipToTradeParty, UltimateShipToTradeParty
 from .product import TradeProduct
-from .references import (LineAdditionalReferencedDocument,
-                         LineBuyerOrderReferencedDocument,
-                         LineContractReferencedDocument,
-                         LineCustomerOrderReferencedDocument,
-                         LineDeliveryNoteReferencedDocument,
-                         LineDespatchAdviceReferencedDocument,
-                         LineReceivingAdviceReferencedDocument)
+from .references import (
+    LineAdditionalReferencedDocument, LineBuyerOrderReferencedDocument,
+    LineContractReferencedDocument, LineCustomerOrderReferencedDocument,
+    LineDeliveryNoteReferencedDocument, LineDespatchAdviceReferencedDocument,
+    LineReceivingAdviceReferencedDocument,
+)
 
 
 class AllowanceCharge(TradeAllowanceCharge):

diff --git a/drafthorse/pdf.py b/drafthorse/pdf.py
index ca022668b924cc79acbb4afceaecab80d16f126e..24976345c593008b55f64025a86ef65de2b9b532 100644 (file)
--- a/drafthorse/pdf.py
+++ b/drafthorse/pdf.py
@@ -25,15 +25,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 import datetime
-import hashlib
 import os
 from io import BytesIO
 
 from lxml import etree
-
 from PyPDF2 import PdfFileReader, PdfFileWriter
-from PyPDF2.generic import (ArrayObject, DecodedStreamObject, DictionaryObject,
-                            NameObject, createStringObject)
+from PyPDF2.generic import (
+    ArrayObject, DecodedStreamObject, DictionaryObject, NameObject,
+    createStringObject,
+)
 
 
 def attach_xml(original_pdf, xml_data, level='BASIC'):

diff --git a/setup.cfg b/setup.cfg
index 1fd4893377cfc495d13759dedae15f039729ced7..3ea7da9d94b15bad5388dd1a868c95edf61afd56 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,11 @@
 [flake8]
 max-line-length = 160
+
+[isort]
+combine_as_imports = true
+default_section = THIRDPARTY
+include_trailing_comma = true
+known_first_party = drafthorse
+known_standard_library = typing,enum,mimetypes
+multi_line_output = 5
+not_skip = __init__.py