Merge lp:~virtualbricks/virtualbrick/fix-1169602 into lp:virtualbrick/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.
433. By Marco Giusti

Rename the logger

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'virtualbricks/gui/graphics.py'
--- virtualbricks/gui/graphics.py 2011-10-18 20:11:47 +0000
+++ virtualbricks/gui/graphics.py 2013-04-19 08:38:26 +0000
@@ -16,6 +16,8 @@
16## along with this program; if not, write to the Free Software16## along with this program; if not, write to the Free Software
17## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.17## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
1818
19import logging
20
19import Image21import Image
20import ImageEnhance22import ImageEnhance
21import os23import os
@@ -24,6 +26,8 @@
2426
25from virtualbricks.settings import MYPATH27from virtualbricks.settings import MYPATH
2628
29log = logging.getLogger('virtualbricks.gui')
30
27def ImgPrefix():31def ImgPrefix():
28 if os.access("/usr/share/pixmaps/Switch.png", os.R_OK):32 if os.access("/usr/share/pixmaps/Switch.png", os.R_OK):
29 return "/usr/share/pixmaps/"33 return "/usr/share/pixmaps/"
@@ -70,7 +74,7 @@
70 bri = ImageEnhance.Brightness(src)74 bri = ImageEnhance.Brightness(src)
71 bri.enhance(2.0).save(self.grey, transparency = 0)75 bri.enhance(2.0).save(self.grey, transparency = 0)
72 except:76 except:
73 self.debug("Cannot create grey image: defaulting to base")77 log.debug("Cannot create grey image: defaulting to base")
74 self.grey = self.base78 self.grey = self.base
75 self.ready = True79 self.ready = True
7680

Subscribers

People subscribed via source and target branches