Keep python 2 working
This commit is contained in:
1 parent
2a959c47af
commit
35c0afbb3e
3 files changed
+4
-5
No files matched your search
@@ -415,7 +415,6 @@ class DhcpOption(models.Model):
|
|||||||
verbose_name = 'DHCP option'
|
verbose_name = 'DHCP option'
|
||||||
|
|
||||||
|
|
||||||
@python_2_unicode_compatible
|
|
||||||
class DhcpCustomField(models.Model):
|
class DhcpCustomField(models.Model):
|
||||||
value = models.CharField(max_length=255)
|
value = models.CharField(max_length=255)
|
||||||
ip4subnet = models.ForeignKey(Ip4Subnet)
|
ip4subnet = models.ForeignKey(Ip4Subnet)
|
||||||
|
|||||||
+4
-4
@@ -1,8 +1,8 @@
|
|||||||
|
import io
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.core.management import call_command
|
from django.core.management import call_command
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.test import TestCase, LiveServerTestCase
|
from django.test import TestCase
|
||||||
from django.utils import six
|
|
||||||
from rest_framework.authtoken.models import Token
|
from rest_framework.authtoken.models import Token
|
||||||
from rest_framework.test import APITestCase
|
from rest_framework.test import APITestCase
|
||||||
|
|
||||||
@@ -45,12 +45,12 @@ class RunManagementCommands(TestCase):
|
|||||||
|
|
||||||
def test_zone_sync(self):
|
def test_zone_sync(self):
|
||||||
expected_zone_file = ''
|
expected_zone_file = ''
|
||||||
with six.BytesIO() as f:
|
with io.BytesIO() as f:
|
||||||
call_command('zone-sync', debug=True, stdout=f)
|
call_command('zone-sync', debug=True, stdout=f)
|
||||||
# TODO check expected_zone_file
|
# TODO check expected_zone_file
|
||||||
|
|
||||||
def test_dhcp_sync(self):
|
def test_dhcp_sync(self):
|
||||||
expected_dhcp_file = ''
|
expected_dhcp_file = ''
|
||||||
with six.BytesIO() as f:
|
with io.BytesIO() as f:
|
||||||
call_command('dhcp-sync', ('--debug',), stdout=f)
|
call_command('dhcp-sync', ('--debug',), stdout=f)
|
||||||
# TODO check expected_dhcp_file
|
# TODO check expected_dhcp_file
|
||||||
Whitespace-only changes.
Reference in new issue
Block a user