style fixups

buildbot · Nov 7, 2013 · 9cb8a1b · 9cb8a1b
1 parent 1a973f9
commit 9cb8a1b
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/common/validate.sh b/common/validate.sh
@@ -105,9 +105,10 @@ done < ${tempfile}
 echo "${MAGENTA}Validating the following commits:${NORM}"
 git log "$REVRANGE" --pretty=oneline || exit 1
 
-status "running 'setup.py develop' for www"
-(cd www; python setup.py develop 2>&1 >/dev/null) || not_ok "www/setup.py failed"
-
+if $slow; then
+    status "running 'setup.py develop' for www"
+    (cd www; python setup.py develop 2>&1 >/dev/null) || not_ok "www/setup.py failed"
+fi
 if $slow; then
     status "running tests"
     run_tests || not_ok "tests failed"

diff --git a/master/buildbot/data/buildsets.py b/master/buildbot/data/buildsets.py
@@ -16,7 +16,7 @@
 import copy
 
 from buildbot.data import base
-from buildbot.data import sourcestamps
+from buildbot.data import sourcestamps as sourcestampsapi
 from buildbot.data import types
 from buildbot.status.results import FAILURE
 from buildbot.status.results import SUCCESS
@@ -118,7 +118,7 @@ class EntityType(types.Entity):
         complete_at = types.NoneOk(types.Integer())
         results = types.NoneOk(types.Integer())
         sourcestamps = types.List(
-            of=sourcestamps.SourceStamp.entityType)
+            of=sourcestampsapi.SourceStamp.entityType)
         link = types.Link()
     entityType = EntityType(name)
 

diff --git a/master/buildbot/status/build.py b/master/buildbot/status/build.py
@@ -16,8 +16,8 @@
 from __future__ import with_statement
 
 import os
-import shutil
 import re
+import shutil
 
 from buildbot import interfaces
 from buildbot import util

diff --git a/master/buildbot/status/builder.py b/master/buildbot/status/builder.py
@@ -16,9 +16,9 @@
 from __future__ import with_statement
 
 
+import itertools
 import os
 import re
-import itertools
 
 from buildbot import interfaces
 from buildbot import util

diff --git a/master/buildbot/status/tinderbox.py b/master/buildbot/status/tinderbox.py
@@ -29,11 +29,11 @@
 from buildbot.status.results import WARNINGS
 from buildbot.steps.shell import WithProperties
 
-import gzip
-import bz2
 import base64
-import re
+import bz2
 import cStringIO
+import gzip
+import re
 
 # TODO: docs, maybe a test of some sort just to make sure it actually imports
 # and can format email without raising an exception.

diff --git a/master/buildbot/status/words.py b/master/buildbot/status/words.py
@@ -13,9 +13,9 @@
 #
 # Copyright Buildbot Team Members
 
+import random
 import re
 import shlex
-import random
 
 from string import capitalize
 from string import join

diff --git a/master/buildbot/util/__init__.py b/master/buildbot/util/__init__.py
@@ -16,9 +16,9 @@
 
 import calendar
 import datetime
-import time
 import re
 import string
+import time
 import types
 
 from twisted.python import reflect

diff --git a/slave/contrib/windows/buildbot_service.py b/slave/contrib/windows/buildbot_service.py
@@ -436,8 +436,8 @@ def RegisterWithFirewall(exe_name, description):
     #/library/en-us/ics/ics/wf_adding_an_application.asp
     from win32com.client import Dispatch
     #  Set constants
-    NET_FW_PROFILE_DOMAIN = 0
-    NET_FW_PROFILE_STANDARD = 1
+    #NET_FW_PROFILE_DOMAIN = 0
+    #NET_FW_PROFILE_STANDARD = 1
 
     # Scope
     NET_FW_SCOPE_ALL = 0