# HG changeset patch # User Jeff Hammel # Date 1321755553 28800 # Node ID c576f5877459aab633da7680595910f863370f5d # Parent ffe01043ecea16f9f30a09b45d75fe4dac6c0092 * fix resolution for bad urls; * change URL post to get diff -r ffe01043ecea -r c576f5877459 setup.py --- a/setup.py Tue Dec 21 18:07:15 2010 -0800 +++ b/setup.py Sat Nov 19 18:19:13 2011 -0800 @@ -7,7 +7,7 @@ except: description = "" -version = "0.1.1" +version = "0.1.2" setup(name='wordstream', version=version, diff -r ffe01043ecea -r c576f5877459 wordstream/handlers.py --- a/wordstream/handlers.py Tue Dec 21 18:07:15 2010 -0800 +++ b/wordstream/handlers.py Sat Nov 19 18:19:13 2011 -0800 @@ -53,7 +53,7 @@ return '/'.join(path) def redirect(self, location): - raise exc.HTTPSeeOther(location=location) + return exc.HTTPSeeOther(location=location) class GenshiHandler(Handler): @@ -147,7 +147,10 @@ def Get(self): if 'url' in self.request.GET: - contents = self.url_contents(self.request.GET['url']) + try: + contents = self.url_contents(self.request.GET['url']) + except: + return GenshiHandler.Get(self) dissociation = self.dissociation(contents) return Response(content_type='text/html', body='%s' % dissociation) @@ -168,7 +171,10 @@ def Post(self): if 'url' in self.request.POST: - contents = self.url_contents(self.request.POST['url']) + try: + contents = self.url_contents(self.request.POST['url']) + except: + return GenshiHandler.Get(self) elif 'text' in self.request.POST: contents = self.request.POST['text'] elif 'file' in self.request.POST: diff -r ffe01043ecea -r c576f5877459 wordstream/templates/post.html --- a/wordstream/templates/post.html Tue Dec 21 18:07:15 2010 -0800 +++ b/wordstream/templates/post.html Sat Nov 19 18:19:13 2011 -0800 @@ -15,10 +15,10 @@ -
+ or point to a URL
- \ No newline at end of file +