Merge pull request #115 from robotpy/black

Format code with black

Author: virtuald

.travis.yml

@@ -21,6 +21,16 @@ install:
 script:
   - tests/run_tests.sh
 
+jobs:
+  include:
+  - stage: format-check
+    python:
+    - "3.6"
+    install:
+    - pip install black
+    script:
+    - black --check --diff .
+
 deploy:
 - provider: pypi
   user: $PYPI_USERNAME

commandbased/cancelcommand.py

@@ -10,31 +10,28 @@ def checkIfCanceled(self):
 
 
 class CancelCommand(Command):
-    '''
+    """
     When this command is run, it cancels the command it was passed, even if that
     command is part of a :class:`wpilib.CommandGroup`.
-    '''
-
+    """
 
     def __init__(self, command):
-        '''
+        """
             :param command: The :class:`wpilib.Command` to cancel.
-        '''
-        super().__init__('Cancel %s' % command)
+        """
+        super().__init__("Cancel %s" % command)
 
         self.command = command
-        if hasattr(self.command, '_isFinished'):
+        if hasattr(self.command, "_isFinished"):
             return
 
         self.command._isFinished = self.command.isFinished
         self.command.isFinished = checkIfCanceled.__get__(self.command)
         self.command.forceCancel = False
 
-
     def initialize(self):
         if self.command.isRunning():
             self.command.forceCancel = True
 
-
     def isFinished(self):
         return not self.command.isRunning()

commandbased/commandbasedrobot.py

@@ -3,10 +3,10 @@
 
 
 class CommandBasedRobot(TimedRobot):
-    '''
+    """
     The base class for a Command-Based Robot. To use, instantiate commands and
     trigger them.
-    '''
+    """
 
     def startCompetition(self):
         """Initalizes the scheduler before starting robotInit()"""
@@ -15,18 +15,18 @@ def startCompetition(self):
         super().startCompetition()
 
     def commandPeriodic(self):
-        '''
+        """
         Run the scheduler regularly. If an error occurs during a competition,
         prevent it from crashing the program.
-        '''
+        """
 
         try:
             self.scheduler.run()
         except Exception as error:
             if not self.ds.isFMSAttached():
                 raise
 
-            '''Just to be safe, stop all running commands.'''
+            """Just to be safe, stop all running commands."""
             self.scheduler.removeAll()
 
             self.handleCrash(error)
@@ -37,10 +37,10 @@ def commandPeriodic(self):
     # testPeriodic deliberately omitted
 
     def handleCrash(self, error):
-        '''
+        """
         Called if an exception is raised in the Scheduler during a competition.
         Writes an error message to the driver station by default. If you want
         more complex behavior, override this method in your robot class.
