Mercurial > repos > cathywise > truststore_browse
comparison TrustStoreGalaxyBrowse.py @ 10:7301c2e96fce
Fix circular dependency
| author | Wise, Catherine (Digital, Acton) <Catherine.Wise@csiro.au> |
|---|---|
| date | Thu, 25 Jun 2015 08:36:38 +1000 |
| parents | 3e8bd0d01725 |
| children | 9ada74e8915e |
comparison
equal
deleted
inserted
replaced
| 9:3e8bd0d01725 | 10:7301c2e96fce |
|---|---|
| 7 import os | 7 import os |
| 8 import json | 8 import json |
| 9 import operator | 9 import operator |
| 10 import urlparse | 10 import urlparse |
| 11 from py_ts import TrustStoreClient, utils | 11 from py_ts import TrustStoreClient, utils |
| 12 import galaxy.model # need to import model before sniff to resolve a circular import dependency | |
| 12 from galaxy.datatypes.checkers import util | 13 from galaxy.datatypes.checkers import util |
| 13 from galaxy.datatypes import sniff | 14 from galaxy.datatypes import sniff |
| 14 from galaxy.datatypes.registry import Registry | 15 from galaxy.datatypes.registry import Registry |
| 15 | 16 |
| 16 # Tell urllib3 to use pyOpenSSL because we are on old Python stdlib. | 17 # Tell urllib3 to use pyOpenSSL because we are on old Python stdlib. |
