Merge "replace dict.iteritems() with six.iteritems(dict)"
This commit is contained in:
commit
624a0d0fca
|
@ -18,3 +18,4 @@ python-swiftclient>=1.6
|
||||||
python-keystoneclient>=0.4.2
|
python-keystoneclient>=0.4.2
|
||||||
PrettyTable>=0.6,<0.8
|
PrettyTable>=0.6,<0.8
|
||||||
babel
|
babel
|
||||||
|
six>=1.6.0
|
||||||
|
|
|
@ -7,7 +7,6 @@ docutils==0.9.1
|
||||||
discover
|
discover
|
||||||
fixtures>=0.3.14
|
fixtures>=0.3.14
|
||||||
python-subunit
|
python-subunit
|
||||||
six>=1.4.1
|
|
||||||
testrepository>=0.0.17
|
testrepository>=0.0.17
|
||||||
testtools>=0.9.32
|
testtools>=0.9.32
|
||||||
sphinxcontrib-programoutput
|
sphinxcontrib-programoutput
|
||||||
|
|
|
@ -17,6 +17,7 @@ from hashlib import sha1
|
||||||
from time import time
|
from time import time
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
|
import six
|
||||||
import string
|
import string
|
||||||
import swiftclient
|
import swiftclient
|
||||||
import urlparse
|
import urlparse
|
||||||
|
@ -116,7 +117,7 @@ class Swift(object):
|
||||||
'file_path_prefix': ''
|
'file_path_prefix': ''
|
||||||
}
|
}
|
||||||
|
|
||||||
for key, default in settings.iteritems():
|
for key, default in six.iteritems(settings):
|
||||||
if key in kwargs:
|
if key in kwargs:
|
||||||
settings[key] = kwargs[key]
|
settings[key] = kwargs[key]
|
||||||
elif self.config.has_option('swift', 'default_' + key):
|
elif self.config.has_option('swift', 'default_' + key):
|
||||||
|
|
|
@ -19,6 +19,7 @@ import threading
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
import gear
|
import gear
|
||||||
|
import six
|
||||||
|
|
||||||
import model
|
import model
|
||||||
|
|
||||||
|
@ -129,7 +130,8 @@ class RPCListener(object):
|
||||||
# args = json.loads(job.arguments)
|
# args = json.loads(job.arguments)
|
||||||
# TODO: use args to filter by pipeline etc
|
# TODO: use args to filter by pipeline etc
|
||||||
running_items = []
|
running_items = []
|
||||||
for pipeline_name, pipeline in self.sched.layout.pipelines.iteritems():
|
for pipeline_name, pipeline in six.iteritems(
|
||||||
|
self.sched.layout.pipelines):
|
||||||
for queue in pipeline.queues:
|
for queue in pipeline.queues:
|
||||||
for item in queue.queue:
|
for item in queue.queue:
|
||||||
running_items.append(item.formatJSON())
|
running_items.append(item.formatJSON())
|
||||||
|
|
Loading…
Reference in New Issue