Commit 154c0889 authored by Guido van Rossum's avatar Guido van Rossum

Refactor cmd_view(): move line formatting to a helper method.

parent 9c3848b3
...@@ -31,10 +31,15 @@ class WikiPage: ...@@ -31,10 +31,15 @@ class WikiPage:
line = line.rstrip() line = line.rstrip()
if not line: if not line:
print "<p>" print "<p>"
continue else:
words = re.split('(\W+)', line) print self.formatline(line)
for i in range(len(words)): print "<hr>"
word = words[i] print "<p>", self.mklink("edit", self.name, "Edit this page") + ";"
print self.mklink("view", "FrontPage", "go to front page") + "."
def formatline(self, line):
words = []
for word in re.split('(\W+)', line):
if self.iswikiword(word): if self.iswikiword(word):
if os.path.isfile(self.mkfile(word)): if os.path.isfile(self.mkfile(word)):
word = self.mklink("view", word, word) word = self.mklink("view", word, word)
...@@ -42,11 +47,8 @@ class WikiPage: ...@@ -42,11 +47,8 @@ class WikiPage:
word = self.mklink("new", word, word + "*") word = self.mklink("new", word, word + "*")
else: else:
word = escape(word) word = escape(word)
words[i] = word words.append(word)
print "".join(words) return "".join(words)
print "<hr>"
print "<p>", self.mklink("edit", self.name, "Edit this page") + ";"
print self.mklink("view", "FrontPage", "go to front page") + "."
def cmd_edit(self, form, label="Change"): def cmd_edit(self, form, label="Change"):
print "<h1>", label, self.name, "</h1>" print "<h1>", label, self.name, "</h1>"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment