Skip to content

Commit

Permalink
Merge pull request #12016 from ericvaandering/fix_absolute_import
Browse files Browse the repository at this point in the history
Get rid of relative imports.
  • Loading branch information
davidlange6 committed Oct 29, 2015
2 parents 6c531f4 + 3bb4f98 commit b990fe2
Show file tree
Hide file tree
Showing 25 changed files with 1,392 additions and 1,367 deletions.
3 changes: 2 additions & 1 deletion CondCore/TagCollection/python/DBCopy.py
@@ -1,5 +1,6 @@
from __future__ import absolute_import
import coral
import CommonUtils, TagTree, tagInventory
from . import CommonUtils, TagTree, tagInventory

class DBCopy(object):

Expand Down
3 changes: 2 additions & 1 deletion CondCore/TagCollection/python/DBImpl.py
@@ -1,5 +1,6 @@
from __future__ import absolute_import
import coral
import IdGenerator
from . import IdGenerator

class DBImpl(object):
"""Class wrap up all the database operations.\n
Expand Down
3 changes: 2 additions & 1 deletion CondCore/TagCollection/python/IdGenerator.py
@@ -1,5 +1,6 @@
from __future__ import absolute_import
import coral
import DBImpl
from . import DBImpl
class IdGenerator(object):
"""Manages the autoincremental ID values.\n
Input: coral.schema object
Expand Down
3 changes: 2 additions & 1 deletion CondCore/TagCollection/python/TagTree.py
@@ -1,6 +1,7 @@
from __future__ import absolute_import
import os
import coral
import IdGenerator, Node, DBImpl
from . import IdGenerator, Node, DBImpl
class tagTree(object):
"""Class manages tag tree. Note: tree name is not case sensitive.
Tree name is always converted to upper case
Expand Down
3 changes: 2 additions & 1 deletion CondCore/TagCollection/python/connectstrParser.py
@@ -1,3 +1,4 @@
from __future__ import absolute_import
import re
class connectstrParser(object):
def __init__(self,connectstr):
Expand Down Expand Up @@ -66,7 +67,7 @@ def fullfrontierStr(self,schemaname,parameterDict):
result+='/'+schemaname
return result
if __name__ == '__main__':
import cacheconfigParser
from . import cacheconfigParser
o='oracle://cms_orcoff_prep/CMS_LUMI_DEV_OFFLINE'
parser=connectstrParser(o)
parser.parse()
Expand Down
5 changes: 3 additions & 2 deletions CondCore/TagCollection/python/entryComment.py
@@ -1,6 +1,7 @@
from __future__ import absolute_import
import coral
import DBImpl
import CommonUtils
from . import DBImpl
from . import CommonUtils

class entryComment(object):
"""Class add optional comment on given entry in a given table\n
Expand Down
5 changes: 3 additions & 2 deletions CondCore/TagCollection/python/exporter.py
Expand Up @@ -5,13 +5,14 @@
Input parameter rowCachesize : the number of rows to be cached at the client side, default value =100
Output paramter : the exporter object
'''
from __future__ import absolute_import

import os
import coral
import time
import math
from multivaluedict import mseqdict
from listobjects import listobjects,listschema,listtables,listtableset
from .multivaluedict import mseqdict
from .listobjects import listobjects,listschema,listtables,listtableset

class exporter:
"exporter class for CoralTools"
Expand Down
3 changes: 2 additions & 1 deletion CondCore/TagCollection/python/listobjects.py
@@ -1,6 +1,7 @@
from __future__ import absolute_import
import os
import coral
from multivaluedict import mseqdict
from .multivaluedict import mseqdict

'''
dumpobjectlist(schema)
Expand Down
3 changes: 2 additions & 1 deletion CondCore/TagCollection/python/multivaluedict.py
Expand Up @@ -4,8 +4,9 @@
You can slice, add, sort with dictionaries. The functional operations map, filter, reduce can also be used .
The dictionary can also be used like a stack with push and pop. It can be used to Split , reverse and swap keys and values.
'''
from __future__ import absolute_import

from seqvaluedict import seqdict #Sequential Single Value Dictionary
from .seqvaluedict import seqdict #Sequential Single Value Dictionary
from UserList import UserList

class MyUserList(UserList):
Expand Down
3 changes: 2 additions & 1 deletion CondCore/TagCollection/python/tagInventory.py
@@ -1,5 +1,6 @@
from __future__ import absolute_import
import coral
import CommonUtils, IdGenerator, Node, DBImpl
from . import CommonUtils, IdGenerator, Node, DBImpl
class tagInventory(object):
"""Class manages tag inventory
"""
Expand Down

0 comments on commit b990fe2

Please sign in to comment.