-        '''
+        """
 
         self.ds.reportError(str(error), printTrace=True)

commandbased/conditionalcommand.py

@@ -1,34 +1,28 @@
 from wpilib.command.commandgroup import CommandGroup
 
-class ConditionalCommand(CommandGroup):
 
+class ConditionalCommand(CommandGroup):
     def __init__(self, name, onTrue=None, onFalse=None):
         super().__init__(name)
 
         self.onTrue = self._processCommand(onTrue)
         self.onFalse = self._processCommand(onFalse)
 
-
     def _processCommand(self, cmd):
         if cmd is None:
             return []
 
         with self.mutex:
             if self.locked:
-                raise ValueError('Cannot add conditions to ConditionalCommand')
+                raise ValueError("Cannot add conditions to ConditionalCommand")
 
             for reqt in cmd.getRequirements():
                 self.requires(reqt)
 
             cmd.setParent(self)
-            cmd = CommandGroup.Entry(
-                cmd,
-                CommandGroup.Entry.IN_SEQUENCE,
-                None
-            )
+            cmd = CommandGroup.Entry(cmd, CommandGroup.Entry.IN_SEQUENCE, None)
             return [cmd]
 
-
     def _initialize(self):
         super()._initialize()
 

commandbased/flowcontrol.py

@@ -9,7 +9,7 @@
 
 import inspect
 
-__all__ = ['IF', 'ELIF', 'ELSE', 'WHILE', 'RETURN', 'BREAK']
+__all__ = ["IF", "ELIF", "ELSE", "WHILE", "RETURN", "BREAK"]
 
 
 def _getCommandGroup():
@@ -20,19 +20,15 @@ def _getCommandGroup():
     # https://stackoverflow.com/a/14694234
     stack = inspect.stack()
     frame = stack[2].frame
-    while 'self' not in frame.f_locals:
+    while "self" not in frame.f_locals:
         frame = frame.f_back
         if frame is None:
-            raise ValueError(
-                'Could not find calling class for %s' %
-                stack[1].function
-            )
+            raise ValueError("Could not find calling class for %s" % stack[1].function)
 
-    cg = frame.f_locals['self']
+    cg = frame.f_locals["self"]
     if not isinstance(cg, CommandGroup):
         raise ValueError(
-            '%s may not be used outside of a CommandGroup' %
-            stack[1].function
+            "%s may not be used outside of a CommandGroup" % stack[1].function
         )
 
     return cg
@@ -88,13 +84,13 @@ def _popIfStack(cg):
         cmd = None
         for x in reversed(cg._ifStack):
             if x[0]:
-                cmd = ConditionalCommand('flowcontrolELIF', x[1], cmd)
+                cmd = ConditionalCommand("flowcontrolELIF", x[1], cmd)
                 cmd.condition = x[0]
 
             else:
                 cmd = x[1]
 
-        cmd = ConditionalCommand('flowcontrolIF', top[1], cmd)
+        cmd = ConditionalCommand("flowcontrolIF", top[1], cmd)
         cmd.condition = top[0]
 
         cg._addSequential(cmd)
@@ -182,7 +178,7 @@ def flowcontrolELIF(func):
         try:
             parent._ifStack.append((condition, cg))
         except AttributeError:
-            raise ValueError('Cannot use ELIF without IF')
+            raise ValueError("Cannot use ELIF without IF")
 
     return flowcontrolELIF
 
@@ -200,7 +196,7 @@ def ELSE(func):
     try:
         parent._ifStack.append((None, cg))
     except AttributeError:
-        raise ValueError('Cannot use ELSE without IF')
+        raise ValueError("Cannot use ELSE without IF")
 
     _popIfStack(parent)
 
@@ -232,10 +228,10 @@ def flowcontrolWHILE(func):
         def cancelLoop(self):
             self.getGroup().forceCancel = True
 
-        end = Command('END WHILE')
+        end = Command("END WHILE")
         end.initialize = cancelLoop.__get__(end)
 
-        cond = ConditionalCommand('flowcontrolWHILE', cg, end)
+        cond = ConditionalCommand("flowcontrolWHILE", cg, end)
         cond.condition = condition
         cond.forceCancel = False
         cond.isFinished = _restartWhile.__get__(cond)
@@ -266,18 +262,18 @@ def BREAK(steps=1):
     """
 
     if steps < 1:
-        raise ValueError('Steps to BREAK cannot be < 1')
+        raise ValueError("Steps to BREAK cannot be < 1")
 
     parent = _getCommandGroup()
     source = _getSource(parent)
 
     try:
         loop = source._currentLoop
     except AttributeError:
-        raise ValueError('Cannot BREAK outside of a loop')
+        raise ValueError("Cannot BREAK outside of a loop")
 
     if loop is None:
-        raise ValueError('Cannot BREAK outside of a loop')
+        raise ValueError("Cannot BREAK outside of a loop")
 
     # We can't use CancelCommand here, because the conditionalCommand attribute
     # isn't yet bound to the CommandGroup, so we find it at initialization time
@@ -290,14 +286,13 @@ def cancelLoop():
 
             if loop is None:
                 raise ValueError(
-                    'BREAK %i not possible with loop depth %i' %
-                    (steps, step)
+                    "BREAK %i not possible with loop depth %i" % (steps, step)
                 )
 
             step += 1
 
         loop.conditionalCommand.forceCancel = True
 
-    breakLoop = Command('flowcontrolBREAK')
+    breakLoop = Command("flowcontrolBREAK")
     breakLoop.initialize = cancelLoop
     parent.addSequential(breakLoop)