Merge branch 'master' into 2.x/develop

pype/tools/launcher/window.py

@@ -4,7 +4,7 @@ import logging
 from Qt import QtWidgets, QtCore, QtGui
 from avalon import style
 
-from pype.modules.ftrack.lib.io_nonsingleton import DbConnector
+from avalon.api import AvalonMongoDB
 from pype.api import resources
 
 from avalon.tools import lib as tools_lib
@@ -251,7 +251,7 @@ class LauncherWindow(QtWidgets.QDialog):
         self.log = logging.getLogger(
             ".".join([__name__, self.__class__.__name__])
         )
-        self.dbcon = DbConnector()
+        self.dbcon = AvalonMongoDB()
 
         self.setWindowTitle("Launcher")
         self.setFocusPolicy(QtCore.Qt.StrongFocus)

pype/tools/standalonepublish/app.py

@@ -1,7 +1,7 @@
 from bson.objectid import ObjectId
 from Qt import QtWidgets, QtCore
 from widgets import AssetWidget, FamilyWidget, ComponentsWidget, ShadowWidget
-from avalon.tools.libraryloader.io_nonsingleton import DbConnector
+from avalon.api import AvalonMongoDB
 
 
 class Window(QtWidgets.QDialog):
@@ -10,7 +10,7 @@ class Window(QtWidgets.QDialog):
     :param parent: Main widget that cares about all GUIs
     :type parent: QtWidgets.QMainWindow
     """
-    _db = DbConnector()
+    _db = AvalonMongoDB()
     _jobs = {}
     valid_family = False
     valid_components = False