From 50b015115c19ae9fcedd343f4369eaad565185df Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 12 Nov 2018 13:07:45 +0100 Subject: [PATCH] change imports for implementation into pype-start --- pype/ftrack/__init__.py | 15 --------------- pype/ftrack/credentials.py | 5 +++-- pype/ftrack/login_dialog.py | 15 ++++----------- pype/ftrack/login_tools.py | 8 +------- 4 files changed, 8 insertions(+), 35 deletions(-) diff --git a/pype/ftrack/__init__.py b/pype/ftrack/__init__.py index 44f9b76bcc..e69de29bb2 100644 --- a/pype/ftrack/__init__.py +++ b/pype/ftrack/__init__.py @@ -1,15 +0,0 @@ -import credentials -import login_dialog - -cred = credentials._get_credentials() - -if 'username' in cred and 'apiKey' in cred: - validation = credentials._check_credentials( - cred['username'], - cred['apiKey'] - ) - if validation is False: - login_dialog.run_login() - -else: - login_dialog.run_login() diff --git a/pype/ftrack/credentials.py b/pype/ftrack/credentials.py index 46292ebee7..74b0b298ab 100644 --- a/pype/ftrack/credentials.py +++ b/pype/ftrack/credentials.py @@ -1,10 +1,11 @@ import os import toml + import ftrack_api -import appdirs +import appdirs config_path = os.path.normpath(appdirs.user_data_dir('pype-app','pype')) -config_name = 'credentials.toml' +config_name = 'ftrack_cred.toml' fpath = os.path.join(config_path, config_name) def _get_credentials(): diff --git a/pype/ftrack/login_dialog.py b/pype/ftrack/login_dialog.py index 0e671c7ffd..2a69f92f69 100644 --- a/pype/ftrack/login_dialog.py +++ b/pype/ftrack/login_dialog.py @@ -1,17 +1,10 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file '..\CODE\github\pypeclub\pype-setup\temp\pype_project_settins_ui\login_dialogue.ui' -# -# Created by: PyQt5 UI code generator 5.7.1 -# -# WARNING! All changes made in this file will be lost! - import sys +import requests from PyQt5 import QtCore, QtGui, QtWidgets from app import style -import credentials -import login_tools -import requests +from . import credentials, login_tools + + class Login_Dialog_ui(QtWidgets.QWidget): SIZE_W = 300 diff --git a/pype/ftrack/login_tools.py b/pype/ftrack/login_tools.py index 200638b3df..3c0f430c9e 100644 --- a/pype/ftrack/login_tools.py +++ b/pype/ftrack/login_tools.py @@ -1,13 +1,7 @@ -# :coding: utf-8 -# :copyright: Copyright (c) 2016 ftrack - from http.server import BaseHTTPRequestHandler, HTTPServer -# import BaseHTTPServer from urllib import parse -# import urlparse import webbrowser import functools -# from QtExt import QtCore from PyQt5 import QtCore # class LoginServerHandler(BaseHTTPServer.BaseHTTPRequestHandler): @@ -68,7 +62,7 @@ class LoginServerHandler(BaseHTTPRequestHandler): self.end_headers() self.wfile.write(message.encode()) - + if login_credentials: self.login_callback( api_user,