summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2019-10-14 11:34:31 -0700
committerTim Burke <tim.burke@gmail.com>2019-10-14 11:34:31 -0700
commit4c66596e630ee63cf2cd54d216c8e443203e59fe (patch)
treedbdcb26e8d841cd0aca25d304762670f075a1102 /bin
parent29d46ca9f624cde5f452f7f50ed4244be09eb97a (diff)
downloadswift-4c66596e630ee63cf2cd54d216c8e443203e59fe.tar.gz
py3: fix swift-dispersion-populate
Change-Id: I1f140ae00cbd25b23c9a40ee91dccee8c7c15d81
Diffstat (limited to 'bin')
-rwxr-xr-xbin/swift-dispersion-populate6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/swift-dispersion-populate b/bin/swift-dispersion-populate
index 946be0faa..d051630cd 100755
--- a/bin/swift-dispersion-populate
+++ b/bin/swift-dispersion-populate
@@ -15,6 +15,7 @@
# limitations under the License.
from __future__ import print_function
+import io
import traceback
from optparse import OptionParser
from sys import exit, stdout
@@ -22,8 +23,8 @@ from time import time
from eventlet import GreenPool, patcher, sleep
from eventlet.pools import Pool
+import six
from six.moves import range
-from six.moves import cStringIO as StringIO
from six.moves.configparser import ConfigParser
try:
@@ -56,7 +57,8 @@ def put_object(connpool, container, obj, report):
global retries_done
try:
with connpool.item() as conn:
- conn.put_object(container, obj, StringIO(obj),
+ data = io.BytesIO(obj if six.PY2 else obj.encode('utf8'))
+ conn.put_object(container, obj, data,
headers={'x-object-meta-dispersion': obj})
retries_done += conn.attempts - 1
if report: