mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
bitbake: toaster: use items and range instead of old APIs
Used items() and range() APIs instead of iteritems() and xrange() as latter don't exist in python 3 [YOCTO #9584] (Bitbake rev: 372dd3abcb201bd9ac2c3189c5505d3578ce0dd0) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
96ce543150
commit
314541f600
@@ -74,7 +74,7 @@ BACKLOGFILE = os.path.join(os.path.dirname(__file__), "backlog.txt")
|
|||||||
# task states
|
# task states
|
||||||
def enum(*sequential, **named):
|
def enum(*sequential, **named):
|
||||||
enums = dict(zip(sequential, range(len(sequential))), **named)
|
enums = dict(zip(sequential, range(len(sequential))), **named)
|
||||||
reverse = dict((value, key) for key, value in enums.iteritems())
|
reverse = dict((value, key) for key, value in enums.items())
|
||||||
enums['reverse_mapping'] = reverse
|
enums['reverse_mapping'] = reverse
|
||||||
return type('Enum', (), enums)
|
return type('Enum', (), enums)
|
||||||
|
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ class GitURLValidator(validators.URLValidator):
|
|||||||
|
|
||||||
def GitURLField(**kwargs):
|
def GitURLField(**kwargs):
|
||||||
r = models.URLField(**kwargs)
|
r = models.URLField(**kwargs)
|
||||||
for i in xrange(len(r.validators)):
|
for i in range(len(r.validators)):
|
||||||
if isinstance(r.validators[i], validators.URLValidator):
|
if isinstance(r.validators[i], validators.URLValidator):
|
||||||
r.validators[i] = GitURLValidator()
|
r.validators[i] = GitURLValidator()
|
||||||
return r
|
return r
|
||||||
|
|||||||
@@ -286,7 +286,7 @@ class TableFilterMap(object):
|
|||||||
def to_json(self, queryset):
|
def to_json(self, queryset):
|
||||||
data = {}
|
data = {}
|
||||||
|
|
||||||
for filter_name, table_filter in self.__filters.iteritems():
|
for filter_name, table_filter in self.__filters.items():
|
||||||
data[filter_name] = table_filter.to_json()
|
data[filter_name] = table_filter.to_json()
|
||||||
|
|
||||||
return data
|
return data
|
||||||
|
|||||||
@@ -2279,7 +2279,7 @@ if True:
|
|||||||
# Strip trailing/leading whitespace from all values
|
# Strip trailing/leading whitespace from all values
|
||||||
# put into a new dict because POST one is immutable
|
# put into a new dict because POST one is immutable
|
||||||
post_data = dict()
|
post_data = dict()
|
||||||
for key,val in request.POST.iteritems():
|
for key,val in request.POST.items():
|
||||||
post_data[key] = val.strip()
|
post_data[key] = val.strip()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -278,12 +278,12 @@ class ToasterTable(TemplateView):
|
|||||||
# Make a unique cache name
|
# Make a unique cache name
|
||||||
cache_name = self.__class__.__name__
|
cache_name = self.__class__.__name__
|
||||||
|
|
||||||
for key, val in request.GET.iteritems():
|
for key, val in request.GET.items():
|
||||||
if key == 'nocache':
|
if key == 'nocache':
|
||||||
continue
|
continue
|
||||||
cache_name = cache_name + str(key) + str(val)
|
cache_name = cache_name + str(key) + str(val)
|
||||||
|
|
||||||
for key, val in kwargs.iteritems():
|
for key, val in kwargs.items():
|
||||||
cache_name = cache_name + str(key) + str(val)
|
cache_name = cache_name + str(key) + str(val)
|
||||||
|
|
||||||
# No special chars allowed in the cache name apart from dash
|
# No special chars allowed in the cache name apart from dash
|
||||||
|
|||||||
Reference in New Issue
Block a user