From 105e6988e58b23acdc82e9f866b33c4f85c953e2 Mon Sep 17 00:00:00 2001
From: James Polley <jp@jamezpolley.com>
Date: Fri, 29 Sep 2017 23:42:38 +1000
Subject: [PATCH] Merge migrations with upstream
Find urlencode, wherever it may hide
Further work to using latest upstream registrasion
---
pinaxcon/settings.py | 2 +-
.../migrations/0007_merge_20170929_2331.py | 16 ++++++++++++++++
.../templatetags/registrasion_tags.py | 5 ++++-
vendor/registrasion/registrasion/util.py | 2 +-
4 files changed, 22 insertions(+), 3 deletions(-)
create mode 100644 vendor/registrasion/registrasion/migrations/0007_merge_20170929_2331.py
diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 8dec25d8..6f2ff238 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -322,7 +322,7 @@ PROPOSAL_FORMS = {
ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile"
ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"
INVOICE_CURRENCY = "AUD"
-
+TICKET_PRODUCT_CATEGORY = 1
ATTENDEE_PROFILE_FORM = "pinaxcon.registrasion.forms.ProfileForm"
# CSRF custom error screen
diff --git a/vendor/registrasion/registrasion/migrations/0007_merge_20170929_2331.py b/vendor/registrasion/registrasion/migrations/0007_merge_20170929_2331.py
new file mode 100644
index 00000000..4630ccaf
--- /dev/null
+++ b/vendor/registrasion/registrasion/migrations/0007_merge_20170929_2331.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-09-29 13:31
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('registrasion', '0006_auto_20170702_2233'),
+ ('registrasion', '0006_auto_20170526_1624'),
+ ]
+
+ operations = [
+ ]
diff --git a/vendor/registrasion/registrasion/templatetags/registrasion_tags.py b/vendor/registrasion/registrasion/templatetags/registrasion_tags.py
index 4c72431b..e87be9e8 100644
--- a/vendor/registrasion/registrasion/templatetags/registrasion_tags.py
+++ b/vendor/registrasion/registrasion/templatetags/registrasion_tags.py
@@ -5,7 +5,10 @@ from registrasion.controllers.item import ItemController
from django import template
from django.conf import settings
from django.db.models import Sum
-from urllib import urlencode # TODO: s/urllib/six.moves.urllib/
+try:
+ from urllib import urlencode
+except ImportError:
+ from urllib.parse import urlencode
register = template.Library()
diff --git a/vendor/registrasion/registrasion/util.py b/vendor/registrasion/registrasion/util.py
index b5fa0620..98079c7e 100644
--- a/vendor/registrasion/registrasion/util.py
+++ b/vendor/registrasion/registrasion/util.py
@@ -12,7 +12,7 @@ def generate_access_code():
length = 6
# all upper-case letters + digits 1-9 (no 0 vs O confusion)
- chars = string.uppercase + string.digits[1:]
+ chars = string.ascii_uppercase + string.digits[1:]
# 6 chars => 35 ** 6 = 1838265625 (should be enough for anyone)
return get_random_string(length=length, allowed_chars=chars)