Reverted some files back to as they were in master. They had been reorganized.

dynamicweb/settings/base.py

@@ -6,9 +6,11 @@ Copyright 2015 ungleich.
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 
-import dotenv
 from django.utils.translation import ugettext_lazy as _
 
+# dotenv
+import dotenv
+
 gettext = lambda s: s
 
 

hosting/admin.py

@@ -1,8 +1,9 @@
 from django.contrib import admin
-from django.core.urlresolvers import reverse
 from django.utils.html import format_html
+from django.core.urlresolvers import reverse
 
 from utils.mailer import BaseEmail
+
 from .forms import HostingOrderAdminForm
 from .models import VirtualMachineType, VirtualMachinePlan, HostingOrder, ManageVM
 from .opennebula_functions import HostingManageVMAdmin

hosting/models.py

@@ -1,13 +1,14 @@
 import os
 
-from Crypto.PublicKey import RSA
 from django.db import models
 from django.utils.functional import cached_property
+
+from Crypto.PublicKey import RSA
 from stored_messages.settings import stored_messages_settings
 
 from membership.models import StripeCustomer
-from utils.mixins import AssignPermissionsMixin
 from utils.models import BillingAddress
+from utils.mixins import AssignPermissionsMixin
 from .managers import VMPlansManager