summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-06-20 12:07:34 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:37 +0100
commitecbd5ca720ce28284280dc60013b3f60e9dd934f (patch)
tree00759b5193c3aeea2f7213a8df8596f23ad1cbc5 /bitbake/lib
parentef1de9ecaf73e28234d284b79ec45e084d0f0c53 (diff)
downloadpoky-ecbd5ca720ce28284280dc60013b3f60e9dd934f.tar.gz
3.0 prep
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/fetch/__init__.py25
-rw-r--r--bitbake/lib/bb/fetch/perforce.py1
-rw-r--r--bitbake/lib/bb/parse/ast.py2
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py9
-rw-r--r--bitbake/lib/bb/parse/parse_py/__init__.py8
-rw-r--r--bitbake/lib/bb/ui/ncurses.py8
6 files changed, 31 insertions, 22 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index 651fea8873..31b9653793 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -24,6 +24,7 @@ BitBake build tools.
24# 24#
25# Based on functions from the base bb module, Copyright 2003 Holger Schurig 25# Based on functions from the base bb module, Copyright 2003 Holger Schurig
26 26
27from __future__ import absolute_import
27from __future__ import print_function 28from __future__ import print_function
28import os, re 29import os, re
29import bb 30import bb
@@ -727,18 +728,18 @@ class Fetch(object):
727 key = self._revision_key(url, ud, d) 728 key = self._revision_key(url, ud, d)
728 return "%s-%s" % (key, bb.data.getVar("PN", d, True) or "") 729 return "%s-%s" % (key, bb.data.getVar("PN", d, True) or "")
729 730
730import cvs 731from . import cvs
731import git 732from . import git
732import local 733from . import local
733import svn 734from . import svn
734import wget 735from . import wget
735import svk 736from . import svk
736import ssh 737from . import ssh
737import perforce 738from . import perforce
738import bzr 739from . import bzr
739import hg 740from . import hg
740import osc 741from . import osc
741import repo 742from . import repo
742 743
743methods.append(local.Local()) 744methods.append(local.Local())
744methods.append(wget.Wget()) 745methods.append(wget.Wget())
diff --git a/bitbake/lib/bb/fetch/perforce.py b/bitbake/lib/bb/fetch/perforce.py
index 5b6c601876..1c74cff349 100644
--- a/bitbake/lib/bb/fetch/perforce.py
+++ b/bitbake/lib/bb/fetch/perforce.py
@@ -25,6 +25,7 @@ BitBake build tools.
25# 25#
26# Based on functions from the base bb module, Copyright 2003 Holger Schurig 26# Based on functions from the base bb module, Copyright 2003 Holger Schurig
27 27
28from future_builtins import zip
28import os 29import os
29import bb 30import bb
30from bb import data 31from bb import data
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index 02d682d88f..dae2e11154 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -21,6 +21,8 @@
21# with this program; if not, write to the Free Software Foundation, Inc., 21# with this program; if not, write to the Free Software Foundation, Inc.,
22# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 22# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
23 23
24from __future__ import absolute_import
25from future_builtins import filter
24import bb, re, string 26import bb, re, string
25from bb import methodpool 27from bb import methodpool
26import itertools 28import itertools
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 9708416a0a..bb56174881 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -25,12 +25,14 @@
25# with this program; if not, write to the Free Software Foundation, Inc., 25# with this program; if not, write to the Free Software Foundation, Inc.,
26# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 26# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
27 27
28from __future__ import absolute_import
28import re, bb, os 29import re, bb, os
29import bb.fetch, bb.build, bb.utils 30import bb.fetch, bb.build, bb.utils
30from bb import data 31from bb import data
31 32
32from ConfHandler import include, init 33from . import ConfHandler
33from bb.parse import resolve_file, ast 34from .. import resolve_file, ast
35from .ConfHandler import include, init
34 36
35# For compatibility 37# For compatibility
36bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"]) 38bb.deprecate_import(__name__, "bb.parse", ["vars_from_file"])
@@ -231,10 +233,9 @@ def feeder(lineno, s, fn, root, statements):
231 ast.handleInherit(statements, m) 233 ast.handleInherit(statements, m)
232 return 234 return
233 235
234 from bb.parse import ConfHandler
235 return ConfHandler.feeder(lineno, s, fn, statements) 236 return ConfHandler.feeder(lineno, s, fn, statements)
236 237
237# Add us to the handlers list 238# Add us to the handlers list
238from bb.parse import handlers 239from .. import handlers
239handlers.append({'supports': supports, 'handle': handle, 'init': init}) 240handlers.append({'supports': supports, 'handle': handle, 'init': init})
240del handlers 241del handlers
diff --git a/bitbake/lib/bb/parse/parse_py/__init__.py b/bitbake/lib/bb/parse/parse_py/__init__.py
index a900101784..3e658d0de9 100644
--- a/bitbake/lib/bb/parse/parse_py/__init__.py
+++ b/bitbake/lib/bb/parse/parse_py/__init__.py
@@ -25,7 +25,9 @@ File parsers for the BitBake build tools.
25# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 25# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
26# 26#
27# Based on functions from the base bb module, Copyright 2003 Holger Schurig 27# Based on functions from the base bb module, Copyright 2003 Holger Schurig
28__version__ = '1.0'
29 28
30import ConfHandler 29from __future__ import absolute_import
31import BBHandler 30from . import ConfHandler
31from . import BBHandler
32
33__version__ = '1.0'
diff --git a/bitbake/lib/bb/ui/ncurses.py b/bitbake/lib/bb/ui/ncurses.py
index 81dcb1998c..3fed4c58a8 100644
--- a/bitbake/lib/bb/ui/ncurses.py
+++ b/bitbake/lib/bb/ui/ncurses.py
@@ -44,6 +44,8 @@
44 44
45""" 45"""
46 46
47from __future__ import division
48
47import os, sys, curses, itertools, time 49import os, sys, curses, itertools, time
48import bb 50import bb
49import xmlrpclib 51import xmlrpclib
@@ -199,8 +201,8 @@ class NCursesUI:
199 201
200 main_left = 0 202 main_left = 0
201 main_top = 0 203 main_top = 0
202 main_height = ( height / 3 * 2 ) 204 main_height = ( height // 3 * 2 )
203 main_width = ( width / 3 ) * 2 205 main_width = ( width // 3 ) * 2
204 clo_left = main_left 206 clo_left = main_left
205 clo_top = main_top + main_height 207 clo_top = main_top + main_height
206 clo_height = height - main_height - main_top - 1 208 clo_height = height - main_height - main_top - 1
@@ -266,7 +268,7 @@ class NCursesUI:
266 mw.appendText("Parsing finished. %d cached, %d parsed, %d skipped, %d masked." 268 mw.appendText("Parsing finished. %d cached, %d parsed, %d skipped, %d masked."
267 % ( event.cached, event.parsed, event.skipped, event.masked )) 269 % ( event.cached, event.parsed, event.skipped, event.masked ))
268 else: 270 else:
269 mw.setStatus("Parsing: %s (%04d/%04d) [%2d %%]" % ( next(parsespin), x, y, x*100/y ) ) 271 mw.setStatus("Parsing: %s (%04d/%04d) [%2d %%]" % ( next(parsespin), x, y, x*100//y ) )
270# if isinstance(event, bb.build.TaskFailed): 272# if isinstance(event, bb.build.TaskFailed):
271# if event.logfile: 273# if event.logfile:
272# if data.getVar("BBINCLUDELOGS", d): 274# if data.getVar("BBINCLUDELOGS", d):