python2 cleanups

mdb/api/serializers.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 

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
-    from subprocess import getstatusoutput
-except ImportError:
-    from commands import getstatusoutput
 
 from mdb.models import DhcpConfig
 

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
-    from subprocess import getstatusoutput
-except ImportError:
-    from commands import getstatusoutput
 
 from mdb.models import Domain, Ip4Subnet, Ip6Subnet
 

mdb/validators.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from django.core.validators import RegexValidator
 import re