Signed-off-by: Marcin Juszkiewicz <[email protected]>
---
trunk/bitbake/lib/bb/COW.py | 8 ++++----
trunk/bitbake/lib/bb/cache.py | 3 +--
trunk/bitbake/lib/bb/cooker.py | 5 ++---
trunk/bitbake/lib/bb/data_smart.py | 5 ++---
trunk/bitbake/lib/bb/runqueue.py | 7 +++----
5 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/trunk/bitbake/lib/bb/COW.py b/trunk/bitbake/lib/bb/COW.py
index e5063d6..a3b34ba 100644
--- a/trunk/bitbake/lib/bb/COW.py
+++ b/trunk/bitbake/lib/bb/COW.py
@@ -26,7 +26,7 @@
from inspect import getmro
import copy
-import types, sets
+import types
types.ImmutableTypes = tuple([ \
types.BooleanType, \
types.ComplexType, \
@@ -35,7 +35,7 @@ types.ImmutableTypes = tuple([ \
types.LongType, \
types.NoneType, \
types.TupleType, \
- sets.ImmutableSet] + \
+ frozenset] + \
list(types.StringTypes))
MUTABLE = "__mutable__"
@@ -183,10 +183,10 @@ class COWSetMeta(COWDictMeta):
return COWDictMeta.has_key(repr(hash(value)))
def iterkeys(cls):
- raise TypeError("sets don't have keys")
+ raise TypeError("set don't have keys")
def iteritems(cls):
- raise TypeError("sets don't have 'items'")
+ raise TypeError("set don't have 'items'")
# These are the actual classes you use!
class COWDictBase(object):
diff --git a/trunk/bitbake/lib/bb/cache.py b/trunk/bitbake/lib/bb/cache.py
index a6b8133..f9a20c6 100644
--- a/trunk/bitbake/lib/bb/cache.py
+++ b/trunk/bitbake/lib/bb/cache.py
@@ -31,7 +31,6 @@
import os, re
import bb.data
import bb.utils
-from sets import Set
try:
import cPickle as pickle
@@ -471,6 +470,6 @@ class CacheData:
(set elsewhere)
"""
self.ignored_dependencies = []
- self.world_target = Set()
+ self.world_target = set()
self.bbfile_priority = {}
self.bbfile_config_priorities = []
diff --git a/trunk/bitbake/lib/bb/cooker.py b/trunk/bitbake/lib/bb/cooker.py
index 06f3395..5884464 100644
--- a/trunk/bitbake/lib/bb/cooker.py
+++ b/trunk/bitbake/lib/bb/cooker.py
@@ -26,7 +26,6 @@ import sys, os, getopt, glob, copy, os.path, re, time
import bb
from bb import utils, data, parse, event, cache, providers, taskdata, runqueue
from bb import xmlrpcserver, command
-from sets import Set
import itertools, sre_constants
class MultipleMatches(Exception):
@@ -638,7 +637,7 @@ class BBCooker:
# Tweak some variables
item = self.bb_cache.getVar('PN', fn, True)
- self.status.ignored_dependencies = Set()
+ self.status.ignored_dependencies = set()
self.status.bbfile_priority[fn] = 1
# Remove external dependencies
@@ -765,7 +764,7 @@ class BBCooker:
self.status = bb.cache.CacheData()
ignore = bb.data.getVar("ASSUME_PROVIDED", self.configuration.data, 1)
or ""
- self.status.ignored_dependencies = Set(ignore.split())
+ self.status.ignored_dependencies = set(ignore.split())
for dep in self.configuration.extra_assume_provided:
self.status.ignored_dependencies.add(dep)
diff --git a/trunk/bitbake/lib/bb/data_smart.py
b/trunk/bitbake/lib/bb/data_smart.py
index 0d39d20..c93aea7 100644
--- a/trunk/bitbake/lib/bb/data_smart.py
+++ b/trunk/bitbake/lib/bb/data_smart.py
@@ -32,7 +32,6 @@ import copy, os, re, sys, time, types
import bb
from bb import utils, methodpool
from COW import COWDictBase
-from sets import Set
from new import classobj
@@ -142,7 +141,7 @@ class DataSmart:
try:
self._special_values[keyword].add( base )
except:
- self._special_values[keyword] = Set()
+ self._special_values[keyword] = set()
self._special_values[keyword].add( base )
return
@@ -154,7 +153,7 @@ class DataSmart:
if '_' in var:
override = var[var.rfind('_')+1:]
if not self._seen_overrides.has_key(override):
- self._seen_overrides[override] = Set()
+ self._seen_overrides[override] = set()
self._seen_overrides[override].add( var )
# setting var
diff --git a/trunk/bitbake/lib/bb/runqueue.py b/trunk/bitbake/lib/bb/runqueue.py
index 01452d2..4f0996d 100644
--- a/trunk/bitbake/lib/bb/runqueue.py
+++ b/trunk/bitbake/lib/bb/runqueue.py
@@ -23,7 +23,6 @@ Handles preparation and execution of a queue of tasks
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
from bb import msg, data, event, mkdirhier, utils
-from sets import Set
import bb, os, sys
import signal
import stat
@@ -544,8 +543,8 @@ class RunQueue:
self.runq_fnid.append(taskData.tasks_fnid[task])
self.runq_task.append(taskData.tasks_name[task])
- self.runq_depends.append(Set(depends))
- self.runq_revdeps.append(Set())
+ self.runq_depends.append(set(depends))
+ self.runq_revdeps.append(set())
runq_build.append(0)
@@ -641,7 +640,7 @@ class RunQueue:
if maps[origdep] == -1:
bb.msg.fatal(bb.msg.domain.RunQueue, "Invalid mapping -
Should never happen!")
newdeps.append(maps[origdep])
- self.runq_depends[listid] = Set(newdeps)
+ self.runq_depends[listid] = set(newdeps)
bb.msg.note(2, bb.msg.domain.RunQueue, "Assign Weightings")
--
1.6.3.rc0
_______________________________________________
Bitbake-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/bitbake-dev
