Merge lp:~elopio/ubuntu-calculator-app/fix1210019-pep8 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

Proposed by Leo Arias
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 126
Merged at revision: 128
Proposed branch: lp:~elopio/ubuntu-calculator-app/fix1210019-pep8
Merge into: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target: 28 lines (+8/-2)
1 file modified
images/generate.py (+8/-2)
To merge this branch: bzr merge lp:~elopio/ubuntu-calculator-app/fix1210019-pep8
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Gustavo Pichorim Boiko (community) Approve
Mihir Soni Approve
Riccardo Padovani Approve
Review via email: mp+179115@code.launchpad.net

Commit message

Fixed the pep8 errors.

To post a comment you must log in.
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Hi ,

Line no 8 & 26 are unnecessary for this MR as it just do the indentation.

Could you please resubmit this MR

Thanks for fix !!

review: Needs Fixing
Revision history for this message
Leo Arias (elopio) wrote :

Hi Mihir,

According to pep8, we should "Separate top-level function and class definitions with two blank lines."
http://www.python.org/dev/peps/pep-0008/#blank-lines

That's the reason for those two lines.

Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Thanks Leo, looks good to me!

review: Approve
Revision history for this message
Mihir Soni (mihirsoni) wrote :

> Hi Mihir,
>
> According to pep8, we should "Separate top-level function and class
> definitions with two blank lines."
> http://www.python.org/dev/peps/pep-0008/#blank-lines
>
> That's the reason for those two lines.

Okay understood :)

review: Approve
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good. Thanks for the changes!

review: Approve
Revision history for this message
Leo Arias (elopio) wrote :

Thanks for the reviews :)
Can you please mark the branch globally approved so it lands? I can't do it.
After it's on trunk, I'll ask fginther to enable the pep8 and pyflakes check on the landing bot.

Revision history for this message
Leo Arias (elopio) wrote :

oh, boiko just did it. Thanks!

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'images/generate.py'
2--- images/generate.py 2013-07-18 20:19:42 +0000
3+++ images/generate.py 2013-08-08 07:27:25 +0000
4@@ -3,16 +3,22 @@
5 import subprocess
6 import os
7
8+
9 def main():
10 for idx in range(8, 19):
11 output_name = os.path.join('../Simple/images', 'edit@%d.png' % idx)
12- command = ['inkscape', '-f', 'edit.svg', '-e', output_name, '-w', str(idx*2)]
13+ command = [
14+ 'inkscape', '-f', 'edit.svg', '-e', output_name, '-w', str(idx*2)
15+ ]
16 subprocess.call(command)
17
18 for idx in range(8, 19):
19 output_name = os.path.join('../Simple/images', 'dot@%d.png' % idx)
20- command = ['inkscape', '-f', 'dot.svg', '-e', output_name, '-w', str(idx)]
21+ command = [
22+ 'inkscape', '-f', 'dot.svg', '-e', output_name, '-w', str(idx)
23+ ]
24 subprocess.call(command)
25
26+
27 if __name__ == '__main__':
28 main()

Subscribers

People subscribed via source and target branches