1
=== modified file 'README'
2
--- README	2012-05-10 17:20:35 +0000
3
+++ README	2012-05-12 02:14:17 +0000
4
@@ -0,0 +1,50 @@
5
1
Installing Gwibber
6
2
==================
7
3
8
4
  Requirements
9
5
  ------------
10
6
11
7
	Please note that the version numbers listed below only reflect my test
12
8
	environment. Gwibber is known to work with those specific versions, but
13
9
	will probably work fine on most current desktop distributions that include
14
10
	Python's WebKit GTK+ bindings.
15
11
16
12
    * python (2.5)
17
13
    * python-dbus (0.80.2)
18
14
    * python-gtk2 (2.10.4)
19
15
    * python-gconf (2.18.0)
20
16
    * python-imaging (1.1.6)
21
17
    * python-notify (0.1.1)
22
18
    * python-webkitgtk (1.0.1)
23
19
    * python-simplejson (1.9.1)
24
20
    * python-distutils-extra
25
21
    * python-feedparser (4.1)
26
22
    * python-xdg (0.15)
27
23
    * python-mako (0.2.2)
28
24
    * python-pycurl
29
25
30
26
  Installation
31
27
  ------------
32
28
33
29
	Gwibber uses Python's distutils framework for installation. In order to
34
30
	install Gwibber, you will need root access. To install Gwibber, perform
35
31
	the following command as root:
36
32
37
33
      $ python setup.py install
38
34
39
35
  Run Gwibber
40
36
  -----------
41
37
42
38
	If you installed Gwibber using the setup.py script, you can launch the
43
39
	program by typing "gwibber" at the command line. If you want to run
44
40
	Gwibber without installing it, start "bin/gwibber" from within the
45
41
	Gwibber directory.
46
42
47
43
  Testing
48
44
  -------
49
45
50
46
        You can run the dbus isolated tests by cd'ing into the tests directory
51
47
        and running `make check`.
52
48
53
49
        You can run the Python unittests by cd'ing into tests/python/unittests
54
50
        and running `PYTHONPATH=../../.. python -m unittest discover -v`
55
0
51
56
=== modified file 'gwibber/microblog/dispatcher.py'
57
--- gwibber/microblog/dispatcher.py	2012-03-27 15:48:44 +0000
58
+++ gwibber/microblog/dispatcher.py	2012-05-12 02:14:17 +0000
59
@@ -3,7 +3,7 @@
60
3
3
61
4
import traceback, json, random, string
4
import traceback, json, random, string
62
5
import dbus, dbus.service
5
import dbus, dbus.service
64
6
import sqlite3, mx.DateTime, re, uuid
6
import sqlite3, re, uuid
65
7
import urlshorter, storage, network, util, uploader
7
import urlshorter, storage, network, util, uploader
66
8
from gettext import lgettext as _
8
from gettext import lgettext as _
67
9
9
68
@@ -943,7 +943,7 @@
69
943
          operations.append(o)
943
          operations.append(o)
70
944
    
944
    
71
945
      if operations:
945
      if operations:
73
946
        logger.debug("** Starting Refresh - %s **", mx.DateTime.now())
946
        logger.debug("** Starting Refresh - %s **", datetime.now())
74
947
        self.LoadingStarted()
947
        self.LoadingStarted()
75
948
        self.perform_async_operation(operations)
948
        self.perform_async_operation(operations)
76
949
949
77
950
950
78
=== modified file 'gwibber/microblog/plugins/facebook/__init__.py'
79
--- gwibber/microblog/plugins/facebook/__init__.py	2012-03-09 19:34:33 +0000
80
+++ gwibber/microblog/plugins/facebook/__init__.py	2012-05-12 02:14:17 +0000
81
@@ -2,8 +2,7 @@
82
2
2
83
3
from gwibber.microblog import network, util
3
from gwibber.microblog import network, util
84
4
from gwibber.microblog.util import resources
4
from gwibber.microblog.util import resources
87
5
import hashlib, mx.DateTime, time
5
import hashlib, time
86
6
from os.path import join, getmtime, exists
88
7
from gettext import lgettext as _
6
from gettext import lgettext as _
89
8
from gwibber.microblog.util.const import *
7
from gwibber.microblog.util.const import *
90
9
# Try to import * from custom, install custom.py to include packaging 
8
# Try to import * from custom, install custom.py to include packaging 
91
@@ -12,11 +11,15 @@
92
12
  from gwibber.microblog.util.custom import *
11
  from gwibber.microblog.util.custom import *
93
13
except:
12
except:
94
14
  pass
13
  pass
