Merge "Fix a pep/hacking error in a swift import"
This commit is contained in:
commit
8a1fd0a12f
@ -35,7 +35,7 @@ except ImportError:
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
# Swift > 1.7.5 ... module exists but doesn't contain class.
|
# Swift > 1.7.5 ... module exists but doesn't contain class.
|
||||||
from swift.common.utils import InputProxy
|
from swift.common.utils import InputProxy
|
||||||
except ImportError:
|
except ImportError:
|
||||||
# Swift <= 1.7.5 ... module exists and has class.
|
# Swift <= 1.7.5 ... module exists and has class.
|
||||||
from swift.common.middleware.proxy_logging import InputProxy
|
from swift.common.middleware.proxy_logging import InputProxy
|
||||||
|
Loading…
x
Reference in New Issue
Block a user