summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-05-10 13:13:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-16 22:32:41 (GMT)
commit337c8af55dac929b72e0bb32ef320cbb4b0e7892 (patch)
treec6ac60d617adaab7e5e1f9bbfde434f70fd2cdac
parent4fe7e92056d662598d105f2e89f944fd1c981c2c (diff)
downloadpoky-337c8af55dac929b72e0bb32ef320cbb4b0e7892.tar.gz
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: f44986d41055ce7fa3128e1acb6968f9ccc355ba) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/contrib/tts/config.py2
-rw-r--r--bitbake/lib/toaster/orm/models.py2
-rw-r--r--bitbake/lib/toaster/toastergui/tablefilter.py2
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py2
-rw-r--r--bitbake/lib/toaster/toastergui/widgets.py4
5 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/contrib/tts/config.py b/bitbake/lib/toaster/contrib/tts/config.py
index 40d45f3..87b427c 100644
--- a/bitbake/lib/toaster/contrib/tts/config.py
+++ b/bitbake/lib/toaster/contrib/tts/config.py
@@ -74,7 +74,7 @@ BACKLOGFILE = os.path.join(os.path.dirname(__file__), "backlog.txt")
74# task states 74# task states
75def enum(*sequential, **named): 75def enum(*sequential, **named):
76 enums = dict(zip(sequential, range(len(sequential))), **named) 76 enums = dict(zip(sequential, range(len(sequential))), **named)
77 reverse = dict((value, key) for key, value in enums.iteritems()) 77 reverse = dict((value, key) for key, value in enums.items())
78 enums['reverse_mapping'] = reverse 78 enums['reverse_mapping'] = reverse
79 return type('Enum', (), enums) 79 return type('Enum', (), enums)
80 80
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 58dc753..ee01a46 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -103,7 +103,7 @@ class GitURLValidator(validators.URLValidator):
103 103
104def GitURLField(**kwargs): 104def GitURLField(**kwargs):
105 r = models.URLField(**kwargs) 105 r = models.URLField(**kwargs)
106 for i in xrange(len(r.validators)): 106 for i in range(len(r.validators)):
107 if isinstance(r.validators[i], validators.URLValidator): 107 if isinstance(r.validators[i], validators.URLValidator):
108 r.validators[i] = GitURLValidator() 108 r.validators[i] = GitURLValidator()
109 return r 109 return r
diff --git a/bitbake/lib/toaster/toastergui/tablefilter.py b/bitbake/lib/toaster/toastergui/tablefilter.py
index 9d15bcf..65454e1 100644
--- a/bitbake/lib/toaster/toastergui/tablefilter.py
+++ b/bitbake/lib/toaster/toastergui/tablefilter.py
@@ -286,7 +286,7 @@ class TableFilterMap(object):
286 def to_json(self, queryset): 286 def to_json(self, queryset):
287 data = {} 287 data = {}
288 288
289 for filter_name, table_filter in self.__filters.iteritems(): 289 for filter_name, table_filter in self.__filters.items():
290 data[filter_name] = table_filter.to_json() 290 data[filter_name] = table_filter.to_json()
291 291
292 return data 292 return data
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 22d1a0c..b256db7 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -2279,7 +2279,7 @@ if True:
2279 # Strip trailing/leading whitespace from all values 2279 # Strip trailing/leading whitespace from all values
2280 # put into a new dict because POST one is immutable 2280 # put into a new dict because POST one is immutable
2281 post_data = dict() 2281 post_data = dict()
2282 for key,val in request.POST.iteritems(): 2282 for key,val in request.POST.items():
2283 post_data[key] = val.strip() 2283 post_data[key] = val.strip()
2284 2284
2285 2285
diff --git a/bitbake/lib/toaster/toastergui/widgets.py b/bitbake/lib/toaster/toastergui/widgets.py
index 0f10350..c02f9f5 100644
--- a/bitbake/lib/toaster/toastergui/widgets.py
+++ b/bitbake/lib/toaster/toastergui/widgets.py
@@ -281,12 +281,12 @@ class ToasterTable(TemplateView):
281 # Make a unique cache name 281 # Make a unique cache name
282 cache_name = self.__class__.__name__ 282 cache_name = self.__class__.__name__
283 283
284 for key, val in request.GET.iteritems(): 284 for key, val in request.GET.items():
285 if key == 'nocache': 285 if key == 'nocache':
286 continue 286 continue
287 cache_name = cache_name + str(key) + str(val) 287 cache_name = cache_name + str(key) + str(val)
288 288
289 for key, val in kwargs.iteritems(): 289 for key, val in kwargs.items():
290 cache_name = cache_name + str(key) + str(val) 290 cache_name = cache_name + str(key) + str(val)
291 291
292 # No special chars allowed in the cache name apart from dash 292 # No special chars allowed in the cache name apart from dash