Files after running 2to3.py.

[philipp/winterrodeln/wradmin.git] / wradmin / lib / helpers.py

diff --git a/wradmin/lib/helpers.py b/wradmin/lib/helpers.py
index c2f5e920af8f1e39d7ded9e8463200b052c7ac3d..3e0247cbfe61bf593225a5e29cf21d145a234654 100644 (file)
--- a/wradmin/lib/helpers.py
+++ b/wradmin/lib/helpers.py
@@ -13,18 +13,18 @@ from webhelpers.html.tags import file, form, end_form, submit
 def wiki(page_title=None):
     "Creates a link to the specified page in the www.winterrodeln.org wiki"
     if page_title is None: page_title = 'Hauptseite'
-    return u'http://www.winterrodeln.org/wiki/' + page_title
+    return 'http://www.winterrodeln.org/wiki/' + page_title
 
 
 def forum(forum=None):
     "Creates a link to the specified forum. If no id is given, a general link is created."
-    if forum is None: return u'http://winterrodeln-forum.org/'
-    return u'http://winterrodeln-forum.org/viewforum.php?f=%d' % forum
+    if forum is None: return 'http://winterrodeln-forum.org/'
+    return 'http://winterrodeln-forum.org/viewforum.php?f=%d' % forum
 
 
 def google_maps(latitude, longitude):
     "Builds an URL like http://maps.google.at/maps?q=47.200607,11.260007"
-    return u"http://maps.google.at/maps?q=%.6f,%.6f" % (latitude, longitude)
+    return "http://maps.google.at/maps?q=%.6f,%.6f" % (latitude, longitude)
 
 
 def bool(value):
@@ -43,6 +43,6 @@ def tristate_float(value):
 
 
 def public_transport(value):
-    if isinstance(value, long): value = int(value)
+    if isinstance(value, int): value = int(value)
     return wrpylib.wrvalidators.GermanPublicTransport().from_python(value)