95
14
from gwibber.time import parsetime
96
15
97
16
from datetime import datetime, timedelta
98
15
17
99
16
import logging
18
import logging
100
17
logger = logging.getLogger("Facebook")
19
logger = logging.getLogger("Facebook")
101
18
logger.debug("Initializing.")
20
logger.debug("Initializing.")
102
19
21
103
22
104
20
PROTOCOL_INFO = {
23
PROTOCOL_INFO = {
105
21
  "name": "Facebook",
24
  "name": "Facebook",
106
22
  "version": "1.1",
25
  "version": "1.1",
107
@@ -56,6 +59,21 @@
108
56
URL_PREFIX = "https://graph.facebook.com/"
59
URL_PREFIX = "https://graph.facebook.com/"
109
57
POST_URL = "http://www.facebook.com/profile.php?id=%s&v=feed&story_fbid=%s&ref=mf"
60
POST_URL = "http://www.facebook.com/profile.php?id=%s&v=feed&story_fbid=%s&ref=mf"
110
58
61
111
62
112
63
def convert_time(data):
113
64
    """Extract and convert the time to a timestamp (seconds since Epoch).
114
65
115
66
    First, look for the 'updated_time' key in the data, falling back to
116
67
    'created_time' if the former is missing.
117
68
    """
118
69
    # Convert from an ISO 8601 format time string to a Epoch timestamp.
119
70
    # Assume standard ISO 8601 'T' separator, no microseconds, and naive
120
71
    # time zone as per:
121
72
    # https://developers.facebook.com/docs/reference/api/event/
122
73
    time_string = data.get('updated_time', data['created_time'])
123
74
    return parsetime(time_string)
124
75
125
76
126
59
class Client:
77
class Client:
127
60
  def __init__(self, acct):
78
  def __init__(self, acct):
128
61
    self.account = acct
79
    self.account = acct
129
@@ -122,7 +140,7 @@
130
122
    m["service"] = "facebook"
140
    m["service"] = "facebook"
131
123
    m["account"] = self.account["id"]
141
    m["account"] = self.account["id"]
132
124
142
134
125
    m["time"] = int(mx.DateTime.DateTimeFrom(str(data.get("updated_time", data["created_time"]))))
143
    m["time"] = convert_time(data)
135
126
    m["url"] = "https://facebook.com/" + data["id"].split("_")[0] + "/posts/" + data["id"].split("_")[1]
144
    m["url"] = "https://facebook.com/" + data["id"].split("_")[0] + "/posts/" + data["id"].split("_")[1]
136
127
    
145
    
137
128
146
138
@@ -233,7 +251,7 @@
139
233
        for item in data["comments"]["data"]:
251
        for item in data["comments"]["data"]:
140
234
          m["comments"].append({
252
          m["comments"].append({
141
235
              "text": item["message"],
253
              "text": item["message"],
143
236
              "time": int(mx.DateTime.DateTimeFrom(str(data.get("updated_time", data["created_time"])))),
254
              "time": convert_time(data),
144
237
              "sender": self._sender(item["from"]),
255
              "sender": self._sender(item["from"]),
145
238
            })
256
            })
146
239
257
147
@@ -250,15 +268,16 @@
148
250
    return getattr(self, opname)(**args)
268
    return getattr(self, opname)(**args)
149
251
269
150
252
  def receive(self, since=None):
270
  def receive(self, since=None):
153
253
    if not since:
271
    if since is None:
154
254
      since = int(mx.DateTime.DateTimeFromTicks(mx.DateTime.localtime()) - mx.DateTime.TimeDelta(hours=240.0))
272
      past = datetime.now() - timedelta(hours=240.0)
155
255
    else:
273
    else:
157
256
      since = int(mx.DateTime.DateTimeFromTicks(since).localtime())
274
      past = datetime.fromtimestamp(since)
158
257
275
159
276
    since = int(time.mktime(past.timetuple()))
160
258
    data = self._get("me/home", since=since, limit=100)
277
    data = self._get("me/home", since=since, limit=100)
161
259
    
278
    
162
260
    logger.debug("<STATS> facebook:receive account:%s since:%s size:%s",
279
    logger.debug("<STATS> facebook:receive account:%s since:%s size:%s",
164
261
        self.account["id"], mx.DateTime.DateTimeFromTicks(since), len(str(data)))
280
        self.account["id"], datetime.fromtimestamp(since), len(str(data)))
165
262
    
281
    
166
263
    if not self._check_error(data):
282
    if not self._check_error(data):
167
264
      try:
283
      try:
168
265
284
169
=== modified file 'gwibber/microblog/plugins/flickr/__init__.py'
170
--- gwibber/microblog/plugins/flickr/__init__.py	2012-02-10 10:06:59 +0000
171
+++ gwibber/microblog/plugins/flickr/__init__.py	2012-05-12 02:14:17 +0000
172
@@ -1,11 +1,10 @@
175
1
from gwibber.microblog import network, util
1
from gwibber.microblog import network
176
2
from gwibber.microblog.util import resources
2
from gwibber.time import parsetime
177
3
3
178
4
import logging
4
import logging
179
5
logger = logging.getLogger("Flickr")
5
logger = logging.getLogger("Flickr")
180
6
logger.debug("Initializing.")
6
logger.debug("Initializing.")
181
7
7
182
8
import re, mx.DateTime
183
9
from gettext import lgettext as _
8
from gettext import lgettext as _
184
10
9
185
11
PROTOCOL_INFO = {
10
PROTOCOL_INFO = {
186
@@ -37,8 +36,6 @@
187
37
IMAGE_URL = "http://farm%s.static.flickr.com/%s/%s_%s_%s.jpg"
36
IMAGE_URL = "http://farm%s.static.flickr.com/%s/%s_%s_%s.jpg"
188
38
IMAGE_PAGE_URL = "http://www.flickr.com/photos/%s/%s"
37
IMAGE_PAGE_URL = "http://www.flickr.com/photos/%s/%s"
189
39
38
190
40
def parse_time(t):
191
41
  return mx.DateTime.DateTimeFromTicks(int(t)).gmtime().ticks()
192
42
39
193
43
class Client:
40
class Client:
194
44
  def __init__(self, acct):
41
  def __init__(self, acct):
195
@@ -49,7 +46,7 @@
196
49
    m["mid"] = str(data["id"])
46
    m["mid"] = str(data["id"])
197
50
    m["service"] = "flickr"
47
    m["service"] = "flickr"
198
51
    m["account"] = self.account["id"]
48
    m["account"] = self.account["id"]
200
52
    m["time"] = parse_time(data["dateupload"])
49
    m["time"] = parsetime(data["dateupload"])
201
53
    m["source"] = False
50
    m["source"] = False
202
54
    m["text"] = data["title"]
51
    m["text"] = data["title"]
203
55
52
204
56
53
205
=== modified file 'gwibber/microblog/plugins/friendfeed/__init__.py'
206
--- gwibber/microblog/plugins/friendfeed/__init__.py	2012-02-10 10:06:59 +0000
207
+++ gwibber/microblog/plugins/friendfeed/__init__.py	2012-05-12 02:14:17 +0000
208
@@ -1,5 +1,6 @@
209
1
from gwibber.microblog import network, util
1
from gwibber.microblog import network, util
210
2
from gwibber.microblog.util import resources
2
from gwibber.microblog.util import resources
211
3
from gwibber.time import parsetime
212
3
4
213
4
import logging
5
import logging
214
5
logger = logging.getLogger("FriendFeed")
6
logger = logging.getLogger("FriendFeed")
215
@@ -61,7 +62,7 @@
216
61
      "mid": data["id"],
62
      "mid": data["id"],
217
62
      "service": "friendfeed",
63
      "service": "friendfeed",
218
63
      "account": self.account["id"],
64
      "account": self.account["id"],
220
64
      "time": util.parsetime(data["published"]),
65
      "time": parsetime(data["published"]),
221
65
      "source": data.get("via", {}).get("name", None),
66
      "source": data.get("via", {}).get("name", None),
222
66
      "text": data["title"],
67
      "text": data["title"],
223
67
      "html": util.linkify(data["title"]),
68
      "html": util.linkify(data["title"]),
224
@@ -86,7 +87,7 @@
225
86
      for item in data["comments"][-3:]:
87
      for item in data["comments"][-3:]:
226
87
        m["comments"].append({
88
        m["comments"].append({
227
88
          "text": item["body"],
89
          "text": item["body"],
229
89
          "time": util.parsetime(item["date"]),
90
          "time": parsetime(item["date"]),
230
90
          "sender": self._sender(item["user"]),
91
          "sender": self._sender(item["user"]),
231
91
        })
92
        })
232
92
93
233
93
94
234
=== modified file 'gwibber/microblog/plugins/identica/__init__.py'
235
--- gwibber/microblog/plugins/identica/__init__.py	2012-02-13 20:39:02 +0000
236
+++ gwibber/microblog/plugins/identica/__init__.py	2012-05-12 02:14:17 +0000
237
@@ -1,7 +1,9 @@
238
1
from gettext import lgettext as _
239
2
from oauth import oauth
240
3
241
1
from gwibber.microblog import network, util
4
from gwibber.microblog import network, util
242
2
from oauth import oauth
243
3
from gwibber.microblog.util import resources
5
from gwibber.microblog.util import resources
245
4
from gettext import lgettext as _
6
from gwibber.time import parsetime
246
5
7
247
6
import logging
8
import logging
248
7
logger = logging.getLogger("Identica")
9
logger = logging.getLogger("Identica")
249
@@ -71,7 +73,7 @@
250
71
      m["service"] = "identica"
73
      m["service"] = "identica"
251
72
      m["account"] = self.account["id"]
74
      m["account"] = self.account["id"]
252
73
      if data.has_key("created_at"):
75
      if data.has_key("created_at"):
254
74
        m["time"] = util.parsetime(data["created_at"])
76
        m["time"] = parsetime(data["created_at"])
255
75
      m["source"] = data.get("source", False)
77
      m["source"] = data.get("source", False)
256
76
      m["text"] = util.unescape(data["text"])
78
      m["text"] = util.unescape(data["text"])
257
77
      m["to_me"] = ("@%s" % self.account["username"]) in data["text"]
79
      m["to_me"] = ("@%s" % self.account["username"]) in data["text"]
258
@@ -130,12 +132,12 @@
259
130
    if data.has_key("retweeted_status"):
132
    if data.has_key("retweeted_status"):
260
131
      n["retweeted_by"] = self._user(data["user"] if "user" in data else data["sender"])
133
      n["retweeted_by"] = self._user(data["user"] if "user" in data else data["sender"])
261
132
      if data.has_key("created_at"):
134
      if data.has_key("created_at"):
263
133
        n["time"] = util.parsetime(data["created_at"])
135
        n["time"] = parsetime(data["created_at"])
264
134
      data = data["retweeted_status"]
136
      data = data["retweeted_status"]
265
135
    else:
137
    else:
266
136
      n["retweeted_by"] = None
138
      n["retweeted_by"] = None
267
137
      if data.has_key("created_at"):
139
      if data.has_key("created_at"):
269
138
        n["time"] = util.parsetime(data["created_at"])
140
        n["time"] = parsetime(data["created_at"])
270
139
141
271
140
    m = self._common(data)
142
    m = self._common(data)
272
141
143
273
142
144
274
=== modified file 'gwibber/microblog/plugins/qaiku/__init__.py'
275
--- gwibber/microblog/plugins/qaiku/__init__.py	2012-02-10 10:06:59 +0000
276
+++ gwibber/microblog/plugins/qaiku/__init__.py	2012-05-12 02:14:17 +0000
277
@@ -1,5 +1,6 @@
278
1
from gwibber.microblog import network, util
1
from gwibber.microblog import network, util
279
2
from gwibber.microblog.util import resources
2
from gwibber.microblog.util import resources
280
3
from gwibber.time import parsetime
281
3
4
282
4
import logging
5
import logging
283
5
logger = logging.getLogger("Qaiku")
6
logger = logging.getLogger("Qaiku")
284
@@ -46,7 +47,7 @@
285
46
    m["mid"] = str(data["id"])
47
    m["mid"] = str(data["id"])
286
47
    m["service"] = "qaiku"
48
    m["service"] = "qaiku"
287
48
    m["account"] = self.account["id"]
49
    m["account"] = self.account["id"]
289
49
    m["time"] = util.parsetime(data["created_at"])
50
    m["time"] = parsetime(data["created_at"])
290
50
    m["text"] = data["text"]
51
    m["text"] = data["text"]
291
51
    m["to_me"] = ("@%s" % self.account["username"]) in data["text"]
52
    m["to_me"] = ("@%s" % self.account["username"]) in data["text"]
292
52
53
293
53
54
294
=== modified file 'gwibber/microblog/plugins/statusnet/__init__.py'
295
--- gwibber/microblog/plugins/statusnet/__init__.py	2012-02-13 20:39:02 +0000
296
+++ gwibber/microblog/plugins/statusnet/__init__.py	2012-05-12 02:14:17 +0000
297
@@ -1,8 +1,9 @@
299
1
import re
1
from gettext import lgettext as _
300
2
from oauth import oauth
301
3
302
2
from gwibber.microblog import network, util
4
from gwibber.microblog import network, util
303
3
from oauth import oauth
304
4
from gwibber.microblog.util import resources
5
from gwibber.microblog.util import resources
306
5
from gettext import lgettext as _
6
from gwibber.time import parsetime
307
6
7
308
7
import logging
8
import logging
309
8
logger = logging.getLogger("StatusNet")
9
logger = logging.getLogger("StatusNet")
310
@@ -71,7 +72,7 @@
311
71
      m["service"] = "statusnet"
72
      m["service"] = "statusnet"
312
72
      m["account"] = self.account["id"]
73
      m["account"] = self.account["id"]
313
73
      if data.has_key("created_at"):
74
      if data.has_key("created_at"):
315
74
        m["time"] = util.parsetime(data["created_at"])
75
        m["time"] = parsetime(data["created_at"])
316
75
      m["source"] = data.get("source", False)
76
      m["source"] = data.get("source", False)
317
76
      m["text"] = util.unescape(data["text"])
77
      m["text"] = util.unescape(data["text"])
318
77
      m["to_me"] = ("@%s" % self.account["username"]) in data["text"]
78
      m["to_me"] = ("@%s" % self.account["username"]) in data["text"]
319
@@ -130,12 +131,12 @@
320
130
    if data.has_key("retweeted_status"):
131
    if data.has_key("retweeted_status"):
321
131
      n["retweeted_by"] = self._user(data["user"] if "user" in data else data["sender"])
132
      n["retweeted_by"] = self._user(data["user"] if "user" in data else data["sender"])
322
132
      if data.has_key("created_at"):
133
      if data.has_key("created_at"):
324
133
        n["time"] = util.parsetime(data["created_at"])
134
        n["time"] = parsetime(data["created_at"])
325
134
      data = data["retweeted_status"]
135
      data = data["retweeted_status"]
326
135
    else:
136
    else:
327
136
      n["retweeted_by"] = None
137
      n["retweeted_by"] = None
328
137
      if data.has_key("created_at"):
138
      if data.has_key("created_at"):
330
138
        n["time"] = util.parsetime(data["created_at"])
139
        n["time"] = parsetime(data["created_at"])
331
139
140
332
140
    m = self._common(data)
141
    m = self._common(data)
333
141
    for k in n:
142
    for k in n:
334
142
143
335
=== modified file 'gwibber/microblog/plugins/twitter/__init__.py'
336
--- gwibber/microblog/plugins/twitter/__init__.py	2012-03-30 14:32:20 +0000
337
+++ gwibber/microblog/plugins/twitter/__init__.py	2012-05-12 02:14:17 +0000
338
@@ -1,8 +1,10 @@
339
1
from gwibber.microblog import network, util
340
2
import cgi
1
import cgi
341
2
from gettext import lgettext as _
342
3
from oauth import oauth
3
from oauth import oauth
343
4
344
5
from gwibber.microblog import network, util
345
4
from gwibber.microblog.util import resources
6
from gwibber.microblog.util import resources
347
5
from gettext import lgettext as _
7
from gwibber.time import parsetime
348
6
8
349
7
import logging
9
import logging
350
8
logger = logging.getLogger("Twitter")
10
logger = logging.getLogger("Twitter")
351
@@ -79,7 +81,7 @@
352
79
      m["service"] = "twitter"
81
      m["service"] = "twitter"
353
80
      m["account"] = self.account["id"]
82
      m["account"] = self.account["id"]
354
81
      if data.has_key("created_at"):
83
      if data.has_key("created_at"):
356
82
        m["time"] = util.parsetime(data["created_at"])
84
        m["time"] = parsetime(data["created_at"])
357
83
      m["text"] = util.unescape(data["text"])
85
      m["text"] = util.unescape(data["text"])
358
84
      m["text"] = cgi.escape(m["text"])
86
      m["text"] = cgi.escape(m["text"])
359
85
      m["content"] = m["text"]
87
      m["content"] = m["text"]
360
@@ -227,12 +229,12 @@
361
227
    if data.has_key("retweeted_status"):
229
    if data.has_key("retweeted_status"):
362
228
      n["retweeted_by"] = self._user(data["user"] if "user" in data else data["sender"])
230
      n["retweeted_by"] = self._user(data["user"] if "user" in data else data["sender"])
363
229
      if data.has_key("created_at"):
231
      if data.has_key("created_at"):
365
230
        n["time"] = util.parsetime(data["created_at"])
232
        n["time"] = parsetime(data["created_at"])
366
231
      data = data["retweeted_status"]
233
      data = data["retweeted_status"]
367
232
    else:
234
    else:
368
233
      n["retweeted_by"] = None
235
      n["retweeted_by"] = None
369
234
      if data.has_key("created_at"):
236
      if data.has_key("created_at"):
371
235
        n["time"] = util.parsetime(data["created_at"])
237
        n["time"] = parsetime(data["created_at"])
372
236
238
373
237
    m = self._common(data)
239
    m = self._common(data)
374
238
    for k in n:
240
    for k in n:
375
239
241
376
=== modified file 'gwibber/microblog/util/__init__.py'
377
--- gwibber/microblog/util/__init__.py	2012-04-20 21:16:37 +0000
378
+++ gwibber/microblog/util/__init__.py	2012-05-12 02:14:17 +0000
379
@@ -1,7 +1,7 @@
382
1
import os, locale, re, mx.DateTime, cgi, httplib2
1
import re, cgi, httplib2
383
2
import resources
2
from gwibber.microblog.util import resources
384
3
import dbus
3
import dbus
386
4
from const import *
4
from gwibber.microblog.util.const import *
387
5
from htmlentitydefs import name2codepoint
5
from htmlentitydefs import name2codepoint
388
6
6
389
7
import logging
7
import logging
390
@@ -16,12 +16,6 @@
391
16
16
392
17
COUNT = 200
17
COUNT = 200
393
18
18
394
19
def parsetime(t):
395
20
  locale.setlocale(locale.LC_TIME, 'C')
396
21
  result = mx.DateTime.Parser.DateTimeFromString(t)
397
22
  locale.setlocale(locale.LC_TIME, '')
398
23
  return result.ticks()
399
24
400
25
URL_SCHEMES = ('http', 'https', 'ftp', 'mailto', 'news', 'gopher',
19
URL_SCHEMES = ('http', 'https', 'ftp', 'mailto', 'news', 'gopher',
401
26
               'nntp', 'telnet', 'wais', 'prospero', 'aim', 'webcal')
20
               'nntp', 'telnet', 'wais', 'prospero', 'aim', 'webcal')
402
27
21
403
28
22
404
=== modified file 'gwibber/microblog/util/resources.py'
405
--- gwibber/microblog/util/resources.py	2012-03-20 16:31:03 +0000
406
+++ gwibber/microblog/util/resources.py	2012-05-12 02:14:17 +0000
407
@@ -9,7 +9,7 @@
408
9
from os import makedirs, remove, environ
9
from os import makedirs, remove, environ
409
10
from os.path import join, isdir, realpath, exists
10
from os.path import join, isdir, realpath, exists
410
11
import Image
11
import Image
412
12
import mx.DateTime
12
from datetime import datetime
413
13
from gwibber.microblog import network
13
from gwibber.microblog import network
414
14
from gwibber.microblog.util.const import *
14
from gwibber.microblog.util.const import *
415
15
import inspect
15
import inspect
416
@@ -211,7 +211,7 @@
417
211
    dump_cache_dir = realpath(join(CACHE_BASE_DIR, "gwibber", "dump", service))
211
    dump_cache_dir = realpath(join(CACHE_BASE_DIR, "gwibber", "dump", service))
418
212
    if not isdir(dump_cache_dir):
212
    if not isdir(dump_cache_dir):
419
213
      makedirs(dump_cache_dir)
213
      makedirs(dump_cache_dir)
421
214
    dump_cache_file = join(dump_cache_dir, (aid + "." + str(mx.DateTime.now()) + "." + operation))
214
    dump_cache_file = join(dump_cache_dir, (aid + "." + str(datetime.now()) + "." + operation))
422
215
215
423
216
    if not exists(dump_cache_file) or len(open(dump_cache_file, "r").read()) < 1:
216
    if not exists(dump_cache_file) or len(open(dump_cache_file, "r").read()) < 1:
424
217
      logger.debug("Dumping test data %s - %s - %s", service, aid, operation)
217
      logger.debug("Dumping test data %s - %s - %s", service, aid, operation)
425
218
218
426
=== added file 'gwibber/time.py'
427
--- gwibber/time.py	1970-01-01 00:00:00 +0000
428
+++ gwibber/time.py	2012-05-12 02:14:17 +0000
429
@@ -0,0 +1,96 @@
430
1
from __future__ import absolute_import
431
2
432
3
import re
433
4
import time
434
5
import locale
435
6
436
7
from contextlib import contextmanager
437
8
from datetime import datetime, timedelta
438
9
439
10
440
11
# Date time formats.  Assume no microseconds and no timezone.
441
12
ISO8601_FORMAT = '%Y-%m-%dT%H:%M:%S'
442
13
TWITTER_FORMAT = '%a %b %d %H:%M:%S %Y'
443
14
444
15
445
16
@contextmanager
446
17
def c_locale():
447
18
    locale.setlocale(locale.LC_TIME, 'C')
448
19
    try:
449
20
        yield
450
21
    finally:
451
22
        locale.setlocale(locale.LC_TIME, '')
452
23
453
24
454
25
def iso8601(t):
455
26
    return datetime.strptime(t, ISO8601_FORMAT)
456
27
457
28
def iso8601alt(t):
458
29
    return datetime.strptime(t, ISO8601_FORMAT.replace('T', ' '))
459
30
460
31
def twitter(t):
461
32
    return datetime.strptime(t, TWITTER_FORMAT)
462
33
463
34
464
35
def parsetime(t):
465
36
    """Parse an ISO 8601 datetime string and return seconds since epoch.
466
37
467
38
    This accepts either a naive (i.e. timezone-less) string or a timezone
468
39
    aware string.  The timezone must start with a + or - and must be followed
469
40
    by exactly four digits.  This string is parsed and converted to UTC.  This
470
41
    value is then converted to an integer seconds since epoch.
471
42
    """
472
43
    with c_locale():
473
44
        # In order to parse the UTC timezone (e.g. +0000), you'd think we
474
45
        # could just append %z on the format, but that doesn't work
475
46
        # across Python versions.  On some platforms in Python 2.7, %z is not
476
47
        # a valid format directive, and its use will raise a ValueError.
477
48
        #
478
49
        # In Python 3.2, strptime() is implemented in Python, so it *is*
479
50
        # supported everywhere, but we still can't rely on it because of the
480
51
        # non-ISO 8601 formats that some APIs use (I'm looking at you Twitter
481
52
        # and Facebook).  We'll use a regular expression to tear out the
482
53
        # timezone string and do the conversion ourselves.
483
54
        #
484
55
        # tz_offset is a list for two reasons.  First, so we can play games
485
56
        # with scoped access to the variable inside capture_tz() without the
486
57
        # use of `nonlocal` which doesn't exist in Python 2.  Also, we'll use
487
58
        # this as a cheap way of ensuring there aren't multiple matching
488
59
        # timezone strings in a single input string.
489
60
        tz_offset = []
490
61
        def capture_tz(match_object):
491
62
            tz_string = match_object.group('tz')
492
63
            if tz_string is not None:
493
64
                # It's possible that we'll see more than one substring
494
65
                # matching the timezone pattern.  It should be highly unlikely
495
66
                # so we won't test for that here, at least not now.
496
67
                #
497
68
                # The tz_offset is positive, so it must be subtracted from the
498
69
                # naive datetime in order to return it to UTC.  E.g.
499
70
                #   13:00 -0400 is 17:00 +0000
500
71
                # or
501
72
                # 1300 - (-0400 / 100)
502
73
                tz_offset.append(timedelta(hours=int(tz_string) / 100))
503
74
            # Return the empty string so as to remove the timezone pattern
504
75
            # from the string we're going to parse.
505
76
            return ''
506
77
        naive_t = re.sub(r'[ ]*(?P<tz>[-+]\d{4})', capture_tz, t)
507
78
        if len(tz_offset) == 0:
508
79
            tz_offset = timedelta()
509
80
        elif len(tz_offset) == 1:
510
81
            tz_offset = tz_offset[0]
511
82
        else:
512
83
            raise ValueError('Unsupported time string: {0}'.format(t))
513
84
        for parser in (iso8601, iso8601alt, twitter):
514
85
            try:
515
86
                dt = parser(naive_t) - tz_offset
516
87
            except ValueError:
517
88
                pass
518
89
            else:
519
90
                break
520
91
        else:
521
92
            # Nothing matched.
522
93
            raise ValueError('Unsupported time string: {0}'.format(t))
523
94
        # We must have gotten a valid datetime.  Convert it to Epoch seconds.
524
95
        timetup = dt.timetuple()
525
96
        return int(time.mktime(timetup))
526
0
97
527
=== modified file 'gwibber/util.py'
528
--- gwibber/util.py	2012-02-13 19:59:49 +0000
529
+++ gwibber/util.py	2012-05-12 02:14:17 +0000
530
@@ -1,4 +1,4 @@
532
1
import dbus, os, mx.DateTime, webbrowser
1
import dbus, os, webbrowser
533
2
import subprocess
2
import subprocess
534
3
from gi.repository import GLib, Gdk, GdkPixbuf, Gtk
3
from gi.repository import GLib, Gdk, GdkPixbuf, Gtk
535
4
from microblog.util import resources
4
from microblog.util import resources
536
@@ -105,8 +105,8 @@
537
105
105
538
106
def generate_time_string(t):
106
def generate_time_string(t):
539
107
  if isinstance(t, str): return t
107
  if isinstance(t, str): return t
542
108
  t = mx.DateTime.TimestampFromTicks(t)
108
  t = datetime.fromtimestap(t)
543
109
  d = mx.DateTime.gmt() - t
109
  d = datetime.utcnow() - t
544
110
110
545
111
  # Aliasing the function doesn't work here with intltool...
111
  # Aliasing the function doesn't work here with intltool...
546
112
  if d.days >= 365:
112
  if d.days >= 365:
547
113
113
548
=== modified file 'tests/plugins/test/__init__.py'
549
--- tests/plugins/test/__init__.py	2012-02-10 10:06:59 +0000
550
+++ tests/plugins/test/__init__.py	2012-05-12 02:14:17 +0000
551
@@ -1,13 +1,11 @@
552
1
import json
553
1
from gwibber.microblog import util
2
from gwibber.microblog import util
555
2
import json
3
from gwibber.time import parsetime
556
3
4
557
4
import logging
5
import logging
558
5
logger = logging.getLogger("Plugin Test")
6
logger = logging.getLogger("Plugin Test")
559
6
logger.debug("Initializing.")
7
logger.debug("Initializing.")
560
7
8
561
8
import re, mx.DateTime
562
9
from gettext import lgettext as _
563
10
564
11
PROTOCOL_INFO = {
9
PROTOCOL_INFO = {
565
12
  "name": "Test",
10
  "name": "Test",
566
13
  "version": 0.1,
11
  "version": 0.1,
567
@@ -40,7 +38,7 @@
568
40
    m["service"] = "test"
38
    m["service"] = "test"
569
41
    m["account"] = self.account["id"]
39
    m["account"] = self.account["id"]
570
42
    if data.has_key("created_at"):
40
    if data.has_key("created_at"):
572
43
      m["time"] = util.parsetime(data["created_at"])
41
      m["time"] = parsetime(data["created_at"])
573
44
    m["source"] = data["source"]
42
    m["source"] = data["source"]
574
45
    m["text"] = data["text"]
43
    m["text"] = data["text"]
575
46
44
576
47
45
577
=== added directory 'tests/python/unittests'
578
=== added file 'tests/python/unittests/__init__.py'
579
=== added file 'tests/python/unittests/test_time.py'
580
--- tests/python/unittests/test_time.py	1970-01-01 00:00:00 +0000
581
+++ tests/python/unittests/test_time.py	2012-05-12 02:14:17 +0000
582
@@ -0,0 +1,53 @@
583
1
import unittest
584
2
585
3
from gwibber.time import parsetime
586
4
587
5
588
6
class TimeParseTest(unittest.TestCase):
589
7
    def test_type(self):
590
8
        # parsetime() should always return int seconds since the epoch.
591
9
        self.assertTrue(isinstance(parsetime('2012-05-10T13:36:45'), int))
592
10
593
11
    def test_parse_naive(self):
594
12
        # ISO 8601 standard format without timezone.
595
13
        self.assertEqual(parsetime('2012-05-10T13:36:45'), 1336682205)
596
14
597
15
    def test_parse_utctz(self):
598
16
        # ISO 8601 standard format with UTC timezone.
599
17
        self.assertEqual(parsetime('2012-05-10T13:36:45 +0000'), 1336682205)
600
18
601
19
    def test_parse_naive_altsep(self):
602
20
        # ISO 8601 alternative format without timezone.
603
21
        self.assertEqual(parsetime('2012-05-10 13:36:45'), 1336682205)
604
22
605
23
    def test_parse_utctz_altsep(self):
606
24
        # ISO 8601 alternative format with UTC timezone.
607
25
        self.assertEqual(parsetime('2012-05-10T13:36:45 +0000'), 1336682205)
608
26
609
27
    def test_bad_time_string(self):
610
28
        # Odd unsupported format.
611
29
        self.assertRaises(ValueError, parsetime, '2012/05/10 13:36:45')
612
30
613
31
    def test_non_utc(self):
614
32
        # Non-UTC timezones are get converted to UTC, before conversion to
615
33
        # epoch seconds.
616
34
        self.assertEqual(parsetime('2012-05-10T13:36:45 -0400'), 1336696605)
617
35
618
36
    def test_nonstandard_twitter(self):
619
37
        # Sigh.  Twitter has to be different.
620
38
        self.assertEqual(parsetime('Thu May 10 13:36:45 +0000 2012'),
621
39
                         1336682205)
622
40
623
41
    def test_nonstandard_twitter_non_utc(self):
624
42
        # Sigh.  Twitter has to be different.
625
43
        self.assertEqual(parsetime('Thu May 10 13:36:45 -0400 2012'),
626
44
                         1336696605)
627
45
628
46
    def test_nonstandard_facebook(self):
629
47
        # Sigh.  Facebook gets close, but no cigar.
630
48
        self.assertEqual(parsetime('2012-05-10T13:36:45+0000'), 1336682205)
631
49
632
50
    def test_multiple_timezones(self):
633
51
        # Multiple timezone strings are not supported.
634
52
        self.assertRaises(ValueError, parsetime,
635
53
                          '2012-05-10T13:36:45 +0000 -0400')
636
0
54
637
=== modified file 'tests/python/utils/__init__.py'
638
--- tests/python/utils/__init__.py	2012-03-12 23:47:12 +0000
639
+++ tests/python/utils/__init__.py	2012-05-12 02:14:17 +0000
640
@@ -1,4 +1,7 @@
642
1
import os, unittest, gettext, mx.DateTime
1
import time
643
2
from datetime import datetime, timedelta
644
3
645
4
import os, unittest
646
2
from gi.repository import Gwibber
5
from gi.repository import Gwibber
647
3
from hashlib import sha1
6
from hashlib import sha1
648
4
7
649
@@ -7,34 +10,40 @@
650
7
        os.environ["XDG_DATA_HOME"] = os.path.realpath (os.path.join (os.path.curdir, "..", "data"))
10
        os.environ["XDG_DATA_HOME"] = os.path.realpath (os.path.join (os.path.curdir, "..", "data"))
651
8
        os.environ["XDG_CACHE_HOME"] = os.path.realpath (os.path.join (os.path.curdir, "..", "data"))
11
        os.environ["XDG_CACHE_HOME"] = os.path.realpath (os.path.join (os.path.curdir, "..", "data"))
652
9
        self.utils = Gwibber.Utils ()
12
        self.utils = Gwibber.Utils ()
654
10
        self.now = mx.DateTime.gmt()
13
        self.now = datetime.utcnow()
655
14
656
15
    def _ago(self, **kws):
657
16
        # Convert keywords into a timedelta, subtract that from utcnow, and
658
17
        # return seconds since epoch.
659
18
        timetup = (self.now - timedelta(**kws)).timetuple()
660
19
        return time.mktime(timetup)
661
11
20
662
12
    def test_time_string_seconds (self):
21
    def test_time_string_seconds (self):
664
13
        ts = self.utils.generate_time_string (self.now - 59 * mx.DateTime.oneSecond)
22
        ts = self.utils.generate_time_string(self._ago(seconds=59))
665
14
        self.assertEqual (ts, 'a few seconds ago')
23
        self.assertEqual (ts, 'a few seconds ago')
666
15
24
667
16
    def test_time_string_minute (self):
25
    def test_time_string_minute (self):
669
17
        ts = self.utils.generate_time_string (self.now - 60 * mx.DateTime.oneSecond)
26
        ts = self.utils.generate_time_string(self._ago(seconds=60))
670
18
        self.assertEqual (ts, '1 minute ago')
27
        self.assertEqual (ts, '1 minute ago')
671
19
28
672
20
    def test_time_string_minutes (self):
29
    def test_time_string_minutes (self):
674
21
        ts = self.utils.generate_time_string (self.now - 3559 * mx.DateTime.oneSecond)
30
        ts = self.utils.generate_time_string(self._ago(seconds=3559))
675
22
        self.assertIn ('minutes ago', ts)
31
        self.assertIn ('minutes ago', ts)
676
23
32
677
24
    def test_time_string_hour (self):
33
    def test_time_string_hour (self):
679
25
        ts = self.utils.generate_time_string (self.now - 3601 * mx.DateTime.oneSecond)
34
        ts = self.utils.generate_time_string(self._ago(seconds=3601))
680
26
        self.assertEqual (ts, '1 hour ago')
35
        self.assertEqual (ts, '1 hour ago')
681
27
36
682
28
    def test_time_string_hours (self):
37
    def test_time_string_hours (self):
684
29
        ts = self.utils.generate_time_string (self.now - 7201 * mx.DateTime.oneSecond)
38
        ts = self.utils.generate_time_string(self._ago(seconds=7201))
685
30
        self.assertIn ('hours ago', ts)
39
        self.assertIn ('hours ago', ts)
686
31
40
687
32
    def test_time_string_day (self):
41
    def test_time_string_day (self):
689
33
        ts = self.utils.generate_time_string (self.now - 86400 * mx.DateTime.oneSecond)
42
        ts = self.utils.generate_time_string(self._ago(seconds=86400))
690
34
        self.assertEqual (ts, '1 day ago')
43
        self.assertEqual (ts, '1 day ago')
691
35
44
692
36
    def test_time_string_days (self):
45
    def test_time_string_days (self):
694
37
        ts = self.utils.generate_time_string (self.now - 2 * mx.DateTime.oneDay)
46
        ts = self.utils.generate_time_string(self._ago(days=2))
695
38
        self.assertIn ('days ago', ts)
47
        self.assertIn ('days ago', ts)
696
39
48
697
40
class AvatarPathTestCase (unittest.TestCase):
49
class AvatarPathTestCase (unittest.TestCase):
Reviewer	Review Type	Date Requested	Status
Ken VanDine		2012-04-27	Approve on 2012-05-22
Review via email: mp+103956@code.launchpad.net