Преглед изворни кода

HUE-6245 [cluster] Remove cyclic dependency in notebook conf

Romain Rigaux пре 8 година
родитељ
комит
4347313245
1 измењених фајлова са 2 додато и 1 уклоњено
  1. 2 1
      desktop/libs/notebook/src/notebook/conf.py

+ 2 - 1
desktop/libs/notebook/src/notebook/conf.py

@@ -22,11 +22,11 @@ except ImportError:
 
 
 from django.utils.translation import ugettext_lazy as _t
 from django.utils.translation import ugettext_lazy as _t
 
 
+
 from desktop import appmanager
 from desktop import appmanager
 from desktop.conf import is_hue4
 from desktop.conf import is_hue4
 from desktop.lib.conf import Config, UnspecifiedConfigSection, ConfigSection,\
 from desktop.lib.conf import Config, UnspecifiedConfigSection, ConfigSection,\
   coerce_json_dict, coerce_bool, coerce_csv
   coerce_json_dict, coerce_bool, coerce_csv
-from desktop.models import Cluster
 
 
 
 
 def is_oozie_enabled():
 def is_oozie_enabled():
@@ -197,6 +197,7 @@ def _default_interpreters(user):
         'name': 'Solr SQL', 'interface': 'solr', 'options': {}
         'name': 'Solr SQL', 'interface': 'solr', 'options': {}
     }),)
     }),)
 
 
+  from desktop.models import Cluster  # Cyclic dependency
   cluster = Cluster(user)
   cluster = Cluster(user)
   if cluster and cluster.get_type() == 'dataeng':
   if cluster and cluster.get_type() == 'dataeng':
     interpreters.append(('dataeng', {
     interpreters.append(('dataeng', {