X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=geekigeeki.py;h=23b05d5cae67fbef5a7de5695548426e29c8aefe;hb=c76ddda68748f9bc67641ccba61314d8d8b32b12;hp=a7e99ed10121c9af816cfc76eddc0707edeeec94;hpb=152bbe08d73f7ffa9b8fa9f5a841ac643f3d75a5;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index a7e99ed..23b05d5 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -24,7 +24,6 @@ from time import clock 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 @@ title_done = False # 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, er: + except Exception: return addr def relative_url(pathname, privileged=False): @@ -120,12 +119,15 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal print ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' print '' - site_name = globals().get('site_name', 'Unconfigured Site') print "
' else: indent = indent_re.match(self.line) - print self._indent_to(len(indent.group(0))) + print self._indent_to(len(indent.group(0))) , print re.sub(scan_re, self.replace, self.line) if self.in_pre: print '' @@ -576,10 +582,10 @@ class Page: 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('/','_') + '.' + `os.getpid()` + '#')) + return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#')) def exists(self): try: @@ -609,28 +615,28 @@ class Page: 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') + f = open(self._filename(), 'rt') attr_re = re.compile(r"^#(\S*)(.*)$") - for line in file: + for line in f: m = attr_re.match(line) if not m: break @@ -654,7 +660,7 @@ class Page: if user == remote_user() or user == "All": return action in perms.split(',') return False - except Exception, er: + except Exception: if acl: self.msg_text = 'Illegal acl line: ' + acl return default @@ -681,7 +687,7 @@ class Page: 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: @@ -699,9 +705,9 @@ class Page: 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 + ' for ' + cgi.escape(remote_user()) @@ -710,8 +716,8 @@ class Page: print '