Skip to content

Commit 922f7c9

Browse files
committed
Merge pull request #616 from Dataliberate/master
Fix ImportError when __main__ already loaded
2 parents d7013fb + 6860507 commit 922f7c9

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

rdflib/__init__.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,17 @@
7373
del sys
7474

7575
import logging
76-
import __main__
77-
if not hasattr(__main__, '__file__'):
78-
# show log messages in interactive mode
79-
logging.basicConfig(level=logging.INFO)
76+
try:
77+
import __main__
78+
if not hasattr(__main__, '__file__'):
79+
# show log messages in interactive mode
80+
logging.basicConfig(level=logging.INFO)
81+
except ImportError:
82+
#Main already imported from elsewhere
83+
import warnings
84+
warnings.warn('__main__ already imported', ImportWarning)
85+
del warnings
86+
8087
logger = logging.getLogger(__name__)
8188
logger.info("RDFLib Version: %s" % __version__)
8289

0 commit comments

Comments
 (0)