Formatting cleanups

(Bitbake rev: 2caf134b43a44dad30af4fbe33033b3c58deee57)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

bitbake/bin/bitbake

@@ -23,7 +23,8 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import sys, os, getopt, re, time, optparse, xmlrpclib
-sys.path.insert(0,os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
+sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])),
+                                'lib'))
 
 import warnings
 import bb
@@ -40,6 +41,7 @@ if sys.hexversion < 0x020600F0:
     print "Sorry, python 2.6 or later is required for this version of bitbake"
     sys.exit(1)
 
+
 #============================================================================#
 # BBOptions
 #============================================================================#
@@ -47,6 +49,7 @@ class BBConfiguration( object ):
     """
     Manages build options and configurations for one run
     """
+
     def __init__(self, options):
         for key, val in options.__dict__.items():
             setattr(self, key, val)
@@ -90,7 +93,8 @@ def main():
         print "Sorry, bitbake needs python 2.5 or later."
         sys.exit(1)
 
-    parser = optparse.OptionParser( version = "BitBake Build Tool Core version %s, %%prog version %s" % ( bb.__version__, __version__ ),
+    parser = optparse.OptionParser(
+        version = "BitBake Build Tool Core version %s, %%prog version %s" % (bb.__version__, __version__),
         usage = """%prog [options] [package ...]
 
 Executes the specified task (default is 'build') for a given set of BitBake files.

bitbake/lib/bb/build.py

@@ -387,4 +387,3 @@ def remove_task(task, kill, d):
        If kill is 1, also remove tasks that depend on this task."""
 
     data.delVarFlag(task, 'task', d)
-

bitbake/lib/bb/command.py

@@ -268,6 +268,3 @@ class CookerCommandSetExitCode(bb.event.Event):
     def  __init__(self, exitcode):
         bb.event.Event.__init__(self)
         self.exitcode = int(exitcode)
-
-
-

bitbake/lib/bb/cooker.py

@@ -984,4 +984,3 @@ class CookerParser:
                 raise ParsingErrorsFound
             return False
         return True
-

bitbake/lib/bb/daemonize.py

@@ -188,4 +188,3 @@ def createDaemon(function, logfile):
     function()
 
     os._exit(0)
-

bitbake/lib/bb/data.py

@@ -267,7 +267,6 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
     o.write('%s="%s"\n' % (varExpanded, alter))
     return 1
 
-
 def emit_env(o=sys.__stdout__, d = init(), all=False):
     """Emits all items in the data store in a format such that it can be sourced by a shell."""
 

bitbake/lib/bb/data_smart.py

@@ -31,7 +31,7 @@ BitBake build tools.
 import copy, os, re, sys, time, types
 import bb
 from bb   import utils, methodpool
-from COW  import COWDictBase
+from bb.COW  import COWDictBase
 from new  import classobj
 
 
@@ -349,5 +349,3 @@ class DataSmart:
     def __setitem__(self, var, data):
         #print "Warning deprecated"
         self.setVar(var, data)
-
-

bitbake/lib/bb/event.py

@@ -297,4 +297,3 @@ class DepTreeGenerated(Event):
     def __init__(self, depgraph):
         Event.__init__(self)
         self._depgraph = depgraph
-

bitbake/lib/bb/fetch/bzr.py

@@ -145,4 +145,3 @@ class Bzr(Fetch):
 
     def _build_revision(self, url, ud, d):
         return ud.revision
-

bitbake/lib/bb/fetch/git.py

@@ -214,4 +214,3 @@ class Git(Fetch):
         buildindex = "%s" % output.split()[0]
         bb.msg.debug(1, bb.msg.domain.Fetcher, "GIT repository for %s in %s is returning %s revisions in rev-list before %s" % (url, ud.clonedir, buildindex, rev))
         return buildindex
-

bitbake/lib/bb/fetch/hg.py

@@ -170,4 +170,3 @@ class Hg(Fetch):
         Return a unique key for the url
         """
         return "hg:" + ud.moddir
-

bitbake/lib/bb/fetch/perforce.py

@@ -205,5 +205,3 @@ class Perforce(Fetch):
             raise FetchError(module)
         # cleanup
         os.system('rm -rf %s' % tmpfile)
-
-

bitbake/lib/bb/persist_data.py

@@ -116,6 +116,3 @@ class PersistData:
                 if 'database is locked' in str(e):
                     continue
                 raise
-        
-        
-

bitbake/lib/bb/runqueue.py

@@ -1196,4 +1196,3 @@ class runQueuePipe():
         if len(self.queue) > 0:
             print "Warning, worker left partial message"
         os.close(self.fd)
-

bitbake/lib/bb/server/none.py

@@ -178,4 +178,3 @@ class BitBakeServerConnection():
             self.connection.terminateServer()
         except:
             pass
-

bitbake/lib/bb/server/xmlrpc.py

@@ -184,4 +184,3 @@ class BitBakeServerConnection():
             self.connection.terminateServer()
         except:
             pass
-

bitbake/lib/bb/taskdata.py

@@ -606,5 +606,3 @@ class TaskData:
         bb.msg.debug(3, bb.msg.domain.TaskData, "runtime dependency ids (per fn):")
         for fnid in self.rdepids:
             bb.msg.debug(3, bb.msg.domain.TaskData, " %s %s: %s" % (fnid, self.fn_index[fnid], self.rdepids[fnid]))
-
-

bitbake/lib/bb/ui/__init__.py

@@ -15,4 +15,3 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-

bitbake/lib/bb/ui/crumbs/__init__.py

@@ -15,4 +15,3 @@
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-

bitbake/lib/bb/ui/crumbs/buildmanager.py

@@ -454,4 +454,3 @@ class BuildManagerTreeView (gtk.TreeView):
         self.append_column (col)
         col.set_cell_data_func (renderer,
             self.state_format_custom_cell_data_fun)
-

bitbake/lib/bb/ui/crumbs/runningbuild.py

@@ -176,5 +176,3 @@ class RunningBuildTreeView (gtk.TreeView):
         renderer = gtk.CellRendererText ()
         col = gtk.TreeViewColumn ("Message", renderer, text=3)
         self.append_column (col)
-
-

bitbake/lib/bb/ui/depexp.py

@@ -269,4 +269,3 @@ def init(server, eventHandler):
                 server.runCommand(["stateShutdown"])
             shutdown = shutdown + 1
             pass
-

bitbake/lib/bb/ui/goggle.py

@@ -74,4 +74,3 @@ def init (server, eventHandler):
                          running_build)
 
     gtk.main()
-

bitbake/lib/bb/ui/ncurses.py

@@ -332,4 +332,3 @@ def init(server, eventHandler):
     except:
         import traceback
         traceback.print_exc()
-

bitbake/lib/bb/ui/uievent.py

@@ -122,4 +122,3 @@ class UIXMLRPCServer (SimpleXMLRPCServer):
             return
         SimpleXMLRPCServer.process_request(self, request, client_address)
 
-

bitbake/lib/bb/utils.py

@@ -19,11 +19,12 @@ BitBake Utility Functions
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-separators = ".-"
-
 import re, fcntl, os, types, bb, string, stat, shutil, time
 from commands import getstatusoutput
 
+# Version comparison
+separators = ".-"
+
 # Context used in better_exec, eval
 _context = {
     "os": os,
@@ -175,15 +176,15 @@ def vercmp_string(val1,val2):
     # replace '-' by '.'
     # FIXME: Is it needed? can val1/2 contain '-'?
 
-    val1 = string.split(val1,'-')
+    val1 = val1.split("-")
     if len(val1) == 2:
         val1[0] = val1[0] + "." + val1[1]
-    val2 = string.split(val2,'-')
+    val2 = val2.split("-")
     if len(val2) == 2:
         val2[0] = val2[0] + "." + val2[1]
 
-    val1 = string.split(val1[0],'.')
-    val2 = string.split(val2[0],'.')
+    val1 = val1[0].split('.')
+    val2 = val2[0].split('.')
 
     # add back decimal point so that .03 does not become "3" !
     for x in range(1, len(val1)):