encoding.py feedgenerator.py @@ -1,4 +1,3 @@ *.pyc app.yaml settings.py -django .gitignore @@ -1,30 +1,21 @@ import BeautifulSoup import demjson +import feedgenerator import functools import hashlib import logging import os -import sys import uuid import urllib -# Remove the standard version of Django. -for k in [k for k in sys.modules if k.startswith('django')]: - del sys.modules[k] - -# Import Django from a zipfile if we don't have it on our path. -if "django" not in os.listdir(os.path.abspath(os.path.dirname(__file__))): - sys.path.insert(0, os.path.abspath('django.zip')) -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) - from django.conf import settings settings._target = None os.environ["DJANGO_SETTINGS_MODULE"] = "settings" -from django import forms +from django import newforms as forms from django.template.defaultfilters import slugify -from django.utils import feedgenerator from django.utils import simplejson +from django.utils.feedgenerator import Enclosure from google.appengine.api import memcache from google.appengine.api import urlfetch @@ -82,7 +73,7 @@ class MediaRSSFeed(feedgenerator.Atom1Feed): }) def add_thumbnails_element(self, handler, item): - thumbnails = item.get("thumbnails", []) + thumbnails = item.get("thumbnails", None) for thumbnail in thumbnails: handler.startElement("media:group", {}) if thumbnail["title"]: @@ -201,8 +192,8 @@ class BaseRequestHandler(webapp.RequestHandler): if img: headers = self.fetch_headers(img["src"]) if headers: - enclosure = feedgerator.Enclosure(img["src"], - headers["Content-Length"], headers["Content-Type"]) + enclosure = Enclosure(img["src"], headers["Content-Length"], + headers["Content-Type"]) return enclosure return None @@ -522,7 +513,7 @@ application = webapp.WSGIApplication([ ], debug=True) def main(): - logging.getLogger().setLevel(logging.ERROR) + logging.getLogger().setLevel(logging.DEBUG) run_wsgi_app(application) if __name__ == "__main__": main.py @@ -1,8 +1,3 @@ -import os - -TEMPLATE_DIRS = ( - os.path.dirname(__file__) + "/templates", -) TITLE = "My Blog" EMAIL = "me@example.com" NAME = "Me" settings.py.sample @@ -15,7 +15,7 @@ {{ entry.published|bettertimesince }} </div> <div class="body"> - {{ entry.body|safe }} + {{ entry.body }} </div> <div class="share"> <a href="#" onclick="var e=document.createElement('script');e.setAttribute('type','text/javascript');e.setAttribute('src','http://friendfeed.com/share/bookmarklet/javascript?url={% filter urlencode %}http://{{ request.host }}/e/{{ entry.slug }}{% endfilter %}&amp;title={{ entry.title|urlencode }}');document.body.appendChild(e); return false;"><img src="http://friendfeed.com/static/images/icons/internal.png" title="Share on FriendFeed" alt="Share on FriendFeed"/></a> templates/entries.html django.zip 2081d4b112aa0416c62008485276c3f207b5ca19 Benjamin Golub bgolub@benjamingolub.com http://github.com/bgolub/blog/commit/fd0136015039829bb1a21ca4de52a29a3a964177 fd0136015039829bb1a21ca4de52a29a3a964177 2009-03-03T06:18:37-08:00 2009-03-03T06:18:37-08:00 Revert "remove hacky feedgenerator implementation by using django.zip or optionally a true django 1.0 package (faster)" This reverts commit eb5ceff84c8353d04ff3e2e89ff0e80bd592f3c1. ec0f713c78320cb3e9d4c596e651640d07faf9d2 Benjamin Golub bgolub@benjamingolub.com