Changeset 820:359af5284287 in hatta-dev

Timestamp:

08/17/10 23:51:44 (21 months ago)

Author:

Radomir Dopieralski <hatta-dev@…>

Branch:

default

Message:

Fix some of th error classes, thanks to Zarf

Files:

• examples/slides/slides.py (modified) (1 diff)
• hatta/page.py (modified) (3 diffs)
• hatta/wiki.py (modified) (5 diffs)

examples/slides/slides.py

@@ -34 +34 @@
             try:
                 html = ''.join(page.view_content())
-            except hatta.NotFoundErr:
+            except hatta.error.NotFoundErr:
                 continue
             slide_title = (u'<h1>%s</h1>' % werkzeug.escape(label))

hatta/page.py

@@ -242 +242 @@
                 self.wiki._check_lock(self.title)
                 edit_url = self.get_url(self.title, self.wiki.edit)
-            except ForbiddenErr:
+            except error.ForbiddenErr:
                 pass
 
@@ -288 +288 @@
             self.wiki._check_lock(title)
             read_only = False
-        except ForbiddenErr:
+        except error.ForbiddenErr:
             read_only = True
         for rev, date, author, comment in self.wiki.storage.page_history(title):
@@ -631 +631 @@
             im.save(cache_file,'PNG')
         except IOError:
-            raise UnsupportedMediaTypeErr('Image corrupted')
+            raise error.UnsupportedMediaTypeErr('Image corrupted')
         cache_file.close()
         return cache_path

hatta/wiki.py

@@ -23 +23 @@
 import data
 
+import mercurial # import it after storage!
 
 class WikiResponse(werkzeug.BaseResponse, werkzeug.ETagResponseMixin,
@@ -411 +412 @@
                     for link, label in page.extract_links(text):
                         if title == link:
-                            raise ForbiddenErr(
+                            raise error.ForbiddenErr(
                                 _(u"This page is locked."))
                 if u'href="' in comment or u'http:' in comment:
-                    raise ForbiddenErr()
+                    raise error.ForbiddenErr()
                 if text.strip() == '':
                     self.storage.delete_page(title, author, comment)
@@ -855 +856 @@
         _ = self.gettext
         if pygments is None:
-            raise NotImplementedErr(_(u"Code highlighting is not available."))
+            raise error.NotImplementedErr(
+                _(u"Code highlighting is not available."))
 
         pygments_style = self.pygments_style
@@ -894 +896 @@
         _ = self.gettext
         if not self.config.get_bool('hgweb', False):
-            raise ForbiddenErr(_(u'Repository access disabled.'))
+            raise error.ForbiddenErr(_(u'Repository access disabled.'))
         app = mercurial.hgweb.request.wsgiapplication(
             lambda: mercurial.hgweb.hgweb(self.storage.repo, self.site_name))
@@ -912 +914 @@
         _ = self.gettext
         if not request.remote_addr.startswith('127.'):
-            raise ForbiddenErr(_(u'This URL can only be called locally.'))
+            raise error.ForbiddenErr(_(u'This URL can only be called locally.'))
         def agony():
             yield u'Oh dear!'