summaryrefslogtreecommitdiffabout
authorWojciech Polak <polak@gnu.org>2014-01-09 18:58:09 (GMT)
committer Wojciech Polak <polak@gnu.org>2014-01-09 20:20:27 (GMT)
commitb2c9a785470c463fb64e078df5e04e9a82ecc070 (patch) (side-by-side diff)
treee2b2f22bb1761c7afe1ba95147d156b7c38c12c6
parentd681f33b981a1792abfcb0300008a4b281eab0bc (diff)
downloadglifestream-b2c9a785470c463fb64e078df5e04e9a82ecc070.tar.gz
glifestream-b2c9a785470c463fb64e078df5e04e9a82ecc070.tar.bz2
Change project's folder layout.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitignore7
-rw-r--r--TODO5
-rw-r--r--glifestream/__init__.py (renamed from __init__.py)0
-rw-r--r--glifestream/apis/__init__.py (renamed from apis/__init__.py)0
-rw-r--r--glifestream/apis/delicious.py (renamed from apis/delicious.py)0
-rw-r--r--glifestream/apis/digg.py (renamed from apis/digg.py)0
-rw-r--r--glifestream/apis/fb.py (renamed from apis/fb.py)0
-rw-r--r--glifestream/apis/flickr.py (renamed from apis/flickr.py)0
-rw-r--r--glifestream/apis/friendfeed.py (renamed from apis/friendfeed.py)0
-rw-r--r--glifestream/apis/greader.py (renamed from apis/greader.py)0
-rw-r--r--glifestream/apis/identica.py (renamed from apis/identica.py)0
-rw-r--r--glifestream/apis/lastfm.py (renamed from apis/lastfm.py)0
-rw-r--r--glifestream/apis/mail.py (renamed from apis/mail.py)0
-rw-r--r--glifestream/apis/picasaweb.py (renamed from apis/picasaweb.py)0
-rw-r--r--glifestream/apis/selfposts.py (renamed from apis/selfposts.py)0
-rw-r--r--glifestream/apis/stumbleupon.py (renamed from apis/stumbleupon.py)0
-rw-r--r--glifestream/apis/twitter.py (renamed from apis/twitter.py)0
-rw-r--r--glifestream/apis/vimeo.py (renamed from apis/vimeo.py)0
-rw-r--r--glifestream/apis/webfeed.py (renamed from apis/webfeed.py)0
-rw-r--r--glifestream/apis/yelp.py (renamed from apis/yelp.py)0
-rw-r--r--glifestream/apis/youtube.py (renamed from apis/youtube.py)0
-rw-r--r--glifestream/bookmarklet/__init__.py (renamed from bookmarklet/__init__.py)0
-rw-r--r--glifestream/bookmarklet/templates/bookmarklet.js (renamed from bookmarklet/templates/bookmarklet.js)0
-rw-r--r--glifestream/bookmarklet/templates/frame.html (renamed from bookmarklet/templates/frame.html)0
-rw-r--r--glifestream/bookmarklet/urls.py (renamed from bookmarklet/urls.py)0
-rw-r--r--glifestream/bookmarklet/views.py (renamed from bookmarklet/views.py)0
-rw-r--r--glifestream/filters/__init__.py (renamed from filters/__init__.py)0
-rw-r--r--glifestream/filters/expand.py (renamed from filters/expand.py)0
-rw-r--r--glifestream/filters/truncate.py (renamed from filters/truncate.py)0
-rw-r--r--glifestream/filters/twyntax.py (renamed from filters/twyntax.py)0
-rw-r--r--glifestream/gauth/__init__.py (renamed from gauth/__init__.py)0
-rw-r--r--glifestream/gauth/admin.py (renamed from gauth/admin.py)0
-rw-r--r--glifestream/gauth/forms.py (renamed from gauth/forms.py)0
-rw-r--r--glifestream/gauth/gls_oauth.py (renamed from gauth/gls_oauth.py)0
-rw-r--r--glifestream/gauth/gls_openid.py (renamed from gauth/gls_openid.py)0
-rw-r--r--glifestream/gauth/models.py (renamed from gauth/models.py)0
-rw-r--r--glifestream/gauth/templates/login.html (renamed from gauth/templates/login.html)0
-rw-r--r--glifestream/gauth/templates/openid.html (renamed from gauth/templates/openid.html)0
-rw-r--r--glifestream/gauth/urls.py (renamed from gauth/urls.py)0
-rw-r--r--glifestream/gauth/views.py (renamed from gauth/views.py)0
-rw-r--r--glifestream/settings-sample.py (renamed from settings-sample.py)13
-rw-r--r--glifestream/stream/__init__.py (renamed from stream/__init__.py)0
-rw-r--r--glifestream/stream/admin.py (renamed from stream/admin.py)0
-rw-r--r--glifestream/stream/fixtures/initial_data.json (renamed from stream/fixtures/initial_data.json)0
-rw-r--r--glifestream/stream/media.py (renamed from stream/media.py)0
-rw-r--r--glifestream/stream/models.py (renamed from stream/models.py)0
-rw-r--r--glifestream/stream/pshb.py (renamed from stream/pshb.py)0
-rw-r--r--glifestream/stream/templatetags/__init__.py (renamed from stream/templatetags/__init__.py)0
-rw-r--r--glifestream/stream/templatetags/gls_filters.py (renamed from stream/templatetags/gls_filters.py)0
-rw-r--r--glifestream/stream/templatetags/media.py (renamed from stream/templatetags/media.py)0
-rw-r--r--glifestream/stream/views.py (renamed from stream/views.py)0
-rw-r--r--glifestream/templates/404.html (renamed from templates/404.html)0
-rw-r--r--glifestream/templates/500.html (renamed from templates/500.html)0
-rw-r--r--glifestream/templates/base.html (renamed from templates/base.html)0
-rw-r--r--glifestream/templates/i18n.html (renamed from templates/i18n.html)0
-rw-r--r--glifestream/templates/stream-pure.html (renamed from templates/stream-pure.html)0
-rw-r--r--glifestream/templates/stream.atom (renamed from templates/stream.atom)0
-rw-r--r--glifestream/templates/stream.html (renamed from templates/stream.html)0
-rw-r--r--glifestream/templates/stream.json (renamed from templates/stream.json)0
-rw-r--r--glifestream/urls.py (renamed from urls.py)0
-rw-r--r--glifestream/usettings/__init__.py (renamed from usettings/__init__.py)0
-rw-r--r--glifestream/usettings/templates/lists.html (renamed from usettings/templates/lists.html)0
-rw-r--r--glifestream/usettings/templates/oauth.html (renamed from usettings/templates/oauth.html)0
-rw-r--r--glifestream/usettings/templates/oid.html (renamed from usettings/templates/oid.html)0
-rw-r--r--glifestream/usettings/templates/opml.xml (renamed from usettings/templates/opml.xml)0
-rw-r--r--glifestream/usettings/templates/pshb.html (renamed from usettings/templates/pshb.html)0
-rw-r--r--glifestream/usettings/templates/services.html (renamed from usettings/templates/services.html)0
-rw-r--r--glifestream/usettings/templates/settings.html (renamed from usettings/templates/settings.html)0
-rw-r--r--glifestream/usettings/templates/tools.html (renamed from usettings/templates/tools.html)0
-rw-r--r--glifestream/usettings/urls.py (renamed from usettings/urls.py)0
-rw-r--r--glifestream/usettings/views.py (renamed from usettings/views.py)0
-rw-r--r--glifestream/utils/__init__.py (renamed from utils/__init__.py)0
-rw-r--r--glifestream/utils/common.py (renamed from utils/common.py)0
-rw-r--r--glifestream/utils/html.py (renamed from utils/html.py)0
-rw-r--r--glifestream/utils/httpclient.py (renamed from utils/httpclient.py)0
-rw-r--r--glifestream/utils/oembed.py (renamed from utils/oembed.py)0
-rw-r--r--glifestream/utils/slugify.py (renamed from utils/slugify.py)0
-rw-r--r--glifestream/utils/time.py (renamed from utils/time.py)0
-rw-r--r--glifestream/wsgi.py (renamed from wsgi.py)0
-rw-r--r--manage.py17
-rwxr-xr-xworker.py9
81 files changed, 27 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore
index 7359720..55b794e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,11 @@
+*~
*.pyc
*.pyo
*.mo
-*~
+bin/
+include/
+lib/
settings.py
static/thumbs
static/upload
-templates/user-*
+glifestream/templates/user-*
diff --git a/TODO b/TODO
deleted file mode 100644
index ef193b1..0000000
--- a/TODO
+++ b/dev/null
@@ -1,5 +0,0 @@
-TO DO:
-
-* Comments (internal, Salmon Protocol).
-
-Help us by contributing new solutions and code!
diff --git a/__init__.py b/glifestream/__init__.py
index e69de29..e69de29 100644
--- a/__init__.py
+++ b/glifestream/__init__.py
diff --git a/apis/__init__.py b/glifestream/apis/__init__.py
index 9f97186..9f97186 100644
--- a/apis/__init__.py
+++ b/glifestream/apis/__init__.py
diff --git a/apis/delicious.py b/glifestream/apis/delicious.py
index 3fc98c3..3fc98c3 100644
--- a/apis/delicious.py
+++ b/glifestream/apis/delicious.py
diff --git a/apis/digg.py b/glifestream/apis/digg.py
index 61da7ce..61da7ce 100644
--- a/apis/digg.py
+++ b/glifestream/apis/digg.py
diff --git a/apis/fb.py b/glifestream/apis/fb.py
index f0cea78..f0cea78 100644
--- a/apis/fb.py
+++ b/glifestream/apis/fb.py
diff --git a/apis/flickr.py b/glifestream/apis/flickr.py
index 4651313..4651313 100644
--- a/apis/flickr.py
+++ b/glifestream/apis/flickr.py
diff --git a/apis/friendfeed.py b/glifestream/apis/friendfeed.py
index 8156cbd..8156cbd 100644
--- a/apis/friendfeed.py
+++ b/glifestream/apis/friendfeed.py
diff --git a/apis/greader.py b/glifestream/apis/greader.py
index 4f4be48..4f4be48 100644
--- a/apis/greader.py
+++ b/glifestream/apis/greader.py
diff --git a/apis/identica.py b/glifestream/apis/identica.py
index f404bb4..f404bb4 100644
--- a/apis/identica.py
+++ b/glifestream/apis/identica.py
diff --git a/apis/lastfm.py b/glifestream/apis/lastfm.py
index 35104ad..35104ad 100644
--- a/apis/lastfm.py
+++ b/glifestream/apis/lastfm.py
diff --git a/apis/mail.py b/glifestream/apis/mail.py
index 627ba3d..627ba3d 100644
--- a/apis/mail.py
+++ b/glifestream/apis/mail.py
diff --git a/apis/picasaweb.py b/glifestream/apis/picasaweb.py
index fc75edf..fc75edf 100644
--- a/apis/picasaweb.py
+++ b/glifestream/apis/picasaweb.py
diff --git a/apis/selfposts.py b/glifestream/apis/selfposts.py
index 710737f..710737f 100644
--- a/apis/selfposts.py
+++ b/glifestream/apis/selfposts.py
diff --git a/apis/stumbleupon.py b/glifestream/apis/stumbleupon.py
index b6711a4..b6711a4 100644
--- a/apis/stumbleupon.py
+++ b/glifestream/apis/stumbleupon.py
diff --git a/apis/twitter.py b/glifestream/apis/twitter.py
index 23326cc..23326cc 100644
--- a/apis/twitter.py
+++ b/glifestream/apis/twitter.py
diff --git a/apis/vimeo.py b/glifestream/apis/vimeo.py
index 53e29f4..53e29f4 100644
--- a/apis/vimeo.py
+++ b/glifestream/apis/vimeo.py
diff --git a/apis/webfeed.py b/glifestream/apis/webfeed.py
index 534fdf0..534fdf0 100644
--- a/apis/webfeed.py
+++ b/glifestream/apis/webfeed.py
diff --git a/apis/yelp.py b/glifestream/apis/yelp.py
index 7a84af6..7a84af6 100644
--- a/apis/yelp.py
+++ b/glifestream/apis/yelp.py
diff --git a/apis/youtube.py b/glifestream/apis/youtube.py
index ecec35b..ecec35b 100644
--- a/apis/youtube.py
+++ b/glifestream/apis/youtube.py
diff --git a/bookmarklet/__init__.py b/glifestream/bookmarklet/__init__.py
index e69de29..e69de29 100644
--- a/bookmarklet/__init__.py
+++ b/glifestream/bookmarklet/__init__.py
diff --git a/bookmarklet/templates/bookmarklet.js b/glifestream/bookmarklet/templates/bookmarklet.js
index fc13b54..fc13b54 100644
--- a/bookmarklet/templates/bookmarklet.js
+++ b/glifestream/bookmarklet/templates/bookmarklet.js
diff --git a/bookmarklet/templates/frame.html b/glifestream/bookmarklet/templates/frame.html
index c4c4480..c4c4480 100644
--- a/bookmarklet/templates/frame.html
+++ b/glifestream/bookmarklet/templates/frame.html
diff --git a/bookmarklet/urls.py b/glifestream/bookmarklet/urls.py
index 8611725..8611725 100644
--- a/bookmarklet/urls.py
+++ b/glifestream/bookmarklet/urls.py
diff --git a/bookmarklet/views.py b/glifestream/bookmarklet/views.py
index efedd9f..efedd9f 100644
--- a/bookmarklet/views.py
+++ b/glifestream/bookmarklet/views.py
diff --git a/filters/__init__.py b/glifestream/filters/__init__.py
index 9dbdb28..9dbdb28 100644
--- a/filters/__init__.py
+++ b/glifestream/filters/__init__.py
diff --git a/filters/expand.py b/glifestream/filters/expand.py
index eae61a1..eae61a1 100644
--- a/filters/expand.py
+++ b/glifestream/filters/expand.py
diff --git a/filters/truncate.py b/glifestream/filters/truncate.py
index 5d4ff54..5d4ff54 100644
--- a/filters/truncate.py
+++ b/glifestream/filters/truncate.py
diff --git a/filters/twyntax.py b/glifestream/filters/twyntax.py
index e2bf0b7..e2bf0b7 100644
--- a/filters/twyntax.py
+++ b/glifestream/filters/twyntax.py
diff --git a/gauth/__init__.py b/glifestream/gauth/__init__.py
index e69de29..e69de29 100644
--- a/gauth/__init__.py
+++ b/glifestream/gauth/__init__.py
diff --git a/gauth/admin.py b/glifestream/gauth/admin.py
index b436c41..b436c41 100644
--- a/gauth/admin.py
+++ b/glifestream/gauth/admin.py
diff --git a/gauth/forms.py b/glifestream/gauth/forms.py
index 16d9010..16d9010 100644
--- a/gauth/forms.py
+++ b/glifestream/gauth/forms.py
diff --git a/gauth/gls_oauth.py b/glifestream/gauth/gls_oauth.py
index 76bf6d0..76bf6d0 100644
--- a/gauth/gls_oauth.py
+++ b/glifestream/gauth/gls_oauth.py
diff --git a/gauth/gls_openid.py b/glifestream/gauth/gls_openid.py
index fd03314..fd03314 100644
--- a/gauth/gls_openid.py
+++ b/glifestream/gauth/gls_openid.py
diff --git a/gauth/models.py b/glifestream/gauth/models.py
index b34b52d..b34b52d 100644
--- a/gauth/models.py
+++ b/glifestream/gauth/models.py
diff --git a/gauth/templates/login.html b/glifestream/gauth/templates/login.html
index da09087..da09087 100644
--- a/gauth/templates/login.html
+++ b/glifestream/gauth/templates/login.html
diff --git a/gauth/templates/openid.html b/glifestream/gauth/templates/openid.html
index 856c978..856c978 100644
--- a/gauth/templates/openid.html
+++ b/glifestream/gauth/templates/openid.html
diff --git a/gauth/urls.py b/glifestream/gauth/urls.py
index d8c1a71..d8c1a71 100644
--- a/gauth/urls.py
+++ b/glifestream/gauth/urls.py
diff --git a/gauth/views.py b/glifestream/gauth/views.py
index d07562f..d07562f 100644
--- a/gauth/views.py
+++ b/glifestream/gauth/views.py
diff --git a/settings-sample.py b/glifestream/settings-sample.py
index bc6dccc..d6bcc55 100644
--- a/settings-sample.py
+++ b/glifestream/settings-sample.py
@@ -6,6 +6,10 @@ SITE_ROOT = os.path.dirname(os.path.realpath(__file__))
DEBUG = True
TEMPLATE_DEBUG = DEBUG
+ALLOWED_HOSTS = [
+ 'localhost'
+]
+
ADMINS = (
('Your Name', 'your@email'),
)
@@ -28,6 +32,11 @@ SITE_ID = 1
USE_I18N = True
USE_L10N = False
+# Directories where Django looks for translation files.
+LOCALE_PATHS = (
+ os.path.join(SITE_ROOT, '../locale'),
+)
+
SESSION_COOKIE_NAME = 'glifestream_sid'
SESSION_ENGINE = 'django.contrib.sessions.backends.file'
@@ -53,7 +62,7 @@ LOGIN_URL = '/login'
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = os.path.join(SITE_ROOT, 'static')
+MEDIA_ROOT = os.path.join(SITE_ROOT, '../static')
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases).
@@ -88,6 +97,8 @@ MIDDLEWARE_CLASSES = (
ROOT_URLCONF = 'glifestream.urls'
+WSGI_APPLICATION = 'glifestream.wsgi.application'
+
TEMPLATE_DIRS = (
os.path.join(SITE_ROOT, 'templates'),
)
diff --git a/stream/__init__.py b/glifestream/stream/__init__.py
index aab0336..aab0336 100644
--- a/stream/__init__.py
+++ b/glifestream/stream/__init__.py
diff --git a/stream/admin.py b/glifestream/stream/admin.py
index e8d4ec5..e8d4ec5 100644
--- a/stream/admin.py
+++ b/glifestream/stream/admin.py
diff --git a/stream/fixtures/initial_data.json b/glifestream/stream/fixtures/initial_data.json
index 472a6e2..472a6e2 100644
--- a/stream/fixtures/initial_data.json
+++ b/glifestream/stream/fixtures/initial_data.json
diff --git a/stream/media.py b/glifestream/stream/media.py
index 41ce8c6..41ce8c6 100644
--- a/stream/media.py
+++ b/glifestream/stream/media.py
diff --git a/stream/models.py b/glifestream/stream/models.py
index ec4c492..ec4c492 100644
--- a/stream/models.py
+++ b/glifestream/stream/models.py
diff --git a/stream/pshb.py b/glifestream/stream/pshb.py
index 929a4fe..929a4fe 100644
--- a/stream/pshb.py
+++ b/glifestream/stream/pshb.py
diff --git a/stream/templatetags/__init__.py b/glifestream/stream/templatetags/__init__.py
index e69de29..e69de29 100644
--- a/stream/templatetags/__init__.py
+++ b/glifestream/stream/templatetags/__init__.py
diff --git a/stream/templatetags/gls_filters.py b/glifestream/stream/templatetags/gls_filters.py
index 01b6db0..01b6db0 100644
--- a/stream/templatetags/gls_filters.py
+++ b/glifestream/stream/templatetags/gls_filters.py
diff --git a/stream/templatetags/media.py b/glifestream/stream/templatetags/media.py
index 2e8299f..2e8299f 100644
--- a/stream/templatetags/media.py
+++ b/glifestream/stream/templatetags/media.py
diff --git a/stream/views.py b/glifestream/stream/views.py
index a08e09b..a08e09b 100644
--- a/stream/views.py
+++ b/glifestream/stream/views.py
diff --git a/templates/404.html b/glifestream/templates/404.html
index 8fa0c77..8fa0c77 100644
--- a/templates/404.html
+++ b/glifestream/templates/404.html
diff --git a/templates/500.html b/glifestream/templates/500.html
index d0cdc59..d0cdc59 100644
--- a/templates/500.html
+++ b/glifestream/templates/500.html
diff --git a/templates/base.html b/glifestream/templates/base.html
index ba79d2a..ba79d2a 100644
--- a/templates/base.html
+++ b/glifestream/templates/base.html
diff --git a/templates/i18n.html b/glifestream/templates/i18n.html
index 1fa40fc..1fa40fc 100644
--- a/templates/i18n.html
+++ b/glifestream/templates/i18n.html
diff --git a/templates/stream-pure.html b/glifestream/templates/stream-pure.html
index 493d254..493d254 100644
--- a/templates/stream-pure.html
+++ b/glifestream/templates/stream-pure.html
diff --git a/templates/stream.atom b/glifestream/templates/stream.atom
index dcc8045..dcc8045 100644
--- a/templates/stream.atom
+++ b/glifestream/templates/stream.atom
diff --git a/templates/stream.html b/glifestream/templates/stream.html
index 7b4573b..7b4573b 100644
--- a/templates/stream.html
+++ b/glifestream/templates/stream.html
diff --git a/templates/stream.json b/glifestream/templates/stream.json
index 295540e..295540e 100644
--- a/templates/stream.json
+++ b/glifestream/templates/stream.json
diff --git a/urls.py b/glifestream/urls.py
index da6928b..da6928b 100644
--- a/urls.py
+++ b/glifestream/urls.py
diff --git a/usettings/__init__.py b/glifestream/usettings/__init__.py
index e69de29..e69de29 100644
--- a/usettings/__init__.py
+++ b/glifestream/usettings/__init__.py
diff --git a/usettings/templates/lists.html b/glifestream/usettings/templates/lists.html
index eb2af5a..eb2af5a 100644
--- a/usettings/templates/lists.html
+++ b/glifestream/usettings/templates/lists.html
diff --git a/usettings/templates/oauth.html b/glifestream/usettings/templates/oauth.html
index 2b9f095..2b9f095 100644
--- a/usettings/templates/oauth.html
+++ b/glifestream/usettings/templates/oauth.html
diff --git a/usettings/templates/oid.html b/glifestream/usettings/templates/oid.html
index 47eb6a9..47eb6a9 100644
--- a/usettings/templates/oid.html
+++ b/glifestream/usettings/templates/oid.html
diff --git a/usettings/templates/opml.xml b/glifestream/usettings/templates/opml.xml
index 986852b..986852b 100644
--- a/usettings/templates/opml.xml
+++ b/glifestream/usettings/templates/opml.xml
diff --git a/usettings/templates/pshb.html b/glifestream/usettings/templates/pshb.html
index ed02a54..ed02a54 100644
--- a/usettings/templates/pshb.html
+++ b/glifestream/usettings/templates/pshb.html
diff --git a/usettings/templates/services.html b/glifestream/usettings/templates/services.html
index e51ac5b..e51ac5b 100644
--- a/usettings/templates/services.html
+++ b/glifestream/usettings/templates/services.html
diff --git a/usettings/templates/settings.html b/glifestream/usettings/templates/settings.html
index e383fef..e383fef 100644
--- a/usettings/templates/settings.html
+++ b/glifestream/usettings/templates/settings.html
diff --git a/usettings/templates/tools.html b/glifestream/usettings/templates/tools.html
index 660d926..660d926 100644
--- a/usettings/templates/tools.html
+++ b/glifestream/usettings/templates/tools.html
diff --git a/usettings/urls.py b/glifestream/usettings/urls.py
index 6758ab1..6758ab1 100644
--- a/usettings/urls.py
+++ b/glifestream/usettings/urls.py
diff --git a/usettings/views.py b/glifestream/usettings/views.py
index ad579dc..ad579dc 100644
--- a/usettings/views.py
+++ b/glifestream/usettings/views.py
diff --git a/utils/__init__.py b/glifestream/utils/__init__.py
index 5d22ce4..5d22ce4 100644
--- a/utils/__init__.py
+++ b/glifestream/utils/__init__.py
diff --git a/utils/common.py b/glifestream/utils/common.py
index d77c5d4..d77c5d4 100644
--- a/utils/common.py
+++ b/glifestream/utils/common.py
diff --git a/utils/html.py b/glifestream/utils/html.py
index 9442337..9442337 100644
--- a/utils/html.py
+++ b/glifestream/utils/html.py
diff --git a/utils/httpclient.py b/glifestream/utils/httpclient.py
index 1ed246d..1ed246d 100644
--- a/utils/httpclient.py
+++ b/glifestream/utils/httpclient.py
diff --git a/utils/oembed.py b/glifestream/utils/oembed.py
index 802e9b4..802e9b4 100644
--- a/utils/oembed.py
+++ b/glifestream/utils/oembed.py
diff --git a/utils/slugify.py b/glifestream/utils/slugify.py
index 879fb4f..879fb4f 100644
--- a/utils/slugify.py
+++ b/glifestream/utils/slugify.py
diff --git a/utils/time.py b/glifestream/utils/time.py
index c147324..c147324 100644
--- a/utils/time.py
+++ b/glifestream/utils/time.py
diff --git a/wsgi.py b/glifestream/wsgi.py
index a1825a1..a1825a1 100644
--- a/wsgi.py
+++ b/glifestream/wsgi.py
diff --git a/manage.py b/manage.py
index e43a72e..5b96d16 100644
--- a/manage.py
+++ b/manage.py
@@ -15,15 +15,12 @@
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
-from django.core.management import execute_manager
-
-try:
- import settings
-except ImportError:
- import sys
- 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)
+import os
+import sys
if __name__ == '__main__':
- execute_manager(settings)
+ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'glifestream.settings')
+
+ from django.core.management import execute_from_command_line
+
+ execute_from_command_line(sys.argv)
diff --git a/worker.py b/worker.py
index 5035df6..69a6fea 100755
--- a/worker.py
+++ b/worker.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# gLifestream Copyright (C) 2009, 2010 Wojciech Polak
+# gLifestream Copyright (C) 2009, 2010, 2014 Wojciech Polak
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
@@ -21,7 +21,6 @@ import sys
import time
import datetime
import getopt
-import settings
try:
import workerpool
@@ -30,10 +29,7 @@ except ImportError:
SITE_ROOT = os.path.dirname(os.path.realpath(__file__))
os.environ['DJANGO_SETTINGS_MODULE'] = 'glifestream.settings'
-sys.path.insert(0, os.path.join(SITE_ROOT, '../'))
-from django.core.management import setup_environ
-setup_environ(settings)
from django.conf import settings
from glifestream.utils.time import unixnow
from glifestream.stream.models import Service, Entry, Favorite
@@ -248,7 +244,8 @@ def run():
for service in Service.objects.filter(**fs):
try:
- mod = __import__('apis.%s' % service.api, {}, {}, ['API'])
+ mod = __import__('glifestream.apis.%s' % service.api,
+ {}, {}, ['API'])
except ImportError:
continue
mod_api = getattr(mod, 'API')

Return to:

Send suggestions and report system problems to the System administrator.