1.1 --- a/actions/EventAggregatorNewEvent.py Sat Apr 02 19:07:50 2011 +0200
1.2 +++ b/actions/EventAggregatorNewEvent.py Sun Apr 03 02:06:01 2011 +0200
1.3 @@ -13,10 +13,7 @@
1.4 from MoinMoin.action import ActionBase
1.5 from MoinMoin.Page import Page
1.6 from MoinMoin.PageEditor import PageEditor
1.7 -import EventAggregatorSupport
1.8 -
1.9 -escape = EventAggregatorSupport.escape
1.10 -escattr = EventAggregatorSupport.escattr
1.11 +from EventAggregatorSupport import *
1.12
1.13 try:
1.14 import pytz
1.15 @@ -27,7 +24,7 @@
1.16
1.17 # Action class and supporting functions.
1.18
1.19 -class EventAggregatorNewEvent(ActionBase, EventAggregatorSupport.ActionSupport):
1.20 +class EventAggregatorNewEvent(ActionBase, ActionSupport):
1.21
1.22 "An event creation dialogue requesting various parameters."
1.23
1.24 @@ -54,10 +51,7 @@
1.25 category_list = []
1.26 category_pagenames = form.get("category", [])
1.27
1.28 - for category_name, category_pagename in \
1.29 - EventAggregatorSupport.getCategoryMapping(
1.30 - EventAggregatorSupport.getCategories(request),
1.31 - request):
1.32 + for category_name, category_pagename in getCategoryMapping(getCategories(request), request):
1.33
1.34 selected = self._get_selected_for_list(category_pagename, category_pagenames)
1.35
1.36 @@ -525,12 +519,12 @@
1.37 except (TypeError, ValueError):
1.38 return 0, _("Hours, minutes and seconds must be numbers yielding a valid time!")
1.39
1.40 - start_date = EventAggregatorSupport.DateTime(
1.41 + start_date = DateTime(
1.42 (start_year, start_month, start_day, start_hour, start_minute, start_second, start_zone)
1.43 )
1.44 start_date.constrain()
1.45
1.46 - end_date = EventAggregatorSupport.DateTime(
1.47 + end_date = DateTime(
1.48 (end_year, end_month, end_day, end_hour, end_minute, end_second, end_zone)
1.49 )
1.50 end_date.constrain()
1.51 @@ -556,7 +550,7 @@
1.52
1.53 # Use any parent page information.
1.54
1.55 - full_title = EventAggregatorSupport.getFullPageName(parent, title)
1.56 + full_title = getFullPageName(parent, title)
1.57
1.58 # Load the new page and replace the event details in the body.
1.59
1.60 @@ -567,8 +561,7 @@
1.61
1.62 # Complete the new page.
1.63
1.64 - EventAggregatorSupport.fillEventPageFromTemplate(template_page,
1.65 - new_page, event_details, category_pagenames)
1.66 + fillEventPageFromTemplate(template_page, new_page, event_details, category_pagenames)
1.67
1.68 # Redirect and return success.
1.69