Ubuntu One Control Panel

Merge lp:~thisfred/ubuntuone-control-panel/escape-W0511 into lp:ubuntuone-control-panel

  1. escape-W0511
  2. Merge into trunk
Proposed by Eric Casteleijn
Status: Merged
Approved by: Eric Casteleijn
Approved revision: 95
Merged at revision: 95
Proposed branch: lp:~thisfred/ubuntuone-control-panel/escape-W0511
Merge into: lp:ubuntuone-control-panel
Diff against target: 22 lines (+1/-2)
2 files modified
pylintrc (+1/-1)
ubuntuone/__init__.py (+0/-1)
To merge this branch: bzr merge lp:~thisfred/ubuntuone-control-panel/escape-W0511
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
dobey (community) Approve
Review via email: mp+52759@code.launchpad.net

Commit message

This escapes pylint warning W0511, so that XXX and TODO comments are not blocking branches

Description of the change

This escapes pylint warning W0511, so that XXX and TODO comments are not blocking branches

To post a comment you must log in.
Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pylintrc'
2--- pylintrc 2011-01-06 19:47:25 +0000
3+++ pylintrc 2011-03-09 20:27:12 +0000
4@@ -49,7 +49,7 @@
5 # Disable the message(s) with the given id(s) or categories
6 # W0142: Used * or ** magic
7 # W0613: Unused argument 'yyy'
8-disable=R,I,W0142,W0613
9+disable=R,I,W0142,W0613,W0511
10
11
12 [REPORTS]
13
14=== modified file 'ubuntuone/__init__.py'
15--- ubuntuone/__init__.py 2010-09-15 21:43:48 +0000
16+++ ubuntuone/__init__.py 2011-03-09 20:27:12 +0000
17@@ -17,5 +17,4 @@
18 # with this program. If not, see <http://www.gnu.org/licenses/>.
19
20 """Ubuntuone package."""
21-
22 __import__('pkg_resources').declare_namespace(__name__)

Subscribers

People subscribed via source and target branches