compile-all.py

@@ -1,20 +0,0 @@
-#!/usr/bin/python
-
-import compileall
-import os
-#compileall.compile_dir(".", force=1)
-#
-
-def compileDir(arg, directory, names):
-    compileall.compile_dir(directory, force=1)
-
-os.path.walk("podjango", compileDir, "")
-compileall.compile_dir(".", force=1)
-
-os.system("find . -type d -exec chmod gu+rx {} \;")
-os.system("find . -type f -exec chmod gu+r {} \;")
-os.system("find . -type d -exec chmod o+x {} \;")
-os.system("find ./podjango/static -type d -exec chmod o+rx {} \;")
-os.system("find ./podjango/static  -exec chmod o+r {} \;")
-os.system("find . -exec chgrp www-data {} \;")
-os.system("find . -exec chmod go-w {} \;")

podjango/feeds.py

@@ -265,8 +265,14 @@ class OggCastFeed(CastFeed):
         return item.ogg_length
 
 feed_dict = {
+    'blog': BlogFeed,
     'podcast-ogg': OggCastFeed,
     'podcast-mp3': Mp3CastFeed,
+    'techblog': TechBlogFeed,
+    'news': PressReleaseFeed,
+    'future-events': UpcomingEventFeed,
+    'omnibus': OmnibusFeed,
+#    'event-media': RecentEventMediaFeed,
 }
 
 # make each feed know its canonical url

podjango/manage.py

@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-sys.path += ('/var/www',)
-
-from django.core.management import execute_manager
-try:
-    import settings
-except ImportError:
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
-
-if __name__ == "__main__":
-    execute_manager(settings)

podjango/urls.py

@@ -18,7 +18,7 @@
 # "AGPLv3".  If not, see <http://www.gnu.org/licenses/>.
 
 from django.conf.urls.defaults import *
-from podjango.feeds import feed_dict
+from conservancy.feeds import feed_dict
 
 #handler404 = 'modpythoncustom.view404'
 
@@ -27,5 +27,4 @@ urlpatterns = patterns('',
     (r'^feeds/(?P<url>.*)/?$', 'django.contrib.syndication.views.feed',
      {'feed_dict': feed_dict}),
     (r'^feeds/$', 'podjango.feeds.view'),
-    (r'^admin/(.*)', admin.site.root),)
 )