Merge lp:~mbp/ubuntu/maverick/hamster-applet/600857-imports into lp:ubuntu/maverick/hamster-applet

Proposed by Martin Pool on 2010-07-02
Status: Merged
Merge reported by: Chris Halse Rogers
Merged at revision: not available
Proposed branch: lp:~mbp/ubuntu/maverick/hamster-applet/600857-imports
Merge into: lp:ubuntu/maverick/hamster-applet
Diff against target: 117 lines (+19/-12)
8 files modified
debian/changelog (+7/-0)
src/hamster/widgets/activityentry.py (+3/-3)
src/hamster/widgets/dateinput.py (+1/-1)
src/hamster/widgets/dayline.py (+2/-2)
src/hamster/widgets/facttree.py (+2/-2)
src/hamster/widgets/tags.py (+2/-2)
src/hamster/widgets/timechart.py (+1/-1)
src/hamster/widgets/timeinput.py (+1/-1)
To merge this branch: bzr merge lp:~mbp/ubuntu/maverick/hamster-applet/600857-imports
Reviewer Review Type Date Requested Status
Ubuntu branches 2010-07-02 Pending
Review via email: mp+29046@code.launchpad.net

Description of the change

Fix "from .hamster import" statements causing massive failure with ImportError, fixes bug 600857 and friends.

To post a comment you must log in.
Chris Halse Rogers (raof) wrote :

Thanks for this.

The packaging currently uses a patch system, so I'll fold these changes into a patch and upload that.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-05-21 23:05:51 +0000
3+++ debian/changelog 2010-07-02 02:05:40 +0000
4@@ -1,3 +1,10 @@
5+hamster-applet (2.30.1-0ubuntu2) maverick; urgency=low
6+
7+ * Change strange "from .hamster import" statements occurring inside the
8+ hamster python module, causing ImportErrors. (LP: #600857)
9+
10+ -- Martin Pool <mbp@sourcefrog.net> Fri, 02 Jul 2010 11:48:09 +1000
11+
12 hamster-applet (2.30.1-0ubuntu1) maverick; urgency=low
13
14 * New upstream release. (LP: #580522)
15
16=== modified file 'src/hamster/widgets/activityentry.py'
17--- src/hamster/widgets/activityentry.py 2010-04-16 03:50:28 +0000
18+++ src/hamster/widgets/activityentry.py 2010-07-02 02:05:40 +0000
19@@ -20,10 +20,10 @@
20 import gtk, gobject
21 import datetime as dt
22
23-from .hamster.configuration import runtime
24+from hamster.configuration import runtime
25
26-from .hamster import stuff
27-from .hamster.stuff import format_duration
28+from hamster import stuff
29+from hamster.stuff import format_duration
30
31 class ActivityEntry(gtk.Entry):
32 __gsignals__ = {
33
34=== modified file 'src/hamster/widgets/dateinput.py'
35--- src/hamster/widgets/dateinput.py 2010-02-10 02:52:31 +0000
36+++ src/hamster/widgets/dateinput.py 2010-07-02 02:05:40 +0000
37@@ -17,7 +17,7 @@
38 # You should have received a copy of the GNU General Public License
39 # along with Project Hamster. If not, see <http://www.gnu.org/licenses/>.
40
41-from .hamster.stuff import format_duration
42+from hamster.stuff import format_duration
43 import gtk
44 import datetime as dt
45 import calendar
46
47=== modified file 'src/hamster/widgets/dayline.py'
48--- src/hamster/widgets/dayline.py 2010-02-10 02:52:31 +0000
49+++ src/hamster/widgets/dayline.py 2010-07-02 02:05:40 +0000
50@@ -20,8 +20,8 @@
51 import gtk
52 import gobject
53
54-from .hamster import stuff
55-from .hamster import graphics
56+from hamster import stuff
57+from hamster import graphics
58
59 import time
60 import datetime as dt
61
62=== modified file 'src/hamster/widgets/facttree.py'
63--- src/hamster/widgets/facttree.py 2010-05-14 14:28:07 +0000
64+++ src/hamster/widgets/facttree.py 2010-07-02 02:05:40 +0000
65@@ -20,8 +20,8 @@
66 import gtk, gobject
67 import datetime as dt
68
69-from .hamster import stuff
70-from .hamster.stuff import format_duration, format_activity
71+from hamster import stuff
72+from hamster.stuff import format_duration, format_activity
73 from tags import Tag
74
75 import pango
76
77=== modified file 'src/hamster/widgets/tags.py'
78--- src/hamster/widgets/tags.py 2010-02-10 02:52:31 +0000
79+++ src/hamster/widgets/tags.py 2010-07-02 02:05:40 +0000
80@@ -21,9 +21,9 @@
81 import pango, cairo
82 from math import pi
83
84-from .hamster import graphics
85+from hamster import graphics
86
87-from .hamster.configuration import runtime
88+from hamster.configuration import runtime
89
90 class TagsEntry(gtk.Entry):
91 __gsignals__ = {
92
93=== modified file 'src/hamster/widgets/timechart.py'
94--- src/hamster/widgets/timechart.py 2010-02-10 02:52:31 +0000
95+++ src/hamster/widgets/timechart.py 2010-07-02 02:05:40 +0000
96@@ -20,7 +20,7 @@
97 import os # for locale
98 import gtk, pango
99
100-from .hamster import graphics
101+from hamster import graphics
102
103 import time, datetime as dt
104 import calendar
105
106=== modified file 'src/hamster/widgets/timeinput.py'
107--- src/hamster/widgets/timeinput.py 2010-05-14 14:28:07 +0000
108+++ src/hamster/widgets/timeinput.py 2010-07-02 02:05:40 +0000
109@@ -17,7 +17,7 @@
110 # You should have received a copy of the GNU General Public License
111 # along with Project Hamster. If not, see <http://www.gnu.org/licenses/>.
112
113-from .hamster.stuff import format_duration
114+from hamster.stuff import format_duration
115 import gtk
116 import datetime as dt
117 import calendar

Subscribers

People subscribed via source and target branches

to all changes: