Skip to content

Commit 8c9b056

Browse files
committed
Remove six dependency
1 parent ea65f01 commit 8c9b056

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
long_description_content_type='text/markdown',
1414
url='https://github.com/alexhill/django-relativity',
1515
packages=setuptools.find_packages(),
16-
install_requires=['django>=1.11', 'six'],
16+
install_requires=['django>=1.11'],
1717
classifiers=[
1818
'Development Status :: 4 - Beta',
1919
'Environment :: Web Environment',

tests/models.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from django.db.models.functions import Concat
77
from mptt.fields import TreeForeignKey
88
from mptt.models import MPTTModel
9-
from six import python_2_unicode_compatible
109
from treebeard.mp_tree import MP_Node
1110
from treebeard.ns_tree import NS_Node
1211

@@ -39,7 +38,6 @@ def as_sql(self, compiler, connection):
3938
return "%s <> %s" % (lhs, rhs), params
4039

4140

42-
@python_2_unicode_compatible
4341
class BasePage(models.Model):
4442
name = models.TextField()
4543
slug = models.CharField(unique=True, null=False, blank=False, max_length=255)
@@ -72,7 +70,6 @@ class TBNSPage(NS_Node, BasePage):
7270
subtree = NS_Subtree()
7371

7472

75-
@python_2_unicode_compatible
7673
class PageBase(BasePage):
7774
descendants = Relationship(
7875
"self",
@@ -99,7 +96,6 @@ class Categorised(models.Model):
9996
category_codes = models.TextField()
10097

10198

102-
@python_2_unicode_compatible
10399
class CategoryBase(models.Model):
104100
code = models.CharField(unique=True, max_length=255)
105101
members = Relationship(
@@ -117,7 +113,6 @@ class Category(CategoryBase):
117113
pass
118114

119115

120-
@python_2_unicode_compatible
121116
class Product(models.Model):
122117
sku = models.CharField(max_length=13)
123118
colour = models.CharField(max_length=20)
@@ -133,7 +128,6 @@ def __str__(self):
133128
)
134129

135130

136-
@python_2_unicode_compatible
137131
class CartItem(models.Model):
138132
product_code = models.CharField(max_length=13)
139133
description = models.TextField()
@@ -150,7 +144,6 @@ def __str__(self):
150144
return "Cart item #%s: SKU %s" % (self.pk, self.sku)
151145

152146

153-
@python_2_unicode_compatible
154147
class ProductFilter(models.Model):
155148
fcolour = models.CharField(max_length=20)
156149
fsize = models.IntegerField()
@@ -169,15 +162,13 @@ def __str__(self):
169162
return "ProductFilter #%d: %s size %s" % (self.pk, self.fcolour, self.fsize)
170163

171164

172-
@python_2_unicode_compatible
173165
class User(models.Model):
174166
username = models.CharField(primary_key=True, max_length=255)
175167

176168
def __str__(self):
177169
return self.username
178170

179171

180-
@python_2_unicode_compatible
181172
class Chemical(models.Model):
182173
formula = models.TextField()
183174
chemical_name = models.TextField()

0 commit comments

Comments
 (0)