From: Bernie Innocenti Date: Mon, 15 Dec 2008 03:24:36 +0000 (-0500) Subject: Merge pylint/pychecker cleanups from branch master of trinity X-Git-Tag: v4.0~17 X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=commitdiff_plain;h=7ce906e26b7c2c91e232508ccd0af6fe9ec4aeec;hp=-c Merge pylint/pychecker cleanups from branch master of trinity Conflicts: geekigeeki.py --- 7ce906e26b7c2c91e232508ccd0af6fe9ec4aeec diff --combined geekigeeki.py index a9aa019,0ff2e7a..ca16283 --- a/geekigeeki.py +++ b/geekigeeki.py @@@ -1,4 -1,4 +1,4 @@@ -#!/usr/bin/python +#!/usr/bin/python3.0 # -*- coding: utf-8 -*- # # Copyright 1999, 2000 Martin Pool @@@ -24,7 -24,6 +24,6 @@@ from time import cloc start_time = clock() import cgi, sys, os, re, errno, stat - from os import path, environ # Regular expression defining a WikiWord # (but this definition is also assumed in other places) @@@ -41,25 -40,25 +40,25 @@@ title_done = Fals # CGI stuff --------------------------------------------------------- def script_name(): - return environ.get('SCRIPT_NAME', '') + return os.environ.get('SCRIPT_NAME', '') def privileged_path(): return privileged_url or script_name() def remote_user(): - user = environ.get('REMOTE_USER', '') + user = os.environ.get('REMOTE_USER', '') if user is None or user == '' or user == 'anonymous': user = 'AnonymousCoward' return user def remote_host(): - return environ.get('REMOTE_ADDR', '') + return os.environ.get('REMOTE_ADDR', '') def get_hostname(addr): try: from socket import gethostbyaddr return gethostbyaddr(addr)[0] + ' (' + addr + ')' - except Exception as er: + except Exception: return addr def relative_url(pathname, privileged=False): @@@ -76,19 -75,19 +75,19 @@@ def permalink(s) # Formatting stuff -------------------------------------------------- def emit_header(mime_type="text/html"): - print "Content-type: " + mime_type + "; charset=utf-8\n" + print("Content-type: " + mime_type + "; charset=utf-8\n") def send_guru(msg_text, msg_type): if not msg_text: return - print '
'
 +    print('
')
      if msg_type == 'error':
 -        print '    Software Failure.  Press left mouse button to continue.\n'
 -    print msg_text
 +        print('    Software Failure.  Press left mouse button to continue.\n')
 +    print(msg_text)
      if msg_type == 'error':
 -        print '\n      Guru Meditation #DEADBEEF.ABADC0DE'
 -    print '
'
 +        print('\n      Guru Meditation #DEADBEEF.ABADC0DE')
 +    print('
') # FIXME: This little JS snippet is harder to pass than ACID 3.0 - print """ + print(""" """ + """) def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False): global title_done @@@ -116,77 -115,76 +115,76 @@@ # Head emit_header() - print '' - print '' + print('') + print('') - site_name = globals().get('site_name', 'Unconfigured Site') - print "%s: %s" % (site_name, text) - print ' ' + print("%s: %s" % (site_name, text)) + print(' ') if not name: - print ' ' + print(' ') for meta in meta_urls: http_equiv, content = meta - print ' ' % (http_equiv, relative_url(content)) + print(' ' % (http_equiv, relative_url(content))) for link in link_urls: rel, href = link - print ' ' % (rel, relative_url(href)) + print(' ' % (rel, relative_url(href))) if name and writable and privileged_url is not None: - print ' ' \ - % (privileged_path() + '?edit=' + name) + print(' ' \ + % (privileged_path() + '?edit=' + name)) if history_url is not None: - print ' ' \ - % relative_url(history_url + '?a=rss') + print(' ' \ + % relative_url(history_url + '?a=rss')) - print '' + print('') # Body if name and writable and privileged_url is not None: - print '' + print('') else: - print '' + print('') title_done = True send_guru(msg_text, msg_type) # Navbar - print '
' + print('
') if name: - print ' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ' + print(' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ') else: - print ' ' + text + ' ' - print ' | ' + link_tag('FrontPage', 'Home', 'navlink') - 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('
') def send_httperror(status="403 Not Found", query=""): - print "Status: %s" % status + print("Status: %s" % status) send_title(None, msg_text=("%s: on query '%s'" % (status, query))) - send_footer(None) + send_footer() def link_tag(params, text=None, ss_class=None, privileged=False): if text is None: @@@ -220,13 -218,13 +218,13 @@@ def handle_fullsearch(needle) hits.sort() hits.reverse() - print "") print_search_stats(len(hits), len(all_pages)) @@@ -236,17 -234,17 +234,17 @@@ def handle_titlesearch(needle) needle_re = re.compile(needle, re.IGNORECASE) all_pages = page_list() - hits = filter(needle_re.search, all_pages) + hits = list(filter(needle_re.search, all_pages)) - print "") print_search_stats(len(hits), len(all_pages)) def print_search_stats(hits, searched): - print "

%d hits out of %d pages searched.

" % (hits, searched) + print("

%d hits out of %d pages searched.

" % (hits, searched)) def handle_raw(pagename): if not file_re.match(pagename): @@@ -278,27 -276,27 +276,27 @@@ def handle_edit(pagename) pg.send_editor(text) def make_index_key(): - links = map(lambda ch: '%s' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz') + links = ['%s' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz'] return '

'+ ' | '.join(links) + '

' - def page_list(dir = None, re = word_re): - return sorted(filter(re.match, os.listdir(dir or data_dir))) + def page_list(dirname = None, re = word_re): + return sorted(filter(re.match, os.listdir(dirname or data_dir))) - def send_footer(name, mod_string=None): + def send_footer(mod_string=None): if globals().get('debug_cgi', False): cgi.print_arguments() cgi.print_form(form) cgi.print_environ() - print ''' + print(''' ' + print('

last modified %s

' % mod_string) + print('') class WikiFormatter: """Object that turns Wiki markup into HTML. @@@ -351,8 -349,8 +349,8 @@@ return Page(word).link_to() def _img_repl(self, word): - path = relative_url(word) - return '' % (path, path) + pathname = relative_url(word) + return '' % (pathname, pathname) def _url_repl(self, word): if img_re.match(word): @@@ -366,15 -364,14 +364,14 @@@ argv = [name] if m.group(2): argv.extend(m.group(2).split('|')) - argv = map(str.strip, argv) + argv = list(map(str.strip, argv)) macro = globals().get('_macro_' + name) if not macro: try: - execfile("macros/" + name + ".py", globals()) - except IOError, err: + exec(open("macros/" + name + ".py").read(), globals()) - except IOError as er: - if er.errno == errno.ENOENT: - pass ++ except IOError as err: + if err.errno == errno.ENOENT: pass macro = globals().get('_macro_' + name) if macro: return macro(argv) @@@ -493,14 -490,14 +490,14 @@@ return res def replace(self, match): - for type, hit in list(match.groupdict().items()): - for rule, hit in match.groupdict().items(): ++ for rule, hit in list(match.groupdict().items()): if hit: - return getattr(self, '_' + type + '_repl')(hit) + return getattr(self, '_' + rule + '_repl')(hit) else: raise "Can't handle match " + repr(match) def print_html(self): - print '

' + print('

') # For each line, we scan through looking for magic # strings, outputting verbatim any intervening text @@@ -547,31 -544,31 +544,31 @@@ 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()): - # Skip ACLs - for self.line in eol_re.split(self.raw.expandtabs()): ++ for self.line in eol_re.split(str(self.raw.expandtabs())): + # Skip pragmas if self.in_header: if self.line.startswith('#'): continue self.in_header = False if self.in_pre: - print re.sub(pre_re, self.replace, self.line) + print(re.sub(pre_re, self.replace, self.line)) else: if self.in_table and not tr_re.match(self.line): self.in_table = False - print '

' + print('

') if blank_re.match(self.line): - print '

' + print('

') else: indent = indent_re.match(self.line) - print self._indent_to(len(indent.group(0))) , - print re.sub(scan_re, self.replace, self.line) + print(self._indent_to(len(indent.group(0))), end=' ') + print(re.sub(scan_re, self.replace, self.line)) - if self.in_pre: print '' - if self.in_table: print '

' - print self._undent() - print '

' + if self.in_pre: print('') + if self.in_table: print('

') + print(self._undent()) + print('

') class Page: def __init__(self, page_name): @@@ -584,19 -581,19 +581,19 @@@ return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name) def _filename(self): - return path.join(data_dir, self.page_name) + return os.path.join(data_dir, self.page_name) def _tmp_filename(self): - return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + repr(os.getpid()) + '#')) - return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#')) ++ return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + repr(os.getpid()) + '#')) def exists(self): try: os.stat(self._filename()) return True - except OSError as er: - if er.errno == errno.ENOENT: - except OSError, err: ++ except OSError as err: + if err.errno == errno.ENOENT: return False - raise er + raise err def link_to(self): word = self.page_name @@@ -608,61 -605,61 +605,60 @@@ def get_raw_body(self): try: return open(self._filename(), 'rb').read() - except IOError as er: - if er.errno == errno.ENOENT: - except IOError, err: ++ except IOError as err: + if err.errno == errno.ENOENT: return '' # just doesn't exist, use default - if er.errno == errno.EISDIR: + if err.errno == errno.EISDIR: return self.format_dir() - raise er + raise err def format_dir(self): out = '== ' - path = '' - for dir in self.page_name.split('/'): - path = (path + '/' + dir) if path else dir - out += '[[' + path + '|' + dir + ']]/' + pathname = '' + for dirname in self.page_name.split('/'): + pathname = (pathname + '/' + dirname) if pathname else dirname + out += '[[' + pathname + '|' + dirname + ']]/' out += ' ==\n' - for file in page_list(self._filename(), file_re): - if img_re.match(file): + for filename in page_list(self._filename(), file_re): + if img_re.match(filename): if image_maxwidth: maxwidth_arg = '|maxwidth=' + str(image_maxwidth) - out += '{{' + self.page_name + '/' + file + '|' + file + maxwidth_arg + '}}\n' + out += '{{' + self.page_name + '/' + filename + '|' + filename + maxwidth_arg + '}}\n' else: - out += ' * [[' + self.page_name + '/' + file + ']]\n' + out += ' * [[' + self.page_name + '/' + filename + ']]\n' return out - def get_attrs(self): - if 'attrs' in self.__dict__: - return self.attrs - self.attrs = {} - try: - file = open(self._filename(), 'rt') - attr_re = re.compile(r"^#(\S*)(.*)$") - for line in file: - m = attr_re.match(line) - if not m: - break - self.attrs[m.group(1)] = m.group(2).strip() - #print "bernie: attrs[" + m.group(1) + "] = " + m.group(2) + "
\n" - except IOError as er: - if er.errno != errno.ENOENT and er.errno != errno.EISDIR: - raise er - return self.attrs - - def get_attr(self, name, default): - return self.get_attrs().get(name, default) + + def pragmas(self): + if not '_pragmas' in self.__dict__: - self._pragmas = {} + try: - f = open(self._filename(), 'rt') ++ file = open(self._filename(), 'rt') + attr_re = re.compile(r"^#(\S*)(.*)$") - for line in f: ++ for line in file: + m = attr_re.match(line) + if not m: + break + self._pragmas[m.group(1)] = m.group(2).strip() - #print "bernie: _pragmas[" + m.group(1) + "] = " + m.group(2) + "
\n" - except IOError, err: ++ #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "
\n" ++ except IOError as err: + if err.errno != errno.ENOENT and err.errno != errno.EISDIR: - raise err ++ raise er + return self._pragmas + + def pragma(self, name, default): + return self.pragmas().get(name, default) def can(self, action, default=True): acl = None try: #acl SomeUser:read,write All:read - acl = self.get_attr("acl", None) + acl = self.pragma("acl", None) for rule in acl.split(): (user, perms) = rule.split(':') if user == remote_user() or user == "All": return action in perms.split(',') return False - except Exception as er: + except Exception: if acl: self.msg_text = 'Illegal acl line: ' + acl return default @@@ -681,7 -678,7 +677,7 @@@ def format(self): #css foo.css - value = self.get_attr("css", None) + value = self.pragma("css", None) if value: global link_urls link_urls += [ [ "stylesheet", value ] ] @@@ -689,15 -686,15 +685,15 @@@ send_title(self.page_name, self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write()) self.send_naked() - send_footer(self.page_name, self._last_modified()) + send_footer(self._last_modified()) def _last_modified(self): try: from time import localtime, strftime modtime = localtime(os.stat(self._filename())[stat.ST_MTIME]) - except OSError as er: - if er.errno != errno.ENOENT: - raise er - except OSError, err: ++ except OSError as err: + if err.errno != errno.ENOENT: + raise err return None return strftime(datetime_fmt, modtime) @@@ -707,20 -704,20 +703,20 @@@ send_guru("Write access denied by ACLs", "error") return - file = '' + filename = '' if 'file' in form: - file = form['file'].value + 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 '' % cgi.escape(preview or self.get_raw_body()) - print ' ' % filename - print """ + + '

')) + print('
' % relative_url(self.page_name)) + print('' % (self.page_name)) + print('
' % (self.page_name)) + print('' % cgi.escape(preview or self.get_raw_body())) - print(' ' % file) ++ print(' ' % filename) + print("""
@@@ -733,19 -730,19 +729,19 @@@ document.editform.savetext.focus() //--> - """ - print "

" + Page('EditingTips').link_to() + "

" + """) + print("

" + Page('EditingTips').link_to() + "

") if preview: - print "
" + print("
") WikiFormatter(preview).print_html() - print "
" + print("
") - send_footer(self.page_name) + send_footer() def send_raw(self, mimetype='text/plain'): if self.can_read(): body = self.get_raw_body() emit_header(mimetype) - print body + print(body) else: send_title(None, msg_text='Read access denied by ACLs', msg_type='notice') @@@ -767,8 -764,8 +763,8 @@@ # Bad Bill! POSIX rename ought to replace. :-( try: os.remove(name) - except OSError as er: - if er.errno != errno.ENOENT: raise er - except OSError, err: ++ except OSError as err: + if err.errno != errno.ENOENT: raise err os.rename(tmp_filename, name) def save(self, newdata, changelog): @@@ -799,40 -796,39 +795,39 @@@ self.msg_text = 'Thank you for your contribution. Your attention to detail is appreciated.' self.msg_type = 'success' - # Main --------------------------------------------------------------- - try: - exec(open("geekigeeki.conf.py").read()) - form = cgi.FieldStorage() - + def main(): for cmd in form: handler = globals().get('handle_' + cmd) if handler: handler(form[cmd].value) break else: - path_info = environ.get('PATH_INFO', '') + path_info = os.environ.get('PATH_INFO', '') if len(path_info) and path_info[0] == '/': query = path_info[1:] or 'FrontPage' else: - query = environ.get('QUERY_STRING', '') or 'FrontPage' + query = os.environ.get('QUERY_STRING', '') or 'FrontPage' if file_re.match(query): if word_re.match(query): Page(query).format() else: from mimetypes import MimeTypes - type, encoding = MimeTypes().guess_type(query) - #type = type or 'text/plain' - #Page(query).send_raw(mimetype=type) - if type: - if type.startswith('image/'): - Page(query).send_image(mimetype=type,args=form) + mimetype, encoding = MimeTypes().guess_type(query) + if mimetype: + if mimetype.startswith('image/'): + Page(query).send_image(mimetype=mimetype, args=form) else: - Page(query).send_raw(mimetype=type) + Page(query).send_raw(mimetype=mimetype) else: Page(query).format() else: send_httperror("403 Forbidden", query) + + try: - execfile("geekigeeki.conf.py") ++ exec(open("geekigeeki.conf.py").read()) + form = cgi.FieldStorage() + main() except Exception: import traceback msg_text = traceback.format_exc() @@@ -840,6 -836,6 +835,6 @@@ send_guru(msg_text, "error") else: send_title(None, msg_text=msg_text) - send_footer(None) + send_footer() sys.stdout.flush()