Merge lp:~soren/surveilr/pep8-fixes into lp:surveilr

Proposed by Soren Hansen
Status: Merged
Approved by: Soren Hansen
Approved revision: 2
Merged at revision: 2
Proposed branch: lp:~soren/surveilr/pep8-fixes
Merge into: lp:surveilr
Diff against target: 45 lines (+9/-9)
1 file modified
setup.py (+9/-9)
To merge this branch: bzr merge lp:~soren/surveilr/pep8-fixes
Reviewer Review Type Date Requested Status
Soren Hansen Pending
Review via email: mp+82369@code.launchpad.net

Commit message

Fix pep8 violations

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2011-11-15 23:03:15 +0000
3+++ setup.py 2011-11-16 09:21:25 +0000
4@@ -4,18 +4,19 @@
5 #
6 # Copyright (C) 2011 Linux2Go
7 #
8-# This program is free software: you can redistribute it and/or modify
9-# it under the terms of the GNU Affero General Public License as published by
10-# the Free Software Foundation, either version 3 of the License, or
11-# (at your option) any later version.
12+# This program is free software: you can redistribute it and/or
13+# modify it under the terms of the GNU Affero General Public License
14+# as published by the Free Software Foundation, either version 3 of
15+# the License, or (at your option) any later version.
16 #
17 # This program is distributed in the hope that it will be useful,
18 # but WITHOUT ANY WARRANTY; without even the implied warranty of
19 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 # GNU Affero General Public License for more details.
21 #
22-# You should have received a copy of the GNU Affero General Public License
23-# along with this program. If not, see <http://www.gnu.org/licenses/>.
24+# You should have received a copy of the GNU Affero General Public
25+# License along with this program. If not, see
26+# <http://www.gnu.org/licenses/>.
27 #
28 from setuptools import setup
29
30@@ -29,8 +30,8 @@
31 url='http://surveilr.org/',
32 packages=['surveilr'],
33 install_requires=['riakalchemy'],
34- test_suite = 'nose.collector',
35- classifiers = [
36+ test_suite='nose.collector',
37+ classifiers=[
38 'Development Status :: 2 - Pre-Alpha',
39 'Environment :: Console',
40 'Environment :: No Input/Output (Daemon)',
41@@ -45,4 +46,3 @@
42 'Topic :: System :: Networking :: Monitoring',
43 ]
44 )
45-

Subscribers

People subscribed via source and target branches

to all changes: