diff --git a/wiki/macro/EventCalendar.py b/wiki/macro/EventCalendar.py
index 4da9eb61..249d5b03 100644
--- a/wiki/macro/EventCalendar.py
+++ b/wiki/macro/EventCalendar.py
@@ -1,3 +1,4 @@
+# -*- coding: iso-8859-1 -*-
 """
     EventCalendar.py  Version 0.99a  July 22, 2009
 
@@ -267,7 +268,7 @@ def execute(macro, args):
     if args:
         args=request.getText(args)
 
-    for item in macro.form.items():
+    for item in macro.request.form.items():
         if not form_vals.has_key(item[0]):
 	    try:
 		    form_vals[item[0]]=item[1][0]
@@ -318,7 +319,7 @@ def execute(macro, args):
     html.append( html_result )
     html.append( showmenubar() )
 
-    html.append( showpagelist() )
+    html.append( show_page_list() )
     
     if Params.showerror and Globs.errormsg:
         html.append(u'<p><i><font size="2" color="#aa0000"><ol>%s</ol></font></i>' % Globs.errormsg)