Merge "Avoid importing Linux specific modules on Windows"
This commit is contained in:
commit
0fa59b04e8
@ -14,9 +14,14 @@
|
||||
# under the License.
|
||||
|
||||
import os
|
||||
import pwd
|
||||
import re
|
||||
import shutil
|
||||
import sys
|
||||
|
||||
if sys.platform != 'win32':
|
||||
# NOTE(claudiub): pwd is a Linux-specific library, and currently there is
|
||||
# no Windows support for oslo.rootwrap.
|
||||
import pwd
|
||||
|
||||
|
||||
def _getuid(user):
|
||||
|
@ -16,8 +16,11 @@
|
||||
import logging
|
||||
import logging.handlers
|
||||
import os
|
||||
import pwd
|
||||
import signal
|
||||
import sys
|
||||
|
||||
if sys.platform != 'win32':
|
||||
import pwd
|
||||
|
||||
import six
|
||||
from six import moves
|
||||
|
Loading…
Reference in New Issue
Block a user