PEP fixes

This commit is contained in:
Oliver Walters 2019-04-25 03:20:25 +10:00
parent 7c91c9ba79
commit 7b68310d73
12 changed files with 47 additions and 68 deletions

View File

@ -187,11 +187,8 @@ def FilterChildren(queryset, parent):
elif str2bool(parent, False):
return queryset.filter(parent=None)
else:
try:
parent_id = int(parent)
if parent_id == 0:
return queryset.filter(parent=None)
else:
return queryset.filter(parent=parent_id)
except:
return queryset
parent_id = int(parent)
if parent_id == 0:
return queryset.filter(parent=None)
else:
return queryset.filter(parent=parent_id)

View File

@ -6,8 +6,6 @@ from django.test import TestCase
from .models import Build
from part.models import Part
# Create your tests here.
class BuildTestSimple(TestCase):
@ -56,4 +54,3 @@ class BuildTestSimple(TestCase):
def test_required_parts(self):
# TODO - Generate BOM for test part
pass

View File

@ -16,4 +16,4 @@ class CompanySimpleTest(TestCase):
def test_company_model(self):
c = Company.objects.get(pk=1)
self.assertEqual(c.name, 'ABC Co.')
self.assertEqual(c.get_absolute_url(), '/company/1/')
self.assertEqual(c.get_absolute_url(), '/company/1/')

View File

@ -89,21 +89,21 @@ class EditBomItemForm(HelperForm):
class EditSupplierPartForm(HelperForm):
class Meta:
model = SupplierPart
fields = [
'supplier',
'SKU',
'part',
'description',
'URL',
'manufacturer',
'MPN',
'note',
'single_price',
'base_cost',
'multiple',
'minimum',
'packaging',
'lead_time'
]
class Meta:
model = SupplierPart
fields = [
'supplier',
'SKU',
'part',
'description',
'URL',
'manufacturer',
'MPN',
'note',
'single_price',
'base_cost',
'multiple',
'minimum',
'packaging',
'lead_time'
]

View File

@ -1,10 +1,7 @@
from django.test import TestCase
from .models import Part, BomItem
class BomItemTest(TestCase):
def setUp(self):
pass

View File

@ -1,7 +1,6 @@
from django.test import TestCase
from .models import Part, PartCategory
from .models import rename_part_image
class CategoryTest(TestCase):
@ -11,16 +10,16 @@ class CategoryTest(TestCase):
def setUp(self):
self.p1 = PartCategory.objects.create(name='A',
description='Most highest level',
parent=None)
description='Most highest level',
parent=None)
self.p2 = PartCategory.objects.create(name='B',
description='Sits under second',
parent=self.p1)
description='Sits under second',
parent=self.p1)
self.p3 = PartCategory.objects.create(name='C',
description='Third tier category',
parent=self.p2)
description='Third tier category',
parent=self.p2)
# Add two parts in p2
Part.objects.create(name='Flange', category=self.p2)
@ -64,4 +63,4 @@ class CategoryTest(TestCase):
self.assertEqual(self.p1.partcount, 3)
self.assertEqual(self.p2.partcount, 3)
self.assertEqual(self.p3.partcount, 1)
self.assertEqual(self.p3.partcount, 1)

View File

@ -2,6 +2,7 @@ from django.test import TestCase
from .models import Part, PartCategory
class SimplePartTest(TestCase):
def setUp(self):
@ -19,4 +20,4 @@ class SimplePartTest(TestCase):
def test_category(self):
self.assertEqual(self.px.category_path, '')
self.assertEqual(self.pz.category_path, 'TLC')
self.assertEqual(self.pz.category_path, 'TLC')

View File

@ -1,9 +1,7 @@
from django.test import TestCase
from .models import Part, SupplierPart
class SupplierPartTest(TestCase):
def setUp(self):
pass
pass

View File

@ -70,23 +70,3 @@ part_urls = [
# Top level part list (display top level parts and categories)
url(r'^.*$', views.PartIndex.as_view(), name='part-index'),
]
"""
part_param_urls = [
# Detail of a single part parameter
url(r'^(?P<pk>[0-9]+)/?$', views.PartParamDetail.as_view(), name='partparameter-detail'),
# Parameters associated with a particular part
url(r'^\?.*/?$', views.PartParamList.as_view()),
url(r'^$', views.PartParamList.as_view()),
]
part_param_template_urls = [
# Detail of a single part field template
url(r'^(?P<pk>[0-9]+)/?$', views.PartTemplateDetail.as_view(), name='partparametertemplate-detail'),
# List all part field templates
url(r'^\?.*/?$', views.PartTemplateList.as_view()),
url(r'^$', views.PartTemplateList.as_view())
]
"""

View File

@ -1,4 +1,7 @@
from django.test import TestCase
# Create your tests here.
class StockItemTest(TestCase):
def setUp(self):
pass

View File

@ -1,3 +1,7 @@
from django.test import TestCase
# Create your tests here.
class StockLocationTest(TestCase):
def setUp(self):
pass

View File

@ -1,4 +1,7 @@
from django.test import TestCase
# Create your tests here.
class StockTrackingTest(TestCase):
def setUp(self):
pass