projects
/
geekigeeki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UTF-8 fixup for Python 3.0
[geekigeeki.git]
/
geekigeeki.py
diff --git
a/geekigeeki.py
b/geekigeeki.py
index ca16283d5ea2f2c78c573b3863a371add9c15aef..6e1ba6ea4a5a2c9ddd808ebe717d499d8cb8731e 100755
(executable)
--- a/
geekigeeki.py
+++ b/
geekigeeki.py
@@
-221,7
+221,7
@@
def handle_fullsearch(needle):
print("<ul>")
for (count, page_name) in hits:
print('<li><p>' + Page(page_name).link_to())
print("<ul>")
for (count, page_name) in hits:
print('<li><p>' + Page(page_name).link_to())
- print(' . . . . ' +
rep
r(count))
+ print(' . . . . ' +
st
r(count))
print(['match', 'matches'][count != 1])
print('</p></li>')
print("</ul>")
print(['match', 'matches'][count != 1])
print('</p></li>')
print("</ul>")
@@
-544,7
+544,7
@@
class WikiFormatter:
indent_re = re.compile(r"^\s*")
tr_re = re.compile(r"^\s*\|\|")
eol_re = re.compile(r"\r?\n")
indent_re = re.compile(r"^\s*")
tr_re = re.compile(r"^\s*\|\|")
eol_re = re.compile(r"\r?\n")
- for self.line in eol_re.split(str(self.raw.expandtabs())):
+ for self.line in eol_re.split(str(self.raw.expandtabs()
, 'utf-8'
)):
# Skip pragmas
if self.in_header:
if self.line.startswith('#'):
# Skip pragmas
if self.in_header:
if self.line.startswith('#'):
@@
-584,7
+584,7
@@
class Page:
return os.path.join(data_dir, self.page_name)
def _tmp_filename(self):
return os.path.join(data_dir, self.page_name)
def _tmp_filename(self):
- return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' +
rep
r(os.getpid()) + '#'))
+ return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' +
st
r(os.getpid()) + '#'))
def exists(self):
try:
def exists(self):
try:
@@
-631,6
+631,7
@@
class Page:
def pragmas(self):
if not '_pragmas' in self.__dict__:
def pragmas(self):
if not '_pragmas' in self.__dict__:
+ self._pragmas = {}
try:
file = open(self._filename(), 'rt')
attr_re = re.compile(r"^#(\S*)(.*)$")
try:
file = open(self._filename(), 'rt')
attr_re = re.compile(r"^#(\S*)(.*)$")