Site Sections: Satchmo Main | Wiki | Demo Store |

Changeset 1257

Show
Ignore:
Timestamp:
06/15/08 00:22:10 (5 months ago)
Author:
bkroeze
Message:

moved shop/utils to utils

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • satchmo/branches/nfa/satchmo/accounts/forms.py

    r1057 r1257  
    77from satchmo.configuration import config_value 
    88from satchmo.contact.models import Contact 
    9 from satchmo.shop.utils.unique_id import generate_id 
     9from satchmo.utils.unique_id import generate_id 
    1010 
    1111import logging 

  • satchmo/branches/nfa/satchmo/caching/__init__.py

    r1256 r1257  
    44from django.core.cache import cache 
    55from django.utils.encoding import smart_str 
    6 from satchmo.shop.utils import is_string_like, is_list_or_tuple 
     6from satchmo.utils import is_string_like, is_list_or_tuple 
    77import cPickle as pickle 
    88import logging 

  • satchmo/branches/nfa/satchmo/configuration/functions.py

    r836 r1257  
    11from django.conf import settings 
    22from models import SettingNotSet 
    3 from satchmo.shop.utils import flatten_list, is_list_or_tuple, is_string_like, load_module 
     3from satchmo.utils import flatten_list, is_list_or_tuple, is_string_like, load_module 
    44import logging 
    55import values 

  • satchmo/branches/nfa/satchmo/configuration/values.py

    r1131 r1257  
    44""" 
    55from django import newforms as forms 
     6from django.utils import simplejson 
    67from django.utils.datastructures import SortedDict 
    78from django.utils.encoding import smart_str 
    89from django.utils.translation import gettext, ugettext_lazy as _ 
    910from models import find_setting, LongSetting, Setting, SettingNotSet 
    10 from satchmo.shop.utils import load_module, is_string_like, is_list_or_tuple 
     11from satchmo.utils import load_module, is_string_like, is_list_or_tuple 
    1112import datetime 
    1213import logging 
    13 from django.utils import simplejson 
    1414 
    1515try: 

  • satchmo/branches/nfa/satchmo/contact/__init__.py

    r1256 r1257  
    1 from satchmo.shop.utils import load_once 
     1from satchmo.utils import load_once 
    22 
    33load_once('contact', 'satchmo.contact.admin') 

  • satchmo/branches/nfa/satchmo/contact/admin.py

    r1256 r1257  
    1 from contact.models import Organization, Contact, Interaction, PhoneNumber, AddressBook, Order, OrderItem, OrderItemDetail, DownloadLink, OrderStatus, OrderPayment, OrderVariable, OrderTaxDetail 
     1from satchmo.contact.models import Organization, Contact, Interaction, PhoneNumber, AddressBook, Order, OrderItem, OrderItemDetail, DownloadLink, OrderStatus, OrderPayment, OrderVariable, OrderTaxDetail 
    22from django.contrib import admin 
    33from django.utils.translation import get_language, ugettext_lazy as _ 
    4  
    54 
    65class Contact_Inline(admin.TabularInline): 

  • satchmo/branches/nfa/satchmo/contact/models.py

    r1256 r1257  
    22Stores customer, organization, and order information. 
    33""" 
    4 try: 
    5     from decimal import Decimal 
    6 except: 
    7     from django.utils._decimal import Decimal 
    8  
    94from django.conf import settings 
    105from django.contrib.auth.models import User 
    …… 
    1712from satchmo.discount.models import Discount 
    1813from satchmo.discount.utils import find_discount_for_code 
    19 from satchmo.payment.config import payment_choices 
     14# TODO: [NFA] Bkroeze - Fix circular import 
     15#from satchmo.payment.config import payment_choices 
     16def payment_choices(): 
     17    return [] 
    2018from satchmo.product.models import Product, DownloadableProduct 
    2119from satchmo.shop.signals import satchmo_cart_changed 
    2220from satchmo.shop.templatetags.satchmo_currency import moneyfmt 
    23 from satchmo.shop.utils import load_module 
    2421from satchmo.tax.utils import get_tax_processor 
     22from satchmo.utils import load_module 
    2523from signals import order_success, satchmo_contact_location_changed 
    2624import config 
    …… 
    3028import satchmo.shipping.config 
    3129import sys 
     30 
     31try: 
     32    from decimal import Decimal 
     33except: 
     34    from django.utils._decimal import Decimal 
    3235 
    3336try: 

  • satchmo/branches/nfa/satchmo/discount/__init__.py

    r1256 r1257  
    1 from satchmo.shop.utils import load_once 
     1from satchmo.utils import load_once 
    22 
    33load_once('discount', 'satchmo.discount.admin') 

  • satchmo/branches/nfa/satchmo/discount/models.py

    r1256 r1257  
    1212from satchmo.product.models import Product 
    1313from satchmo.shop.templatetags.satchmo_currency import moneyfmt 
    14 from satchmo.shop.utils.validators import MutuallyExclusiveWithField 
     14from satchmo.utils.validators import MutuallyExclusiveWithField 
    1515import operator 
    1616import logging 

  • satchmo/branches/nfa/satchmo/giftcertificate/__init__.py

    r1256 r1257  
    1 from satchmo.shop.utils import load_once 
     1from satchmo.utils import load_once 
    22 
    33load_once('giftcertificate', 'satchmo.giftcertificate.admin') 

  • satchmo/branches/nfa/satchmo/giftcertificate/views.py

    r1235 r1257  
    1010from satchmo.payment.common.pay_ship import pay_ship_save 
    1111from satchmo.payment.common.views import confirm, payship 
    12 from satchmo.shop.utils.dynamic import lookup_url, lookup_template 
     12from satchmo.utils.dynamic import lookup_url, lookup_template 
    1313import logging 
    1414 

  • satchmo/branches/nfa/satchmo/l10n/__init__.py

    r1256 r1257  
    1 from satchmo.shop.utils import load_once 
     1from satchmo.utils import load_once 
    22 
    33load_once('l10n', 'satchmo.l10n.admin') 

  • satchmo/branches/nfa/satchmo/l10n/utils.py

    r1131 r1257  
     1from django.conf import settings 
     2from django.core.exceptions import ImproperlyConfigured 
     3from django.utils.translation import get_language, to_locale 
     4from satchmo.configuration import config_value 
     5from satchmo.utils import trunc_decimal 
    16import locale 
    27import logging 
     8 
    39try: 
    410    from decimal import Decimal, ROUND_FLOOR 
    511except: 
    612    from django.utils._decimal import Decimal, ROUND_FLOOR 
    7 from django.conf import settings 
    8 from django.core.exceptions import ImproperlyConfigured 
    9 from django.utils.translation import get_language, to_locale 
    10 from satchmo.configuration import config_value 
    11 from satchmo.shop.utils import trunc_decimal 
    1213 
    1314log = logging.getLogger('l10n.utils') 

  • satchmo/branches/nfa/satchmo/newsletter/__init__.py

    r1256 r1257  
    66from satchmo.accounts.signals import satchmo_registration, satchmo_registration_initialdata 
    77from satchmo.configuration import config_value 
    8 from satchmo.shop.utils import load_module, load_once 
     8from satchmo.utils import load_module, load_once 
    99import logging 
    1010 

  • satchmo/branches/nfa/satchmo/newsletter/config.py

    r984 r1257  
    22from django.utils.translation import ugettext_lazy as _ 
    33from satchmo.configuration import * 
    4 from satchmo.shop.utils import load_module 
     4from satchmo.utils import load_module 
    55 
    66NEWSLETTER_GROUP = ConfigurationGroup('NEWSLETTER', _('Newsletter Settings')) 

  • satchmo/branches/nfa/satchmo/payment/__init__.py

    r1256 r1257  
    1 from satchmo.shop.utils import load_once 
     1from satchmo.utils import load_once 
    22 
    33load_once('payment', 'satchmo.payment.admin') 

  • satchmo/branches/nfa/satchmo/payment/common/forms.py

    r1211 r1257  
    1212from satchmo.shipping.config import shipping_methods 
    1313from satchmo.shop.models import Cart 
    14 from satchmo.shop.utils.dynamic import lookup_template 
     14from satchmo.utils.dynamic import lookup_template 
    1515from satchmo.shop.views.utils import CreditCard 
    1616from satchmo.tax.templatetags.satchmo_tax import _get_taxprocessor 

  • satchmo/branches/nfa/satchmo/payment/common/views/common_contact.py

    r1103 r1257  
    1111from satchmo.payment.common.forms import PaymentContactInfoForm 
    1212from satchmo.shop.models import Cart 
    13 from satchmo.shop.utils.dynamic import lookup_url 
     13from satchmo.utils.dynamic import lookup_url 
    1414 
    1515def contact_info(request): 

  • satchmo/branches/nfa/satchmo/payment/common/views/confirm.py

    r1235 r1257  
    1212from satchmo.payment.common.pay_ship import send_order_confirmation 
    1313from satchmo.payment.config import payment_live 
    14 from satchmo.shop.utils.dynamic import lookup_url, lookup_template 
     14from satchmo.utils.dynamic import lookup_url, lookup_template 
    1515from satchmo.shop.models import Cart 
    1616import logging 

  • satchmo/branches/nfa/satchmo/payment/common/views/payship.py

    r1235 r1257  
    1818from satchmo.payment.models import CreditCardDetail 
    1919from satchmo.shop.models import Cart 
    20 from satchmo.shop.utils.dynamic import lookup_url, lookup_template 
     20from satchmo.utils.dynamic import lookup_url, lookup_template 
    2121 
    2222selection = _("Please Select") 

  • satchmo/branches/nfa/satchmo/payment/config.py

    r1256 r1257  
    22from django.utils.translation import ugettext_lazy, ugettext 
    33from satchmo.configuration import * 
    4 from satchmo.shop.utils import is_string_like, load_module 
     4from satchmo.utils import is_string_like, load_module 
     5import logging 
     6 
    57_ = ugettext_lazy 
    68 
    7 import logging 
    89log = logging.getLogger('payment.config') 
    910 

  • satchmo/branches/nfa/satchmo/payment/models.py

    r1256 r1257  
    44""" 
    55 
    6 from satchmo.configuration import config_value 
    76from Crypto.Cipher import Blowfish 
    87from datetime import datetime 
     8from django.conf import settings 
     9from django.db import models 
     10from django.utils.translation import ugettext_lazy as _ 
     11from satchmo import caching 
     12from satchmo.configuration import config_value 
     13from satchmo.contact.models import Contact, OrderPayment 
     14from satchmo.payment.config import payment_choices, credit_choices 
     15import base64 
     16import logging 
     17 
    918try: 
    1019    from decimal import Decimal 
    1120except: 
    1221    from django.utils._decimal import Decimal 
    13  
    14 from django.conf import settings 
    15 from django.db import models 
    16 from django.utils.translation import ugettext_lazy as _ 
    17 #from modules.giftcertificate.utils import generate_certificate_code 
    18 from satchmo import caching 
    19 from satchmo.contact.models import Contact, OrderPayment 
    20 from satchmo.payment.config import payment_choices, credit_choices 
    21 import base64 
    22 import logging 
    2322 
    2423log = logging.getLogger('payment.models') 

  • satchmo/branches/nfa/satchmo/payment/modules/authorizenet/processor.py

    r1242 r1257  
    11from satchmo.payment.common.utils import record_payment 
    2 from satchmo.shop.utils import trunc_decimal 
     2from satchmo.utils import trunc_decimal 
    33from urllib import urlencode 
    44import logging 

  • satchmo/branches/nfa/satchmo/payment/modules/autosuccess/views.py

    r1028 r1257  
    55from satchmo.contact.models import Order, Contact, OrderPayment 
    66from satchmo.payment.common.pay_ship import pay_ship_save, send_order_confirmation 
    7 from satchmo.shop.utils.dynamic import lookup_url, lookup_template 
     7from satchmo.utils.dynamic import lookup_url, lookup_template 
    88from satchmo.shop.models import Cart 
    99from satchmo.payment.common.utils import record_payment 

  • satchmo/branches/nfa/satchmo/payment/modules/cybersource/processor.py

    r1034 r1257  
    11from django.template import Context, loader 
    22from satchmo.payment.common.utils import record_payment 
    3 from satchmo.shop.utils import trunc_decimal 
     3from satchmo.utils import trunc_decimal 
    44import urllib2 
    55try: 

  • satchmo/branches/nfa/satchmo/payment/modules/google/views.py

    r1053 r1257  
    99from satchmo.payment.common.views import payship 
    1010from satchmo.payment.config import payment_live 
    11 from satchmo.shop.utils.dynamic import lookup_url, lookup_template 
     11from satchmo.utils.dynamic import lookup_url, lookup_template 
    1212from satchmo.shop.models import Cart 
    1313import base64 

  • satchmo/branches/nfa/satchmo/payment/modules/paypal/views.py

    r1127 r1257  
    1919from satchmo.payment.config import payment_live 
    2020from satchmo.shop.models import Cart 
    21 from satchmo.shop.utils.dynamic import lookup_url, lookup_template 
     21from satchmo.utils.dynamic import lookup_url, lookup_template 
    2222 
    2323log = logging.getLogger() 

  • satchmo/branches/nfa/satchmo/payment/tests.py

    r1114 r1257  
    11# -*- coding: UTF-8 -*- 
     2 
     3from django.conf import settings 
     4from django.core import urlresolvers 
     5from django.test import TestCase 
     6from django.test.client import Client 
     7from satchmo.configuration import config_get_group, config_value 
     8from satchmo.contact.models import * 
     9from satchmo.product.models import * 
     10from satchmo.shop.models import * 
     11from satchmo.utils.dynamic import lookup_template, lookup_url 
     12from urls import make_urlpatterns 
     13 
    214try: 
    315    from decimal import Decimal 
    416except: 
    517    from django.utils._decimal import Decimal 
    6  
    7 from django.core import urlresolvers 
    8 from django.test import TestCase 
    9 from django.test.client import Client 
    10 from django.conf import settings 
    11 #from models import GiftCertificate 
    12 from satchmo.configuration import config_get_group, config_value 
    13 from satchmo.shop.utils.dynamic import lookup_template, lookup_url 
    14 from urls import make_urlpatterns 
    15 #from modules.giftcertificate.utils import generate_certificate_code, generate_code 
    16 from satchmo.product.models import * 
    17 from satchmo.shop.models import * 
    18 from satchmo.contact.models import * 
    1918 
    2019alphabet = 'abcdefghijklmnopqrstuvwxyz' 

  • satchmo/branches/nfa/satchmo/payment/views.py

    r1114 r1257  
    1 try: 
    2     from decimal import Decimal 
    3 except: 
    4     from django.utils._decimal import Decimal 
    5  
    61from django.core import urlresolvers 
    72from django.http import HttpResponse, HttpResponseRedirect 
    …… 
    138from satchmo.payment.common.forms import PaymentMethodForm 
    149from satchmo.payment.common.views import common_contact 
    15 from satchmo.shop.utils.dynamic import lookup_url 
    1610from satchmo.shop.views.utils import bad_or_missing 
     11from satchmo.utils.dynamic import lookup_url 
    1712import django.newforms as forms 
    1813import logging 
    1914 
     15try: 
     16    from decimal import Decimal 
     17except: 
     18    from django.utils._decimal import Decimal 
    2019 
    2120log = logging.getLogger('payment.views') 

  • satchmo/branches/nfa/satchmo/product/__init__.py

    r1256 r1257  
    1 from satchmo.shop.utils import load_once 
     1from satchmo.utils import load_once 
    22 
    33load_once('product', 'satchmo.product.admin') 

  • satchmo/branches/nfa/satchmo/product/config.py

    r1240 r1257  
    22from django.utils.translation import ugettext_lazy as _ 
    33from satchmo.configuration import * 
    4 from satchmo.shop.utils import load_module 
     4from satchmo.utils import load_module 
    55 
    66PRODUCT_GROUP = ConfigurationGroup('PRODUCT', _('Product Settings')) 

  • satchmo/branches/nfa/satchmo/product/models.py

    r1256 r1257  
    44options. 
    55""" 
    6 import datetime 
    7 import random 
    8 import sha 
    9 import logging 
    10 try: 
    11     from decimal import Decimal 
    12 except: 
    13     from django.utils._decimal import Decimal 
    14  
    156from django.conf import settings 
    167from django.core import validators, urlresolvers 
    …… 
    2011from django.utils.translation import get_language, ugettext_lazy as _ 
    2112from satchmo.configuration import config_value 
    22 from satchmo.shop.utils import cross_list, normalize_dir 
    23 from satchmo.shop.utils import url_join 
    24 from satchmo.shop.utils.unique_id import slugify 
    25 from satchmo.shop.utils.validators import ValidateIfFieldsSame 
    2613from satchmo.tax.models import TaxClass 
    2714from satchmo.thumbnail.field import ImageWithThumbnailField 
    28 #from sets import Set 
     15from satchmo.utils import cross_list, normalize_dir, url_join 
     16from satchmo.utils.unique_id import slugify 
     17from satchmo.utils.validators import ValidateIfFieldsSame 
     18import datetime 
     19import logging 
     20import random 
     21import sha 
     22 
     23try: 
     24    from decimal import Decimal 
     25except: 
     26    from django.utils._decimal import Decimal 
     27 
    2928try: 
    3029    set 

  • satchmo/branches/nfa/satchmo/product/views.py

    r1256 r1257  
    1010from satchmo.product.models import Category, Product, ConfigurableProduct, ProductVariation 
    1111from satchmo.shop.models import Config 
    12 from satchmo.shop.utils.json import json_encode 
    1312from satchmo.shop.views.utils import bad_or_missing 
    1413from satchmo.tax.utils import get_tax_processor 
    15 #from sets import Set 
     14from satchmo.utils.json import json_encode 
     15import datetime 
     16import logging 
     17import random 
     18 
    1619try: 
    1720    set 
    1821except NameError: 
    1922    from sets import Set as set     #python 2.3 fallback 
    20  
    21 import datetime 
    22 import logging 
    23 import random 
    2423         
    2524log = logging.getLogger('product.views') 

  • satchmo/branches/nfa/satchmo/shipping/config.py

    r1006 r1257  
    22from django.utils.translation import ugettext_lazy as _ 
    33from satchmo.configuration import * 
    4 from satchmo.shop.utils import is_string_like, load_module 
     4from satchmo.utils import is_string_like, load_module 
    55 
    66SHIPPING_GROUP = ConfigurationGroup('SHIPPING', _('Shipping Settings')) 

  • satchmo/branches/nfa/satchmo/shipping/modules/tiered/__init__.py

    r1256 r1257  
    11from models import Carrier, Shipper 
    2 from satchmo.shop.utils import load_once 
     2from satchmo.utils import load_once 
    33 
    44load_once('tiered', 'satchmo.shipping.modules.tiered') 

  • satchmo/branches/nfa/satchmo/shop/SSLMiddleware.py

    r1131 r1257  
    5050__author__ = "Stephen Zabel" 
    5151 
    52  
    5352from django.conf import settings 
    5453from django.http import HttpResponseRedirect, get_host 
    5554from satchmo.shop.models import Config 
    56 from satchmo.shop.utils import request_is_secure 
     55from satchmo.utils import request_is_secure 
    5756 
    5857SSL = 'SSL' 

  • satchmo/branches/nfa/satchmo/shop/__init__.py

    r1256 r1257  
    1 from satchmo.shop.utils import load_once 
     1from satchmo.utils import load_once 
    22 
    33load_once('shop', 'satchmo.shop.admin') 

  • satchmo/branches/nfa/satchmo/shop/context_processors.py

    r1144 r1257  
    88from satchmo.product.models import Category 
    99from satchmo.shop.models import Config, NullConfig, Cart, NullCart 
    10 from satchmo.shop.utils import request_is_secure 
     10from satchmo.utils import request_is_secure 
    1111import logging 
    1212 

  • satchmo/branches/nfa/satchmo/shop/models.py

    r1256 r1257  
    33Also contains shopping cart and related classes. 
    44""" 
    5 import datetime 
    6 try: 
    7     from decimal import Decimal 
    8 except: 
    9     from django.utils._decimal import Decimal 
    10  
    11 from logging import getLogger 
    12  
    135from django.conf import settings 
    146from django.contrib.sites.models import Site 
    …… 
    168from django.utils.encoding import force_unicode 
    179from django.utils.translation import ugettext_lazy as _ 
    18  
    1910from satchmo import tax 
    2011from satchmo.configuration import ConfigurationSettings, config_value 
    …… 
    2213from satchmo.l10n.models import Country 
    2314from satchmo.product.models import Product 
    24 from satchmo.shop.utils import url_join 
     15from satchmo.utils import url_join 
     16import datetime 
     17 
     18try: 
     19    from decimal import Decimal 
     20except: 
     21    from django.utils._decimal import Decimal 
     22 
     23from logging import getLogger 
    2524 
    2625log = getLogger('satchmo.shop.models') 

  • satchmo/branches/nfa/satchmo/shop/templatetags/satchmo_util.py

    r1237 r1257  
    33from satchmo.shop.templatetags import get_filter_args 
    44from satchmo.shop import utils 
    5 from satchmo.shop.utils.json import json_encode 
     5from satchmo.utils.json import json_encode 
    66 
    77register = template.Library() 

  • satchmo/branches/nfa/satchmo/shop/urls.py

    r1195 r1257  
     1from django.conf import settings 
    12from django.conf.urls.defaults import * 
    2 from django.conf import settings 
     3from satchmo.configuration import config_value 
    34from satchmo.product.models import Product 
    45from satchmo.product.views import display_featured 
    5 from satchmo.shop.utils import app_enabled 
    6 from satchmo.configuration import config_value 
     6from satchmo.utils import app_enabled 
    77 
    88num_to_paginate = config_value('SHOP','NUM_PAGINATED') 
    9  
    109 
    1110urlpatterns = getattr(settings, 'SHOP_URLS', []) 

  • satchmo/branches/nfa/satchmo/shop/views/cart.py

    r1250 r1257  
    1919from satchmo.shop.models import Cart, CartItem, NullCart 
    2020from satchmo.shop.signals import satchmo_cart_changed 
    21 from satchmo.shop.utils import trunc_decimal 
     21from satchmo.utils import trunc_decimal 
    2222from satchmo.shop.views.utils import bad_or_missing 
    2323import logging 

  • satchmo/branches/nfa/satchmo/shop/views/smart.py

    r1235 r1257  
    66 to send the request to the cart_add or the wishlist_add view. 
    77""" 
    8 from satchmo.shop.utils import app_enabled 
     8from satchmo.utils import app_enabled 
    99from satchmo.shop.views import cart 
    1010import logging 

  • satchmo/branches/nfa/satchmo/supplier/__init__.py

    r1256 r1257  
    1 from satchmo.shop.utils import load_once 
     1from satchmo.utils import load_once 
    22 
    33load_once('supplier', 'satchmo.supplier.admin') 

  • satchmo/branches/nfa/satchmo/tax/__init__.py

    r1256 r1257  
    1 from satchmo.shop.utils import load_once 
     1from satchmo.utils import load_once 
    22 
    33load_once('tax', 'satchmo.tax.admin') 

  • satchmo/branches/nfa/satchmo/tax/config.py

    r994 r1257  
    22from django.utils.translation import ugettext_lazy as _ 
    33from satchmo.configuration import * 
    4 from satchmo.shop.utils import is_string_like, load_module 
     4from satchmo.utils import is_string_like, load_module 
    55 
    66TAX_GROUP = ConfigurationGroup('TAX', _('Tax Settings')) 

  • satchmo/branches/nfa/satchmo/tax/models.py

    r1256 r1257  
    33""" 
    44 
     5from django.core import validators 
    56from django.db import models 
     7from django.utils.translation import ugettext, ugettext_lazy as _ 
    68from satchmo.l10n.models import AdminArea, Country 
    7 from satchmo.shop.utils.validators import MutuallyExclusiveWithField 
    8 from django.utils.translation import ugettext, ugettext_lazy as _ 
    9 from django.core import validators 
     9from satchmo.utils.validators import MutuallyExclusiveWithField 
    1010 
    1111class TaxClass(models.Model): 

  • satchmo/branches/nfa/satchmo/tax/modules/area/tax.py

    r1168 r1257  
    1010from satchmo.l10n.models import AdminArea, Country 
    1111from satchmo.shop.models import Config 
    12 from satchmo.shop.utils import is_string_like 
     12from satchmo.utils import is_string_like 
    1313from satchmo.tax.models import TaxRate, TaxClass 
    1414import logging 

  • satchmo/branches/nfa/satchmo/tax/utils.py

    r1256 r1257  
    11from satchmo.configuration import config_value 
    2 from satchmo.shop.utils import load_module, load_once 
     2from satchmo.utils import load_module, load_once 
    33try: 
    44    import decimal 

  • satchmo/branches/nfa/satchmo/utils/dynamic.py

    r898 r1257  
     1from django.contrib.sites.models import Site 
    12from django.core import urlresolvers 
    2 from satchmo.shop.utils import url_join 
    3 from django.contrib.sites.models import Site 
     3from satchmo.utils import url_join 
    44 
    55def lookup_template(settings, template): 

  • satchmo/branches/nfa/satchmo/utils/unique_id.py

    r1150 r1257  
    66 
    77from django.contrib.auth.models import User 
    8 from satchmo.shop.utils import random_string 
     8from django.utils.encoding import smart_unicode, force_unicode 
     9from htmlentitydefs import name2codepoint 
     10from satchmo.utils import random_string 
    911import re 
    1012import unicodedata 
    11 from htmlentitydefs import name2codepoint 
    12 from django.utils.encoding import smart_unicode, force_unicode 
    1313 
    1414def generate_id(first_name=None, last_name=None): 

  • satchmo/branches/nfa/satchmo/wishlist/__init__.py

    r1256 r1257  
    1 from satchmo.shop.utils import load_once 
     1from satchmo.utils import load_once 
    22 
    33load_once('wishlist', 'satchmo.wishlist.admin')