valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unused imports

Browse Source 
These imports now live in salt.utils.gitfs.
This commit is contained in:
Erik Johnson 2015-07-22 00:23:00 -05:00
parent 7584f5f02a
commit c05b22a063
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
salt/fileserver/gitfs.py
View File

@ -48,19 +48,7 @@ Walkthrough <tutorial-gitfs>`.
# Import python libs # Import python libs
from __future__ import absolute_import from __future__ import absolute_import
import copy
import distutils.version # pylint: disable=import-error,no-name-in-module
import errno
import fnmatch
import glob
import hashlib
import logging import logging
import os
import re
import shutil
import stat
import subprocess
from datetime import datetime
PER_REMOTE_PARAMS = ('base', 'mountpoint', 'root', 'ssl_verify') PER_REMOTE_PARAMS = ('base', 'mountpoint', 'root', 'ssl_verify')
SYMLINK_RECURSE_DEPTH = 100 SYMLINK_RECURSE_DEPTH = 100
@ -74,9 +62,6 @@ AUTH_PARAMS = ('user', 'password', 'pubkey', 'privkey', 'passphrase',
import salt.utils.gitfs import salt.utils.gitfs
from salt.exceptions import FileserverConfigError from salt.exceptions import FileserverConfigError
# Import third party libs
import salt.ext.six as six
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
# Define the module's virtual name # Define the module's virtual name

16
salt/pillar/git_pillar.py
View File

@ -163,22 +163,6 @@ try:
HAS_GITPYTHON = True HAS_GITPYTHON = True
except ImportError: except ImportError:
HAS_GITPYTHON = False HAS_GITPYTHON = False
try:
import pygit2
HAS_PYGIT2 = True
except ImportError:
HAS_PYGIT2 = False
try:
import dulwich.errors
import dulwich.repo
import dulwich.client
import dulwich.config
import dulwich.objects
HAS_DULWICH = True
except ImportError:
HAS_DULWICH = False
# pylint: enable=import-error # pylint: enable=import-error
PER_REMOTE_PARAMS = ('env', 'root', 'ssl_verify') PER_REMOTE_PARAMS = ('env', 'root', 'ssl_verify')