From beccbe858350882456d63f580cec6c9a20064ac2 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 11 Jun 2020 19:46:36 +1000
Subject: [PATCH] Flake fixes

---
 InvenTree/barcode/api.py                     | 10 ++--------
 InvenTree/barcode/barcode.py                 |  7 +++----
 InvenTree/barcode/plugins/digikey_barcode.py |  2 +-
 InvenTree/barcode/tests.py                   |  4 ++--
 InvenTree/plugins/plugins.py                 |  1 -
 setup.cfg                                    |  1 +
 6 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/InvenTree/barcode/api.py b/InvenTree/barcode/api.py
index cc340f96f6..c4872ec781 100644
--- a/InvenTree/barcode/api.py
+++ b/InvenTree/barcode/api.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import hashlib
-
 from django.urls import reverse
 from django.conf.urls import url
 from django.utils.translation import ugettext as _
@@ -11,13 +9,10 @@ from rest_framework import permissions
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-import InvenTree.plugins as InvenTreePlugins
-
 from stock.models import StockItem
 from stock.serializers import StockItemSerializer
 
-import barcode.plugins as BarcodePlugins
-from barcode.barcode import BarcodePlugin, load_barcode_plugins, hash_barcode
+from barcode.barcode import load_barcode_plugins, hash_barcode
 
 
 class BarcodeScan(APIView):
@@ -233,7 +228,6 @@ class BarcodeAssign(APIView):
             serializer = StockItemSerializer(item, part_detail=True, location_detail=True, supplier_part_detail=True)
             response['stockitem'] = serializer.data
 
-
         return Response(response)
 
 
@@ -243,4 +237,4 @@ barcode_api_urls = [
     
     # Catch-all performs barcode 'scan'
     url(r'^.*$', BarcodeScan.as_view(), name='api-barcode-scan'),
-]
\ No newline at end of file
+]
diff --git a/InvenTree/barcode/barcode.py b/InvenTree/barcode/barcode.py
index 25d775b72f..c9fac02035 100644
--- a/InvenTree/barcode/barcode.py
+++ b/InvenTree/barcode/barcode.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 import hashlib
-import json
 
 from InvenTree import plugins as InvenTreePlugins
 from barcode import plugins as BarcodePlugins
 
+from stock.models import StockItem
 from stock.serializers import StockItemSerializer, LocationSerializer
 from part.serializers import PartSerializer
 
@@ -70,7 +70,6 @@ class BarcodePlugin:
         serializer = StockItemSerializer(item, part_detail=True, location_detail=True, supplier_part_detail=True)
         return serializer.data
 
-
     def getStockLocation(self):
         """
         Attempt to retrieve a StockLocation associated with this barcode.
@@ -93,7 +92,7 @@ class BarcodePlugin:
         Default implementation returns None
         """
 
-        return None 
+        return None
 
     def renderPart(self, part):
         """
@@ -145,4 +144,4 @@ def load_barcode_plugins(debug=False):
         else:
             print("No barcode plugins found")
 
-    return plugins
\ No newline at end of file
+    return plugins
diff --git a/InvenTree/barcode/plugins/digikey_barcode.py b/InvenTree/barcode/plugins/digikey_barcode.py
index 9f766fe0b2..1a0825e03c 100644
--- a/InvenTree/barcode/plugins/digikey_barcode.py
+++ b/InvenTree/barcode/plugins/digikey_barcode.py
@@ -16,4 +16,4 @@ class DigikeyBarcodePlugin(BarcodePlugin):
         TODO: Validation of Digikey barcodes.
         """
 
-        return False
\ No newline at end of file
+        return False
diff --git a/InvenTree/barcode/tests.py b/InvenTree/barcode/tests.py
index e0513b6465..260dff5249 100644
--- a/InvenTree/barcode/tests.py
+++ b/InvenTree/barcode/tests.py
@@ -84,7 +84,7 @@ class BarcodeAPITest(APITestCase):
 
         response = self.client.post(
             self.assign_url, format='json',
-            data = {
+            data={
                 'barcode': barcode_data,
                 'stockitem': item.pk
             }
@@ -106,7 +106,7 @@ class BarcodeAPITest(APITestCase):
         # Ensure that the same UID cannot be assigned to a different stock item!
         response = self.client.post(
             self.assign_url, format='json',
-            data = {
+            data={
                 'barcode': barcode_data,
                 'stockitem': 521
             }
diff --git a/InvenTree/plugins/plugins.py b/InvenTree/plugins/plugins.py
index 0a1c78f0b8..ae6e0630e5 100644
--- a/InvenTree/plugins/plugins.py
+++ b/InvenTree/plugins/plugins.py
@@ -47,7 +47,6 @@ def get_plugins(pkg, baseclass):
     return plugins
 
 
-
 def load_action_plugins():
     """
     Return a list of all registered action plugins
diff --git a/setup.cfg b/setup.cfg
index 6c84ba4bae..7d5da0d660 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,6 +2,7 @@
 ignore =
 	# - W293 - blank lines contain whitespace
 	W293,
+	W605,
 	# - E501 - line too long (82 characters)
 	E501, E722,
 	# - C901 - function is too complex