Merge lp:~samuel-buffet/entertainer/bug_363066 into lp:entertainer

[Samuel Buffet]

Fixed an indentation in weather code to compensate for situations where location is not specified (fixes bug #363066)

[Samuel Buffet (samuel-buffet)]

Hi,

A fix for Bug #363066.

It turned out that the code was already taking care of the case where no location is specified for weather forecasts.

But, because of an indentation error, we were still trying to display forecasts day per day even if the test *location == ''* was True.

Samuel-

[Jamie Bennett (jamiebennett)]

Surprised this bug wasn't reported sooner. Fix is good.

 review approve

On Tue, 2009-04-21 at 16:25 +0000, Samuel Buffet wrote:
> Samuel Buffet has proposed merging lp:~samuel-buffet/entertainer/bug_363066 into lp:entertainer.
>
> Requested reviews:
> Entertainer Release Team (entertainer-releases)
>
> Hi,
>
> A fix for Bug #363066.
>
> It turned out that the code was already taking care of the case where no location is specified for weather forecasts.
>
> But, because of an indentation error, we were still trying to display forecasts day per day even if the test *location == ''* was True.
>
> Samuel-

review: Approve

[Matt Layman (mblayman)]

I concur with Jamie. The fix seems appropriate, and I trust that you've verified that it works as advertised.

Thanks, Samuel.

review: Approve

=== modified file 'entertainerlib/frontend/gui/screens/weather.py'
--- entertainerlib/frontend/gui/screens/weather.py	2009-04-03 22:14:37 +0000
+++ entertainerlib/frontend/gui/screens/weather.py	2009-04-21 15:14:40 +0000
@@ -27,29 +27,29 @@
         screen_title = Label(0.13, "screentitle", 0, 0.87, _("Weather"))
         self.add(screen_title)
 
-        # Show the location
         if (self.weather.get_location() == ''):
-            location_text = _("No weather location defined!")
+            self.add(Label(0.04167, "text", 0.30, 0.20,
+                _("No weather location defined!"), font_weight="bold"))
         else:
             location_text = self.weather.get_location()
 
-        location = Label(0.04167, "text", 0.40, 0.13, location_text,
-            font_weight="bold")
-        self.add(location)
-
-        forecasts = self.weather.get_forecasts()
-
-        # Show today's weather
-        self.create_day(forecasts[0], 0.1, 0.15)
-
-        # Show tomorrow's weather
-        self.create_day(forecasts[1], 0.1, 0.5)
-
-        # Show day 3
-        self.create_day(forecasts[2], 0.4, 0.5)
-
-        # Show day 4
-        self.create_day(forecasts[3], 0.7, 0.5)
+            location = Label(0.04167, "text", 0.40, 0.13, location_text,
+                font_weight="bold")
+            self.add(location)
+
+            forecasts = self.weather.get_forecasts()
+
+            # Show today's weather
+            self.create_day(forecasts[0], 0.1, 0.15)
+
+            # Show tomorrow's weather
+            self.create_day(forecasts[1], 0.1, 0.5)
+
+            # Show day 3
+            self.create_day(forecasts[2], 0.4, 0.5)
+
+            # Show day 4
+            self.create_day(forecasts[3], 0.7, 0.5)
 
     def create_day(self, day, x, y):
         """Create the Texture and labels for one day"""