Merge branch 'master' into nine

varunsharma · Apr 3, 2014 · bea0c26 · bea0c26
2 parents db0f7d1 + d89c85e
commit bea0c26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -91,7 +91,7 @@ install:
   - "[ $IS_LATEST = false ] || pip install pylint"
   - "[ $IS_LATEST = false ] || pip install pyflakes"
   - "[ $IS_LATEST = false ] || pip install sphinx"
-  - "[ $IS_LATEST = false ] || pip install pep8"
+  - "[ $IS_LATEST = false ] || pip install pep8==1.4.6"
 
 # Tests running commands
 script:

diff --git a/master/buildbot/steps/source/p4.py b/master/buildbot/steps/source/p4.py
@@ -14,7 +14,6 @@
 # Copyright Buildbot Team Members
 # Portions Copyright 2013 Bad Dog Consulting
 
-import os
 import re
 
 from buildbot import config
@@ -272,7 +271,9 @@ def _createClientSpec(self):
         client_spec += "Client: %s\n\n" % self.p4client
         client_spec += "Owner: %s\n\n" % self.p4user
         client_spec += "Description:\n\tCreated by %s\n\n" % self.p4user
-        client_spec += "Root:\t%s\n\n" % os.path.normpath(self.build.path_module.join(builddir, self.workdir))
+        client_spec += "Root:\t%s\n\n" % self.build.path_module.normpath(
+            self.build.path_module.join(builddir, self.workdir)
+        )
         client_spec += "Options:\t%s\n\n" % self.p4client_spec_options
         if self.p4line_end:
             client_spec += "LineEnd:\t%s\n\n" % self.p4line_end