From 3e482f8c4ab04392c6d2f347ef35df1205203632 Mon Sep 17 00:00:00 2001 From: Yves Marcoz Date: Sun, 6 Jun 2010 20:11:59 -0700 Subject: [PATCH] fix formatting --- debian/changelog | 7 +++++++ src/FeedingIt.py | 2 +- src/config.py | 4 ++-- src/feedparser.pyc | Bin 93682 -> 93730 bytes src/rss.py | 24 ++++++++++++------------ 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 547a811..3a3f2d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +feedingit (0.7.0-2) unstable; urgency=low + + * Changed layout of article listing TreeView + * Reduced font for widget and made it single click + + -- Yves Sat, 29 May 2010 10:53:19 -0800 + feedingit (0.7.0-1) unstable; urgency=low * Fixed error message when viewing un-downloaded Archived Article diff --git a/src/FeedingIt.py b/src/FeedingIt.py index 32919b7..1ce9c3c 100644 --- a/src/FeedingIt.py +++ b/src/FeedingIt.py @@ -19,7 +19,7 @@ # ============================================================================ __appname__ = 'FeedingIt' __author__ = 'Yves Marcoz' -__version__ = '0.6.2' +__version__ = '0.7.0' __description__ = 'A simple RSS Reader for Maemo 5' # ============================================================================ diff --git a/src/config.py b/src/config.py index a38787f..5c98ec0 100644 --- a/src/config.py +++ b/src/config.py @@ -30,7 +30,7 @@ from gobject import idle_add from gconf import client_get_default from urllib2 import ProxyHandler -VERSION = "0.6.1" +VERSION = "48" section = "FeedingIt" ranges = { "updateInterval":[0.5, 1, 2, 4, 12, 24], "expiry":[24, 48, 72], "fontSize":range(12,24), "orientation":["Automatic", "Landscape", "Portrait"], "artFontSize":[10, 12, 14, 16, 18, 20]} @@ -114,7 +114,7 @@ class Config(): bus = dbus.SessionBus() proxy = bus.get_object("com.nokia.osso_browser", "/com/nokia/osso_browser/request") iface = dbus.Interface(proxy, 'com.nokia.osso_browser') - iface.open_new_window("http://feedingit.marcoz.org/%s.html" % VERSION) + iface.open_new_window("http://feedingit.marcoz.org/news/?page_id=%s" % VERSION) def onExit(self, *widget): self.saveConfig() diff --git a/src/feedparser.pyc b/src/feedparser.pyc index e33edbcd9a8ca97a1ccea08924b0e65f45ad2286..f2376cc72e2f130dd18a283c58aa15d92e663dee 100644 GIT binary patch delta 1773 zcmZ`)O-x)>6#mW(@L*>69hl+qQ(%BXDYR5u&~aK@(>mBjRq?4EwekKvxZ zul{J?-Orcz^OT9xUH{ht-B}w$(ZWUqRPbt{>!50(>aZI@u@;^Mr;dm>oCuK{6Nie) zrgI2#<8WLM`*Z@j9x4uH$)-wRl_3StP6mw94N&!P8~s0Dr8YY7-+hfnUpgQvZ2iov zO>owq$kJd~t}{yq7^R!Rg~*}>@u0q$t$?glA=@A>D=4$kl$j5hlh_4{yb*(Lg=)es z!K;C4MlN))fR1&$ZY=n-Gw;J-!fINkgaJ3<)Qie5++!1WrV4DMM z`U!wQP)-^u*={hgVh%W0T9?`YS40v*o3*S_9{ZF9pp-vHlF$IRUrFe=tYs!u1&rB9hPo|7N^4B%D>A zc`uwrM!o`G>AtX4#kqrY&g7#!d@n}WIGP}2zbw_vY~8Pt1ox{7rZ`D(jXNALMRM>Z zPBRX+h55fMb~aNj@tNx5@q_=0AN;@g(QOmI{V0Aj%jqA_HUo7MYRCv~`+A-_$7~+) zRL~&n&P}gI;Y=Kh>W3N*LvGJg2ig92^VCz~u6WW(X=gWzVmsVH=#$VxaEC?vq7Bc6 zK2`CLK%bU_#?vR+7=_2jTZYKSSj7lQ&Oo0vmzR%q2lP0@tW9!0(; zozNG|g_G5US-F$Y&pXxrf4@Pg(v(HP2wSmvj`^Ppwc;};CzU1J ztl~d@Z5rhyG8gt2TyS<=G@28?s@S+>j0hV%rEb`A2gLup@$-cg51^bb&sI&=vo~MY=|{Y}j6g_wRG5$>KIJRS(#LY)bO5Bh@8)z`4u%S|wsw%2%feD~IsGkX$7>_^^ zGqS)-*q|&%%CcgQDuG;tieQ1Nf+_?HREaKGu?&BJ``(OcipnC!)jSmvN2nQcZVYded8^ePQdND~iy!%c1%36YJ zV#feA9TQfZ$ce!+i0n8xAz~O9uns|X0+tQpoJ>NdAmR|F+7tjvSE=^$ZK7uPXKpeMYx|L;DNTBrNy}iA%qTjw$Rf#2kC638 zWIMzvebs5Ldc$X)(A^VoSX&NaOsR6B5aXx^sf=Ssz|DcB`ADQ&!gRzy=3y}Pf`Y`+Y_l>}=7Bs7ZSQo+q)$K*^Iyb^vz7Cp&T= z8i;u;m}tw;#1+(e3fxYK;5}bWPE{!}6QiwZh$Wm+soV&ZhX^TSJhjJLc=#g)qq1`sJ& zlm8k{9x1EC^R2?#V&qluN*)V7OBB7<>olGGmnon*ui7@cx5A3)R=BBED5i@ndrqt2 zi*t_oR=}~V1wPQ@vy|2|5mldwJX}BjpZfX#t2eiF{g!uWlcuiDLM%WW*Pazoa>nqE zfkH7jvOKWB&mxcRf^Qo8$;eI!)*9=6FzGpn6F!gk?IxAk?cX=4+Gk-rLB1|?7=++X z!Crto4tWCh*m-VGA!zn{PdE~VS z?r^^Z!F_^z#(XPk#BG9DggA*cHEA`7y{wk8s(4hc(OomcwuuhER&5ZuaUS%N>PIT0eHnkUjP6A diff --git a/src/rss.py b/src/rss.py index b27c9a5..fd0dc5b 100644 --- a/src/rss.py +++ b/src/rss.py @@ -132,13 +132,13 @@ class Feed: tmp=feedparser.parse(self.url, etag = self.etag, modified = self.modified) else: tmp=feedparser.parse(self.url, etag = self.etag, modified = self.modified, handlers = [proxy]) - try: + try: self.etag = tmp["etag"] - except KeyError: + except KeyError: pass - try: + try: self.modified = tmp["modified"] - except KeyError: + except KeyError: pass expiry = float(expiryTime) * 3600. # Check if the parse was succesful (number of entries > 0, else do nothing) @@ -543,14 +543,14 @@ class Listing: del feed.imageHandler except: pass - try: - feed.etag - except AttributeError: - feed.etag = None - try: - feed.modified - except AttributeError: - feed.modified = None + try: + feed.etag + except AttributeError: + feed.etag = None + try: + feed.modified + except AttributeError: + feed.modified = None #feed.reloadUnread(self.configdir) else: #print key -- 1.7.9.5