Hi.
'sets' module was deprecated in python 2.6, so it generates
DeprecationWarning warnings now. It's easily replaceable with built-in
sets. Comparison between these two:
http://docs.python.org/library/sets.html#comparison-to-the-built-in-set-types
The attached diff is for 1.8 branch.
Index: lib/bb/COW.py
===================================================================
--- lib/bb/COW.py (revision 1150)
+++ lib/bb/COW.py (working copy)
@@ -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.LongType, \
types.NoneType, \
types.TupleType, \
- sets.ImmutableSet] + \
+ frozenset] + \
list(types.StringTypes))
MUTABLE = "__mutable__"
Index: lib/bb/cache.py
===================================================================
--- lib/bb/cache.py (revision 1150)
+++ lib/bb/cache.py (working copy)
@@ -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 @@
(set elsewhere)
"""
self.ignored_dependencies = []
- self.world_target = Set()
+ self.world_target = set()
self.bbfile_priority = {}
self.bbfile_config_priorities = []
Index: lib/bb/runqueue.py
===================================================================
--- lib/bb/runqueue.py (revision 1150)
+++ lib/bb/runqueue.py (working copy)
@@ -23,7 +23,6 @@
# 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
@@ -525,8 +524,8 @@
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)
@@ -622,7 +621,7 @@
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")
Index: lib/bb/data_smart.py
===================================================================
--- lib/bb/data_smart.py (revision 1150)
+++ lib/bb/data_smart.py (working copy)
@@ -32,7 +32,6 @@
import bb
from bb import utils, methodpool
from COW import COWDictBase
-from sets import Set
from new import classobj
@@ -142,7 +141,7 @@
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 @@
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
Index: lib/bb/cooker.py
===================================================================
--- lib/bb/cooker.py (revision 1150)
+++ lib/bb/cooker.py (working copy)
@@ -25,7 +25,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 sets import Set
import itertools, sre_constants
parsespin = itertools.cycle( r'|/-\\' )
@@ -485,7 +484,7 @@
# 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
@@ -577,7 +576,7 @@
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() )
self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) )
_______________________________________________
Bitbake-dev mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/bitbake-dev
