' + print('

') + print link_tag('FrontPage', site_icon or 'Home', 'navlink') if name: - print ' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ' + print(' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ') else: - print ' ' + text + ' ' - print ' | ' + link_tag('FindPage', 'Find Page', 'navlink') + print(' ' + text + ' ') - print(' | ' + link_tag('FrontPage', 'Home', 'navlink')) + print(' | ' + link_tag('FindPage', 'Find Page', 'navlink')) if 'history_url' in globals(): - print ' | Recent Changes' + print(' | Recent Changes') if name: - print ' | Page History' + print(' | Page History') if name: - print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink') + print(' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')) if privileged_url is not None: if writable: - print ' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True) + print(' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True)) else: - print ' | ' + link_tag(name, 'Login', 'navlink', privileged=True) + print(' | ' + link_tag(name, 'Login', 'navlink', privileged=True)) else: - print ' | Immutable Page' + print(' | Immutable Page') user = remote_user() if user != 'AnonymousCoward': - print(' | ') - print ' | ' ++ print(' | ') - print '

' + print('

') - # For each line, we scan through looking for magic - # strings, outputting verbatim any intervening text - # TODO: highlight search words (look at referrer) - scan_re = re.compile( - r"(?:" - # Formatting - + r"(?P\*\*|'''|//|''|##|``|__|\^\^|,,)" - + r"|(?P\={2,6})" - + r"|(?P
\\\\)" - + r"|(?P^-{3,})" - + r"|(?P\b(FIXME|TODO|DONE)\b)" + scan_re = re.compile(r"""(?: + # Styles and formatting + (?P \*\*|'''|//|''|\#\#|``|__|\^\^|,,) + | (?P \={2,6}) + | (?P
\\\\) + | (?P ^-{3,}) + | (?P \b( FIXME | TODO | DONE )\b ) # Links - + r"|(?P\<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>)" - + r"|(?P\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])" + | (?P \<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>) + | (?P \[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\]) # Inline HTML - + r"|(?P<(/|)(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])[^>]*>)" - + r"|(?P[<>&])" + | (?P <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b ) + | (?P ( /\s*> | ) ) + | (?P [<>&] ) # Auto links (LEGACY) - + r"|(?P\b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp|ico))" - + r"|(?P\b(?:[A-Z][a-z]+){2,}\b)" - + r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)" - + r"|(?P[-\w._+]+\@[\w.-]+)" + | (?P \b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp|ico|ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)) + | (?P \b(?:[A-Z][a-z]+){2,}\b) + | (?P (http|https|ftp|mailto)\:[^\s'\"]+\S) + | (?P [-\w._+]+\@[\w.-]+) # Lists, divs, spans - + r"|(?P

^\s+[\*#] +)" - + r"|(?P
\{\{\{|\s*\}\}\})" - + r"|(?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" + | (?P
^\s+[\*\#]\s+) + | (?P
\{\{\{|\s*\}\}\}) + | (?P \{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\}) # Tables - + r"|(?P^\s*\|\|(=|)\s*)" - + r"|(?P\s*\|\|(=|)\s*$)" - + r"|(?P\s*\|\|(=|)\s*)" - + r")") - pre_re = re.compile( - r"(?:" - + r"(?P
\s*\}\}\})" - + r"|(?P[<>&])" - + r")") + | (?P ^\s*\|\|(=|)\s*) + | (?P \s*\|\|(=|)\s*$) + | (?P \s*\|\|(=|)\s*) + + # TODO: highlight search words (look at referrer) + )""", re.VERBOSE) + pre_re = re.compile("""(?: + (?P
\s*\}\}\}) + | (?P[<>&])" + )""", re.VERBOSE) blank_re = re.compile(r"^\s*$") indent_re = re.compile(r"^\s*") tr_re = re.compile(r"^\s*\|\|") eol_re = re.compile(r"\r?\n") - + # For each line, we scan through looking for magic strings, outputting verbatim any intervening text - for self.line in eol_re.split(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('#'): @@@ -595,19 -605,14 +603,14 @@@ class Page return False raise err - def link_to(self): - word = self.page_name - if self.exists(): - return link_tag(word, word, 'wikilink') - else: - return link_tag(word, nonexist_pfx + word, 'nonexistent') - - def get_raw_body(self): + def get_raw_body(self, default=None): try: return open(self._filename(), 'rb').read() - except IOError, err: + except IOError as err: if err.errno == errno.ENOENT: - return '' # just doesn't exist, use default + if default is None: + default = '//[[?edit=%s|Describe %s]]//' % (self.page_name, self.page_name) + return default if err.errno == errno.EISDIR: return self.format_dir() raise err @@@ -708,16 -713,17 +711,17 @@@ if 'file' in form: filename = form['file'].value - print ('
Editing ' + self.page_name + print(('
Editing ' + self.page_name + ' for ' + cgi.escape(remote_user()) + ' from ' + cgi.escape(get_hostname(remote_host())) - + '
') - print '
' % relative_url(self.page_name) - print '' % (self.page_name) - print '
' % (self.page_name) - print '%s' \ - % cgi.escape(preview or self.get_raw_body(default='')) - print 'Or Upload a file: ' % filename - print """ + + '
')) + print('
' % relative_url(self.page_name)) + print('' % (self.page_name)) + print('
' % (self.page_name)) - print('%s' % cgi.escape(preview or self.get_raw_body())) ++ print('%s' \ ++ % cgi.escape(preview or self.get_raw_body(default=''))) + print('Or Upload a file: ' % filename) + print("""
@@@ -730,23 -736,19 +734,19 @@@ document.editform.savetext.focus() //--> - """ - print "
" + link_tag('EditingTips') + "
" + """) - print("
" + Page('EditingTips').link_to() + "
") ++ print("
" + link_tag('EditingTips') + "
") if preview: - print "
" + print("
") WikiFormatter(preview).print_html() - print "
" + print("
") send_footer() - def send_raw(self, mimetype='text/plain'): - if self.can_read(): - body = self.get_raw_body() - emit_header(mimetype) - print(body) - else: + def send_raw(self, mimetype='text/plain', args=[]): + if not self.can_read(): send_title(None, msg_text='Read access denied by ACLs', msg_type='notice') + return - def send_image(self, mimetype, args=[]): if 'maxwidth' in args: import subprocess emit_header(mimetype) @@@ -754,7 -756,9 +754,9 @@@ subprocess.check_call(['gm', 'convert', self._filename(), '-scale', args['maxwidth'].value + ' >', '-']) else: - self.send_raw(mimetype) + body = self.get_raw_body() + emit_header(mimetype) - print body ++ print(body) def _write_file(self, data): tmp_filename = self._tmp_filename() diff --cc macros/WordIndex.py index 613efb5,818a884..6438d0b mode 100644,100755..100644 --- a/macros/WordIndex.py +++ b/macros/WordIndex.py