diff --git a/mdb/api/serializers.py b/mdb/api/serializers.py index 0412bfe..0685b79 100644 --- a/mdb/api/serializers.py +++ b/mdb/api/serializers.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from rest_framework import serializers from rest_framework.exceptions import ValidationError diff --git a/mdb/management/commands/dhcp-sync.py b/mdb/management/commands/dhcp-sync.py index 3c987a3..3b60a5c 100644 --- a/mdb/management/commands/dhcp-sync.py +++ b/mdb/management/commands/dhcp-sync.py @@ -1,14 +1,9 @@ -from __future__ import with_statement - import os import sys from difflib import context_diff from django.core.management.base import BaseCommand from django.core.mail import mail_admins -try: - from subprocess import getstatusoutput -except ImportError: - from commands import getstatusoutput +from subprocess import getstatusoutput from mdb.models import DhcpConfig diff --git a/mdb/management/commands/zone-sync.py b/mdb/management/commands/zone-sync.py index ab222de..ee88e8d 100644 --- a/mdb/management/commands/zone-sync.py +++ b/mdb/management/commands/zone-sync.py @@ -1,15 +1,10 @@ -from __future__ import with_statement - import os import sys from itertools import chain from difflib import context_diff from django.core.management.base import BaseCommand from django.core.mail import mail_admins -try: - from subprocess import getstatusoutput -except ImportError: - from commands import getstatusoutput +from subprocess import getstatusoutput from mdb.models import Domain, Ip4Subnet, Ip6Subnet diff --git a/mdb/validators.py b/mdb/validators.py index 5959f1b..e2b2a0a 100644 --- a/mdb/validators.py +++ b/mdb/validators.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from django.core.validators import RegexValidator import re