use queue from six.moves for python{2,3} compatibility
for python2 it is "Queue" python3 it is "queue" Change-Id: Icf3ea7998c8ddab4b4431eb12aef86766ac6aac3
This commit is contained in:
parent
98bb1e7800
commit
9ec49d98a9
|
@ -20,7 +20,6 @@ import grp
|
|||
import json
|
||||
import os
|
||||
import pwd
|
||||
import Queue
|
||||
import re
|
||||
import stat
|
||||
import sys
|
||||
|
@ -28,6 +27,7 @@ import threading
|
|||
|
||||
from oslo_log import log
|
||||
from six.moves import cStringIO
|
||||
from six.moves import queue
|
||||
|
||||
from freezer.engine import engine
|
||||
from freezer.engine.rsync import pyrsync
|
||||
|
@ -103,7 +103,7 @@ class RsyncEngine(engine.BackupEngine):
|
|||
self.cipher = crypt.AESEncrypt(self.encrypt_pass_file)
|
||||
data_chunk += self.cipher.generate_header()
|
||||
|
||||
rsync_queue = Queue.Queue(maxsize=2)
|
||||
rsync_queue = queue.Queue(maxsize=2)
|
||||
|
||||
t_get_sign_delta = threading.Thread(
|
||||
target=self.get_sign_delta,
|
||||
|
|
|
@ -20,7 +20,6 @@ import getpass
|
|||
import grp
|
||||
import os
|
||||
import pwd
|
||||
import Queue
|
||||
import shutil
|
||||
import stat
|
||||
import sys
|
||||
|
@ -30,6 +29,7 @@ import msgpack
|
|||
from oslo_log import log
|
||||
import six
|
||||
|
||||
from six.moves import queue
|
||||
|
||||
from freezer.engine import engine
|
||||
from freezer.engine.rsyncv2 import pyrsync
|
||||
|
@ -97,7 +97,7 @@ class Rsyncv2Engine(engine.BackupEngine):
|
|||
cipher = crypt.AESEncrypt(self.encrypt_pass_file)
|
||||
yield cipher.generate_header()
|
||||
|
||||
write_queue = Queue.Queue(maxsize=2)
|
||||
write_queue = queue.Queue(maxsize=2)
|
||||
|
||||
# Create thread for compute file signatures and read data
|
||||
t_get_sign_delta = threading.Thread(target=self.get_sign_delta,
|
||||
|
|
Loading…
Reference in New Issue