From 43350869e0edf937ebbbaee932c3a2526ac87deb Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Tue, 25 Apr 2017 03:55:05 +0530 Subject: [PATCH] Reverted some files back to as they were in master. They had been reorganized. --- dynamicweb/settings/base.py | 4 +++- hosting/admin.py | 3 ++- hosting/models.py | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index c6c71ad5..b961db5e 100644 --- a/dynamicweb/settings/base.py +++ b/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 diff --git a/hosting/admin.py b/hosting/admin.py index 1172112e..b4f1ba24 100644 --- a/hosting/admin.py +++ b/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 diff --git a/hosting/models.py b/hosting/models.py index c24d45d7..6f3304fe 100644 --- a/hosting/models.py +++ b/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