general: move binary operators to previous line
    
    pep8 now wants binary operators on the line before.
    Previously it didn't matter, but this patch moves the binary
    operators up in two places to match with the new requirements.
    
    Fixes: #212
    Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
    Reviewed-by: Rob Crittenden <rcritten@redhat.com>