Virtualbricks

Merge lp:~virtualbricks/virtualbrick/fix-1169602 into lp:virtualbrick/0.x

  1. fix-1169602
  2. Merge into 0.x
Proposed by Marco Giusti
Status: Merged
Merged at revision: 432
Proposed branch: lp:~virtualbricks/virtualbrick/fix-1169602
Merge into: lp:virtualbrick/0.x
Diff against target: 29 lines (+5/-1)
1 file modified
virtualbricks/gui/graphics.py (+5/-1)
To merge this branch: bzr merge lp:~virtualbricks/virtualbrick/fix-1169602
Reviewer Review Type Date Requested Status
Virtualbricks Pending
Review via email: mp+159184@code.launchpad.net
To post a comment you must log in.
lp:~virtualbricks/virtualbrick/fix-1169602 updated
433. By Marco Giusti

Rename the logger

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'virtualbricks/gui/graphics.py'
2--- virtualbricks/gui/graphics.py 2011-10-18 20:11:47 +0000
3+++ virtualbricks/gui/graphics.py 2013-04-19 08:38:26 +0000
4@@ -16,6 +16,8 @@
5 ## along with this program; if not, write to the Free Software
6 ## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
7
8+import logging
9+
10 import Image
11 import ImageEnhance
12 import os
13@@ -24,6 +26,8 @@
14
15 from virtualbricks.settings import MYPATH
16
17+log = logging.getLogger('virtualbricks.gui')
18+
19 def ImgPrefix():
20 if os.access("/usr/share/pixmaps/Switch.png", os.R_OK):
21 return "/usr/share/pixmaps/"
22@@ -70,7 +74,7 @@
23 bri = ImageEnhance.Brightness(src)
24 bri.enhance(2.0).save(self.grey, transparency = 0)
25 except:
26- self.debug("Cannot create grey image: defaulting to base")
27+ log.debug("Cannot create grey image: defaulting to base")
28 self.grey = self.base
29 self.ready = True
30

Subscribers

People subscribed via source and target branches