.gitignore | 1 + moksha/api/widgets/containers/dashboardcontainer.py | 6 ++---- moksha/middleware/middleware.py | 7 ++----- moksha/streams/feed/feedstream.py | 12 +++++------- moksha/widgets/container/dashboards.py | 17 ----------------- setup.py | 10 +++++----- 6 files changed, 15 insertions(+), 38 deletions(-)
New commits: commit 187b93d1a96ba171126a6b25fcd0ca03eb196b83 Author: Luke Macken lmacken@redhat.com Date: Wed Feb 18 03:38:31 2009 -0500
Some FeedStreamer module cleanups, and bugfixes
diff --git a/moksha/streams/feed/feedstream.py b/moksha/streams/feed/feedstream.py index 9ac2f6d..5f70d40 100644 --- a/moksha/streams/feed/feedstream.py +++ b/moksha/streams/feed/feedstream.py @@ -16,10 +16,10 @@ # Copyright 2008, Red Hat, Inc. # Authors: Luke Macken lmacken@redhat.com
-import moksha import logging -import feedparser, time, sys -import md5, os +import feedparser +import time +import os
try: from cStringIO import cStringIO as StringIO @@ -29,10 +29,8 @@ except ImportError: from twisted.web import client from twisted.web.client import HTTPPageGetter, HTTPClientFactory from twisted.internet import reactor, protocol, defer, ssl -from twisted.web import error -from twisted.internet import protocol, defer
-from datetime import timedelta, datetime +from datetime import timedelta from feedcache import Cache from shove import Shove from tg import config @@ -97,7 +95,7 @@ class ConditionalHTTPClientFactory(HTTPClientFactory): log.error("Unable to store parsed_feed: %r" % parsed_feed) log.exception(e)
- def notModified(): + def notModified(self): if self.waiting: self.waiting = False
commit 87958d53f8748573947ee0a26d409bde1a4f0069 Author: Luke Macken lmacken@redhat.com Date: Wed Feb 18 03:35:56 2009 -0500
Clean up some unused modules in our middleware
diff --git a/moksha/middleware/middleware.py b/moksha/middleware/middleware.py index ea60286..4737780 100644 --- a/moksha/middleware/middleware.py +++ b/moksha/middleware/middleware.py @@ -20,21 +20,18 @@ import os import moksha import logging import pkg_resources -import simplejson as json -import urllib
from tg.controllers import WSGIAppController -from webob import Request, Response +from webob import Request from shove import Shove from pylons import config from inspect import isclass from pylons.i18n import ugettext from paste.deploy import appconfig -from genshi.filters import Translator from sqlalchemy import create_engine from feedcache.cache import Cache
-from moksha.exc import ApplicationNotFound, MokshaException +from moksha.exc import MokshaException from moksha.lib.helpers import (defaultdict, get_moksha_config_path, get_main_app_config_path) from moksha.wsgiapp import MokshaAppDispatcher
commit 89f5683c2750a5cde4443717a6ed05932c0eea4f Author: Luke Macken lmacken@redhat.com Date: Wed Feb 18 03:33:33 2009 -0500
Remove an unnecessary module
diff --git a/moksha/widgets/container/dashboards.py b/moksha/widgets/container/dashboards.py deleted file mode 100644 index 90211ae..0000000 --- a/moksha/widgets/container/dashboards.py +++ /dev/null @@ -1,17 +0,0 @@ -from tw.api import WidgetList, Widget - -class MyWidgetViews(Widget): - class views(WidgetList): - mobi = MyMobileWidget - sidebar = MySidebarWidget - content = MyContentWidget - - -class MyBaseWidget(Widget): - views = MyWidgetViews - views = {'mobi': MyMobileWidget, 'sidebar': MySidebarWidget} - -class MyMobileWidget(MyBaseWidget): - template = 'mymobiletemplate' - -
commit ca459bf7f3eff0b430603fcb273dd189baf09e96 Author: Luke Macken lmacken@redhat.com Date: Wed Feb 18 03:07:51 2009 -0500
Update our gitignore
diff --git a/.gitignore b/.gitignore index 9a17f7d..15512a1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ mokshaenv *.db .build tg2env +*.egg-info
commit 4d212e2f796bc6e473292dab7a56ce74d7c96e41 Author: Luke Macken lmacken@redhat.com Date: Wed Feb 18 02:47:56 2009 -0500
Clean up some of our dashboard container imports
diff --git a/moksha/api/widgets/containers/dashboardcontainer.py b/moksha/api/widgets/containers/dashboardcontainer.py index 04e56a4..bb1335b 100644 --- a/moksha/api/widgets/containers/dashboardcontainer.py +++ b/moksha/api/widgets/containers/dashboardcontainer.py @@ -1,9 +1,7 @@ -from moksha.api.widgets.layout.layout import layout_js, layout_css, ui_core_js, ui_draggable_js, ui_droppable_js, ui_sortable_js - +from tg import config from tw.api import Widget -from tw.jquery import jquery_js + from moksha.lib.helpers import eval_app_config, ConfigWrapper -from tg import config
class AppListWidget(Widget): template = 'mako:moksha.api.widgets.containers.templates.layout_applist'
commit 70dfad60d610d43d56b3a9d8c8905f9795724007 Author: Luke Macken lmacken@redhat.com Date: Wed Feb 18 02:42:19 2009 -0500
Tweak our global resources and remove some unnecessary ones by default
diff --git a/setup.py b/setup.py index 7aa603d..5d870e5 100644 --- a/setup.py +++ b/setup.py @@ -79,14 +79,14 @@ setup( orbited = moksha.api.widgets.orbited:orbited_js
jquery = tw.jquery:jquery_js - jquery_ui_core = tw.jquery.ui:ui_core_js - jquery_ui_draggable = tw.jquery.ui:ui_draggable_min_js - jquery_ui_resizable = tw.jquery.ui:ui_resizable_min_js + jquery_ui_core = tw.jquery.ui_core:jquery_ui_core_js + + #jquery_ui_draggable = tw.jquery.ui:ui_draggable_min_js + #jquery_ui_resizable = tw.jquery.ui:ui_resizable_min_js #jquery_ui_dialog = tw.jquery.ui:ui_dialog_min_js #jquery_ui_tabs = tw.jquery.ui_tabs:jquery_ui_tabs_js #jquery_json_js = fedoracommunity.widgets:jquery_json_js #jquery_template_js = fedoracommunity.widgets:jquery_template_js - #jquery_ui_css = moksha.widgets.jquery_ui_theme:JQueryUITheme
# Enable support for the Blueprint CSS framework @@ -98,7 +98,7 @@ setup( #blueprint_fancytype_css = moksha.widgets.blueprint:blueprint_plugin_fancytype_css
# up up down down left right left right b a - konami_js = moksha.widgets.misc.ptd:konami + #konami_js = moksha.widgets.misc.ptd:konami
[moksha.menu] default_menu = moksha.api.menus:MokshaDefaultMenu
moksha-commits@lists.fedorahosted.org