Merge lp:~muktupavels/compiz/compizconfig-remove-tabs into lp:compiz/0.9.13

Proposed by Alberts Muktupāvels
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 4161
Merged at revision: 4164
Proposed branch: lp:~muktupavels/compiz/compizconfig-remove-tabs
Merge into: lp:compiz/0.9.13
Diff against target: 48 lines (+12/-13)
1 file modified
compizconfig/compizconfig-python/setup.py (+12/-13)
To merge this branch: bzr merge lp:~muktupavels/compiz/compizconfig-remove-tabs
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Dmitry Shachnev Approve
Review via email: mp+349662@code.launchpad.net

Commit message

compizconfig: remove tabs.

Description of the change

Remove tabs.

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

There are also tabs in other files, but that can be fixed later.

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/compizconfig-python/setup.py'
2--- compizconfig/compizconfig-python/setup.py 2012-10-16 13:53:20 +0000
3+++ compizconfig/compizconfig-python/setup.py 2018-07-16 23:26:27 +0000
4@@ -123,19 +123,19 @@
5 user_options = []
6
7 def initialize_options (self):
8- self.cwd = None
9+ self.cwd = None
10
11 def finalize_options (self):
12- self.cwd = os.getcwd ()
13+ self.cwd = os.getcwd ()
14
15 def run (self):
16- assert os.getcwd () == self.cwd, 'Must be in package root: %s' % self.cwd
17- loader = unittest.TestLoader ()
18-
19- tests = loader.discover (os.getcwd (), pattern='test*')
20- result = unittest.TestResult ()
21-
22- unittest.TextTestRunner (verbosity=2).run (tests)
23+ assert os.getcwd () == self.cwd, 'Must be in package root: %s' % self.cwd
24+ loader = unittest.TestLoader ()
25+
26+ tests = loader.discover (os.getcwd (), pattern='test*')
27+ result = unittest.TestResult ()
28+
29+ unittest.TextTestRunner (verbosity=2).run (tests)
30
31
32 setup (
33@@ -144,12 +144,11 @@
34 description = "CompizConfig Python",
35 url = "https://launchpad.net/compiz",
36 license = "GPL",
37- maintainer = "Guillaume Seguin",
38+ maintainer = "Guillaume Seguin",
39 maintainer_email = "guillaume@segu.in",
40 cmdclass = {"uninstall" : uninstall,
41 "install" : install,
42 "install_data" : install_data,
43- "build" : build,
44- "test" : test}
45+ "build" : build,
46+ "test" : test}
47 )
48-

Subscribers

People subscribed via source and target branches