diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-12 16:53:22 +0100 |
---|---|---|
committer | Marcin Juszkiewicz <marcin@buglabs.net> | 2009-07-28 13:57:22 +0200 |
commit | d2c268aec84caa3034a4e6e177938afc4fe01f98 (patch) | |
tree | e532cebed4df49d0d8e533e3a5b7053b960a4120 /bitbake/lib | |
parent | f73dc1bf2aa9791cfd078f158d6ad3349107899c (diff) | |
download | poky-d2c268aec84caa3034a4e6e177938afc4fe01f98.tar.gz |
bitbake: Update to work without warnings with python 2.6
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/COW.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/cache.py | 3 | ||||
-rw-r--r-- | bitbake/lib/bb/cooker.py | 3 | ||||
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 5 | ||||
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 7 |
5 files changed, 9 insertions, 13 deletions
diff --git a/bitbake/lib/bb/COW.py b/bitbake/lib/bb/COW.py index e5063d60a8..5db41776ec 100644 --- a/bitbake/lib/bb/COW.py +++ b/bitbake/lib/bb/COW.py | |||
@@ -26,7 +26,7 @@ | |||
26 | from inspect import getmro | 26 | from inspect import getmro |
27 | 27 | ||
28 | import copy | 28 | import copy |
29 | import types, sets | 29 | import types |
30 | types.ImmutableTypes = tuple([ \ | 30 | types.ImmutableTypes = tuple([ \ |
31 | types.BooleanType, \ | 31 | types.BooleanType, \ |
32 | types.ComplexType, \ | 32 | types.ComplexType, \ |
@@ -35,7 +35,7 @@ types.ImmutableTypes = tuple([ \ | |||
35 | types.LongType, \ | 35 | types.LongType, \ |
36 | types.NoneType, \ | 36 | types.NoneType, \ |
37 | types.TupleType, \ | 37 | types.TupleType, \ |
38 | sets.ImmutableSet] + \ | 38 | frozenset] + \ |
39 | list(types.StringTypes)) | 39 | list(types.StringTypes)) |
40 | 40 | ||
41 | MUTABLE = "__mutable__" | 41 | MUTABLE = "__mutable__" |
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 7d7e66ebd2..82efada67d 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -31,7 +31,6 @@ | |||
31 | import os, re | 31 | import os, re |
32 | import bb.data | 32 | import bb.data |
33 | import bb.utils | 33 | import bb.utils |
34 | from sets import Set | ||
35 | 34 | ||
36 | try: | 35 | try: |
37 | import cPickle as pickle | 36 | import cPickle as pickle |
@@ -431,6 +430,6 @@ class CacheData: | |||
431 | (set elsewhere) | 430 | (set elsewhere) |
432 | """ | 431 | """ |
433 | self.ignored_dependencies = [] | 432 | self.ignored_dependencies = [] |
434 | self.world_target = Set() | 433 | self.world_target = set() |
435 | self.bbfile_priority = {} | 434 | self.bbfile_priority = {} |
436 | self.bbfile_config_priorities = [] | 435 | self.bbfile_config_priorities = [] |
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 2c091b6522..f7ce8258b6 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -25,7 +25,6 @@ | |||
25 | import sys, os, getopt, glob, copy, os.path, re, time | 25 | import sys, os, getopt, glob, copy, os.path, re, time |
26 | import bb | 26 | import bb |
27 | from bb import utils, data, parse, event, cache, providers, taskdata, runqueue | 27 | from bb import utils, data, parse, event, cache, providers, taskdata, runqueue |
28 | from sets import Set | ||
29 | import itertools, sre_constants | 28 | import itertools, sre_constants |
30 | 29 | ||
31 | parsespin = itertools.cycle( r'|/-\\' ) | 30 | parsespin = itertools.cycle( r'|/-\\' ) |
@@ -540,7 +539,7 @@ class BBCooker: | |||
540 | self.status = bb.cache.CacheData() | 539 | self.status = bb.cache.CacheData() |
541 | 540 | ||
542 | ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or "" | 541 | ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1) or "" |
543 | self.status.ignored_dependencies = Set( ignore.split() ) | 542 | self.status.ignored_dependencies = set( ignore.split() ) |
544 | 543 | ||
545 | self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) ) | 544 | self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) ) |
546 | 545 | ||
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index e879343f5d..8d48714720 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -32,7 +32,6 @@ import copy, os, re, sys, time, types | |||
32 | import bb | 32 | import bb |
33 | from bb import utils, methodpool | 33 | from bb import utils, methodpool |
34 | from COW import COWDictBase | 34 | from COW import COWDictBase |
35 | from sets import Set | ||
36 | from new import classobj | 35 | from new import classobj |
37 | 36 | ||
38 | 37 | ||
@@ -142,7 +141,7 @@ class DataSmart: | |||
142 | try: | 141 | try: |
143 | self._special_values[keyword].add( base ) | 142 | self._special_values[keyword].add( base ) |
144 | except: | 143 | except: |
145 | self._special_values[keyword] = Set() | 144 | self._special_values[keyword] = set() |
146 | self._special_values[keyword].add( base ) | 145 | self._special_values[keyword].add( base ) |
147 | 146 | ||
148 | return | 147 | return |
@@ -157,7 +156,7 @@ class DataSmart: | |||
157 | if '_' in var: | 156 | if '_' in var: |
158 | override = var[var.rfind('_')+1:] | 157 | override = var[var.rfind('_')+1:] |
159 | if not self._seen_overrides.has_key(override): | 158 | if not self._seen_overrides.has_key(override): |
160 | self._seen_overrides[override] = Set() | 159 | self._seen_overrides[override] = set() |
161 | self._seen_overrides[override].add( var ) | 160 | self._seen_overrides[override].add( var ) |
162 | 161 | ||
163 | # setting var | 162 | # setting var |
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 9d72d92fac..ffd28e15ab 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -23,7 +23,6 @@ Handles preparation and execution of a queue of tasks | |||
23 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | 23 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
24 | 24 | ||
25 | from bb import msg, data, event, mkdirhier, utils | 25 | from bb import msg, data, event, mkdirhier, utils |
26 | from sets import Set | ||
27 | import bb, os, sys | 26 | import bb, os, sys |
28 | import signal | 27 | import signal |
29 | 28 | ||
@@ -484,8 +483,8 @@ class RunQueue: | |||
484 | 483 | ||
485 | self.runq_fnid.append(taskData.tasks_fnid[task]) | 484 | self.runq_fnid.append(taskData.tasks_fnid[task]) |
486 | self.runq_task.append(taskData.tasks_name[task]) | 485 | self.runq_task.append(taskData.tasks_name[task]) |
487 | self.runq_depends.append(Set(depends)) | 486 | self.runq_depends.append(set(depends)) |
488 | self.runq_revdeps.append(Set()) | 487 | self.runq_revdeps.append(set()) |
489 | 488 | ||
490 | runq_build.append(0) | 489 | runq_build.append(0) |
491 | 490 | ||
@@ -579,7 +578,7 @@ class RunQueue: | |||
579 | if maps[origdep] == -1: | 578 | if maps[origdep] == -1: |
580 | bb.msg.fatal(bb.msg.domain.RunQueue, "Invalid mapping - Should never happen!") | 579 | bb.msg.fatal(bb.msg.domain.RunQueue, "Invalid mapping - Should never happen!") |
581 | newdeps.append(maps[origdep]) | 580 | newdeps.append(maps[origdep]) |
582 | self.runq_depends[listid] = Set(newdeps) | 581 | self.runq_depends[listid] = set(newdeps) |
583 | 582 | ||
584 | bb.msg.note(2, bb.msg.domain.RunQueue, "Assign Weightings") | 583 | bb.msg.note(2, bb.msg.domain.RunQueue, "Assign Weightings") |
585 | 584 | ||