diff --git a/registrasion/controllers/category.py b/registrasion/controllers/category.py index e1865404..2b2b18d1 100644 --- a/registrasion/controllers/category.py +++ b/registrasion/controllers/category.py @@ -26,7 +26,7 @@ class CategoryController(object): products, otherwise it'll do all. ''' # STOPGAP -- this needs to be elsewhere tbqh - from product import ProductController + from registrasion.controllers.product import ProductController if products is AllProducts: products = inventory.Product.objects.all().select_related( diff --git a/registrasion/controllers/credit_note.py b/registrasion/controllers/credit_note.py index e4784c8b..dea46127 100644 --- a/registrasion/controllers/credit_note.py +++ b/registrasion/controllers/credit_note.py @@ -4,7 +4,7 @@ from django.db import transaction from registrasion.models import commerce -from for_id import ForId +from registrasion.controllers.for_id import ForId class CreditNoteController(ForId, object): diff --git a/registrasion/controllers/invoice.py b/registrasion/controllers/invoice.py index 7b35ea58..1c4b34a4 100644 --- a/registrasion/controllers/invoice.py +++ b/registrasion/controllers/invoice.py @@ -11,9 +11,9 @@ from registrasion.models import commerce from registrasion.models import conditions from registrasion.models import people -from cart import CartController -from credit_note import CreditNoteController -from for_id import ForId +from registrasion.controllers.cart import CartController +from registrasion.controllers.credit_note import CreditNoteController +from registrasion.controllers.for_id import ForId class InvoiceController(ForId, object): diff --git a/registrasion/controllers/item.py b/registrasion/controllers/item.py index bff4aa3b..29345831 100644 --- a/registrasion/controllers/item.py +++ b/registrasion/controllers/item.py @@ -1,6 +1,7 @@ ''' NEEDS TESTS ''' import operator +from functools import reduce from registrasion.models import commerce from registrasion.models import inventory diff --git a/registrasion/forms.py b/registrasion/forms.py index f10f4204..7706ee78 100644 --- a/registrasion/forms.py +++ b/registrasion/forms.py @@ -428,7 +428,7 @@ class InvoicesWithProductAndStatusForm(forms.Form): product = [int(i) for i in product] super(InvoicesWithProductAndStatusForm, self).__init__(*a, **k) - print status + print(status) qs = commerce.Invoice.objects.filter( status=status or commerce.Invoice.STATUS_UNPAID, diff --git a/registrasion/models/__init__.py b/registrasion/models/__init__.py index 944229f4..47efa127 100644 --- a/registrasion/models/__init__.py +++ b/registrasion/models/__init__.py @@ -1,4 +1,4 @@ -from commerce import * # NOQA -from conditions import * # NOQA -from inventory import * # NOQA -from people import * # NOQA +from registrasion.models.commerce import * # NOQA +from registrasion.models.conditions import * # NOQA +from registrasion.models.inventory import * # NOQA +from registrasion.models.people import * # NOQA diff --git a/registrasion/models/commerce.py b/registrasion/models/commerce.py index 72ece2c8..a392c96b 100644 --- a/registrasion/models/commerce.py +++ b/registrasion/models/commerce.py @@ -324,7 +324,7 @@ class CreditNote(PaymentBase): elif hasattr(self, 'creditnoterefund'): reference = self.creditnoterefund.reference - print reference + print(reference) return "Refunded with reference: %s" % reference raise ValueError("This should never happen.") diff --git a/registrasion/reporting/reports.py b/registrasion/reporting/reports.py index 00861072..fe8fbdc7 100644 --- a/registrasion/reporting/reports.py +++ b/registrasion/reporting/reports.py @@ -1,5 +1,5 @@ import csv -import forms +import registrasion.reporting.forms from django.contrib.auth.decorators import user_passes_test from django.shortcuts import render @@ -178,7 +178,7 @@ class Links(Report): return [] def rows(self, content_type): - print self._links + print(self._links) for url, link_text in self._links: yield [ self._linked_text(content_type, url, link_text) diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py index 1c664927..d3a491e1 100644 --- a/registrasion/reporting/views.py +++ b/registrasion/reporting/views.py @@ -1,4 +1,4 @@ -import forms +from registrasion.reporting import forms import collections import datetime @@ -24,11 +24,11 @@ from registrasion import views from symposion.schedule import models as schedule_models -from reports import get_all_reports -from reports import Links -from reports import ListReport -from reports import QuerysetReport -from reports import report_view +from registrasion.reporting.reports import get_all_reports +from registrasion.reporting.reports import Links +from registrasion.reporting.reports import ListReport +from registrasion.reporting.reports import QuerysetReport +from registrasion.reporting.reports import report_view def CURRENCY(): @@ -95,7 +95,7 @@ def items_sold(): total_quantity=Sum("quantity"), ) - print line_items + print(line_items) headings = ["Description", "Quantity", "Price", "Total"] @@ -414,7 +414,7 @@ def attendee(request, form, user_id=None): if user_id is None: return attendee_list(request) - print user_id + print(user_id) attendee = people.Attendee.objects.get(user__id=user_id) name = attendee.attendeeprofilebase.attendee_name() diff --git a/registrasion/templatetags/registrasion_tags.py b/registrasion/templatetags/registrasion_tags.py index 62315919..7108ae95 100644 --- a/registrasion/templatetags/registrasion_tags.py +++ b/registrasion/templatetags/registrasion_tags.py @@ -4,7 +4,7 @@ from registrasion.controllers.item import ItemController from django import template from django.db.models import Sum -from urllib import urlencode +from urllib.parse import urlencode register = template.Library() diff --git a/registrasion/urls.py b/registrasion/urls.py index 221a272a..0789912d 100644 --- a/registrasion/urls.py +++ b/registrasion/urls.py @@ -1,4 +1,4 @@ -from reporting import views as rv +from registrasion.reporting import views as rv from django.conf.urls import include from django.conf.urls import url diff --git a/registrasion/views.py b/registrasion/views.py index 40fde1c9..77c438fd 100644 --- a/registrasion/views.py +++ b/registrasion/views.py @@ -1,6 +1,6 @@ import datetime import sys -import util +from registrasion import util import zipfile from registrasion import forms