From 183dea0b6e51cdb0704eb94d8e1637d574b7bc80 Mon Sep 17 00:00:00 2001 From: James Polley Date: Sun, 17 Sep 2017 22:08:39 +1000 Subject: [PATCH 1/3] Python3 compatibility in timetable listing itertools changed a little between py2 and py3 --- vendor/symposion/schedule/timetable.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/symposion/schedule/timetable.py b/vendor/symposion/schedule/timetable.py index 7ce03460..b0488aae 100644 --- a/vendor/symposion/schedule/timetable.py +++ b/vendor/symposion/schedule/timetable.py @@ -47,5 +47,5 @@ class TimeTable(object): def pairwise(iterable): a, b = itertools.tee(iterable) - b.next() - return itertools.izip_longest(a, b) + next(b) + return itertools.zip_longest(a, b) From 4b3dd5f8e3615a1a8727b9c645b96b6da2ab9f46 Mon Sep 17 00:00:00 2001 From: James Polley Date: Sun, 17 Sep 2017 22:09:44 +1000 Subject: [PATCH 2/3] Re-format sitetree fixture in preparation for update This is just a reformat with "python -m json.tool" --- fixtures/sitetree.json | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/fixtures/sitetree.json b/fixtures/sitetree.json index a765d810..b312253a 100644 --- a/fixtures/sitetree.json +++ b/fixtures/sitetree.json @@ -1,56 +1,56 @@ [ { - "pk": 1, - "model": "sitetree.tree", "fields": { "alias": "main", "title": "main" - } + }, + "model": "sitetree.tree", + "pk": 1 }, { - "pk": 1, - "model": "sitetree.treeitem", "fields": { - "parent": null, - "access_restricted": false, + "access_loggedin": false, + "access_perm_type": 1, "access_permissions": [], + "access_restricted": false, + "alias": null, "description": "", - "insitetree": true, + "hidden": false, "hint": "", - "url": "http://lca2018.org", "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": null, + "sort_order": 2, "title": "LINUX.CONF.AU 2018", "tree": 1, - "access_perm_type": 1, - "alias": null, - "sort_order": 2, - "inmenu": true, - "access_loggedin": false, - "hidden": false, + "url": "http://lca2018.org", "urlaspattern": false - } + }, + "model": "sitetree.treeitem", + "pk": 1 }, { - "pk": 2, - "model": "sitetree.treeitem", "fields": { - "parent": null, - "access_restricted": false, + "access_loggedin": false, + "access_perm_type": 1, "access_permissions": [], + "access_restricted": false, + "alias": null, "description": "", - "insitetree": true, + "hidden": false, "hint": "", - "url": "dashboard", "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": null, + "sort_order": 3, "title": "Dashboard", "tree": 1, - "access_perm_type": 1, - "alias": null, - "sort_order": 3, - "inmenu": true, - "access_loggedin": false, - "hidden": false, + "url": "dashboard", "urlaspattern": true - } + }, + "model": "sitetree.treeitem", + "pk": 2 } ] From 03d98a1a3307b1e247049227d9d0a5c76417d8cb Mon Sep 17 00:00:00 2001 From: James Polley Date: Sun, 17 Sep 2017 22:12:44 +1000 Subject: [PATCH 3/3] Update sitetree from prod --- fixtures/sitetree.json | 399 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 399 insertions(+) diff --git a/fixtures/sitetree.json b/fixtures/sitetree.json index b312253a..faa375fa 100644 --- a/fixtures/sitetree.json +++ b/fixtures/sitetree.json @@ -9,6 +9,7 @@ }, { "fields": { + "access_guest": false, "access_loggedin": false, "access_perm_type": 1, "access_permissions": [], @@ -32,6 +33,7 @@ }, { "fields": { + "access_guest": false, "access_loggedin": false, "access_perm_type": 1, "access_permissions": [], @@ -52,5 +54,402 @@ }, "model": "sitetree.treeitem", "pk": 2 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 52 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": 9, + "sort_order": 3, + "title": "django admin", + "tree": 1, + "url": "/admin", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 3 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 52 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": 9, + "sort_order": 4, + "title": "Ticket Reports", + "tree": 1, + "url": "/tickets/reports/", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 4 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 53 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "change main to miniconf if needed", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": 10, + "sort_order": 7, + "title": "Bulk Update", + "tree": 1, + "url": "/reviews/section/main/admin/accept", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 7 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 53 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "change main to miniconf if needed", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": 10, + "sort_order": 8, + "title": "Notifications", + "tree": 1, + "url": "/reviews/section/main/notification/accepted/", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 8 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 20, + 52 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": null, + "sort_order": 9, + "title": "Admin", + "tree": 1, + "url": "#", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 9 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 288, + 287, + 52, + 53, + 55, + 56 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": null, + "sort_order": 10, + "title": "Talks", + "tree": 1, + "url": "#", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 10 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 290, + 289 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": null, + "sort_order": 11, + "title": "Miniconf", + "tree": 1, + "url": "#", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 11 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [], + "access_restricted": false, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": 11, + "sort_order": 12, + "title": "Bulk Update", + "tree": 1, + "url": "/reviews/section/miniconf/admin/accept", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 12 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [], + "access_restricted": false, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": 11, + "sort_order": 13, + "title": "Notifications", + "tree": 1, + "url": "/reviews/section/miniconf/notification/accepted/", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 13 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 287 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": 10, + "sort_order": 14, + "title": "Review Admin", + "tree": 1, + "url": "/reviews/section/main/admin/", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 14 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 287 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": 10, + "sort_order": 15, + "title": "Voting Status", + "tree": 1, + "url": "/reviews/section/main/status/", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 15 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 289 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": 11, + "sort_order": 17, + "title": "Voting Status", + "tree": 1, + "url": "/reviews/section/miniconf/status/", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 16 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 289 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": 11, + "sort_order": 16, + "title": "Review Admin", + "tree": 1, + "url": "/reviews/section/miniconf/admin/", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 17 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 106, + 107, + 108 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": null, + "sort_order": 18, + "title": "Schedule Admin", + "tree": 1, + "url": "#", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 18 + }, + { + "fields": { + "access_guest": false, + "access_loggedin": false, + "access_perm_type": 1, + "access_permissions": [ + 106, + 107, + 108 + ], + "access_restricted": true, + "alias": null, + "description": "", + "hidden": false, + "hint": "", + "inbreadcrumbs": true, + "inmenu": true, + "insitetree": true, + "parent": 18, + "sort_order": 19, + "title": "Edit", + "tree": 1, + "url": "/schedule/edit", + "urlaspattern": false + }, + "model": "sitetree.treeitem", + "pk": 19 } ]