Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

[QUAD] Bug: SFTP initialization crash and direct access to non existing attribute #6321

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions openpype/modules/sync_server/providers/sftp.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
import pysftp
import paramiko
except (ImportError, SyntaxError):
pass

# handle imports from Python 2 hosts - in those only basic methods are used
log.warning("Import failed, imported from Python 2, operations will fail.")

Expand All @@ -35,26 +33,25 @@ class SFTPHandler(AbstractProvider):
LABEL = 'SFTP'

def __init__(self, project_name, site_name, tree=None, presets=None):
self.presets = None
super().__init__(project_name, site_name, tree, presets)

self.project_name = project_name
self.site_name = site_name
self.root = None
self._conn = None

self.presets = presets
if not self.presets:
self.log.warning(
"Sync Server: There are no presets for {}.".format(site_name)
)
return

# store to instance for reconnect
self.sftp_host = presets["sftp_host"]
self.sftp_port = presets["sftp_port"]
self.sftp_user = presets["sftp_user"]
self.sftp_pass = presets["sftp_pass"]
self.sftp_key = presets["sftp_key"]
self.sftp_key_pass = presets["sftp_key_pass"]
self.sftp_host = presets.get("sftp_host", "")
self.sftp_port = presets.get("sftp_port", 22)
self.sftp_user = presets.get("sftp_user", "")
self.sftp_pass = presets.get("sftp_pass", "")
self.sftp_key = presets.get("sftp_key", "")
self.sftp_key_pass = presets.get("sftp_key_pass", "")

self._tree = None

Expand Down
Loading