Restore compatibility with Python 2.5

diff --git a/geekigeeki.py b/geekigeeki.py
index 678754e3a9633d29fc779eeed48eeddb8fa9fa87..470752de0d44076f31272693a206bf0a1ed9cdc2 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -324,7 +324,7 @@ def make_index_key():
     links = ['<a href="#%s">%s</a>' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz']
     return '<p style="text-align: center">' + ' | '.join(links) + '</p>'
 
     links = ['<a href="#%s">%s</a>' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz']
     return '<p style="text-align: center">' + ' | '.join(links) + '</p>'
 

-def page_list(dirname = None, re = None):
+def page_list(dirname=None, re=None):

     if re is None:
         # FIXME: WikiWord is too restrictive now!
         re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$")
     if re is None:
         # FIXME: WikiWord is too restrictive now!
         re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$")


@@ -623,7 +623,7 @@ class Page:
         try:
             os.stat(self._filename())
             return True
         try:
             os.stat(self._filename())
             return True

-        except OSError as err:
+        except OSError, err:

             if err.errno == errno.ENOENT:
                 return False
             raise err
             if err.errno == errno.ENOENT:
                 return False
             raise err


@@ -631,7 +631,7 @@ class Page:
     def get_raw_body(self, default=None):
         try:
             return open(self._filename(), 'rb').read()
     def get_raw_body(self, default=None):
         try:
             return open(self._filename(), 'rb').read()

-        except IOError as err:
+        except IOError, err:

             if err.errno == errno.ENOENT:
                 if default is None:
                     default = '//[[%s|Describe %s|action=edit]]//' % (self.page_name, self.page_name)
             if err.errno == errno.ENOENT:
                 if default is None:
                     default = '//[[%s|Describe %s|action=edit]]//' % (self.page_name, self.page_name)


@@ -669,7 +669,7 @@ class Page:
                         break
                     self._pragmas[m.group(1)] = m.group(2).strip()
                     #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "<br>\n"
                         break
                     self._pragmas[m.group(1)] = m.group(2).strip()
                     #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "<br>\n"

-            except IOError as err:
+            except IOError, err:

                 if err.errno != errno.ENOENT and err.errno != errno.EISDIR:
                     raise er
         return self._pragmas
                 if err.errno != errno.ENOENT and err.errno != errno.EISDIR:
                     raise er
         return self._pragmas


@@ -720,7 +720,7 @@ class Page:
         try:
             from time import localtime, strftime
             modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
         try:
             from time import localtime, strftime
             modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])

-        except OSError as err:
+        except OSError, err:

             if err.errno != errno.ENOENT:
                 raise err
             return None
             if err.errno != errno.ENOENT:
                 raise err
             return None


@@ -791,7 +791,7 @@ class Page:
             # Bad Bill!  POSIX rename ought to replace. :-(
             try:
                 os.remove(name)
             # Bad Bill!  POSIX rename ought to replace. :-(
             try:
                 os.remove(name)

-            except OSError as err:
+            except OSError, err:

                 if err.errno != errno.ENOENT: raise err
         os.rename(tmp_filename, name)
 
                 if err.errno != errno.ENOENT: raise err
         os.rename(tmp_filename, name)