Commit a00165b2 authored by Antoine Millet's avatar Antoine Millet
Browse files

Fixed relative imports to absolute import. 

See: http://www.python.org/dev/peps/pep-0328/#rationale-for-absolute-imports
parent b20c1fb0

ccserver/ccserver.py

+11 −7
Original line number Diff line number Diff line 
#!/usr/bin/env python

#coding=utf8



from __future__ import absolute_import



import logging

import socket

from copy import copy



from sjrpc.server import SimpleSslRpcServer

from handlers import WelcomeHandler

from conf import CCConf

from client import CCClient

from exceptions import AlreadyRegistered, NotConnectedAccountError

from orderedset import OrderedSet

from tql import TqlParser, TqlObject

from objectsdb import ObjectsDB



from ccserver.handlers import WelcomeHandler

from ccserver.conf import CCConf

from ccserver.client import CCClient

from ccserver.exceptions import AlreadyRegistered, NotConnectedAccountError

from ccserver.orderedset import OrderedSet

from ccserver.tql import TqlParser, TqlObject

from ccserver.objectsdb import ObjectsDB





class CCServer(object):

ccserver/handlers.py

+6 −4
Original line number Diff line number Diff line 
#!/usr/bin/env python

#coding=utf8



from __future__ import absolute_import



import inspect

import logging

from sjrpc.utils import RpcHandler, pure

from sjrpc.core import RpcError

from conf import CCConf

from exceptions import (AlreadyRegistered, AuthenticationError, RightError,

                        ReservedTagError, BadObjectError, BadRoleError,

                        NotConnectedAccountError)

from ccserver.conf import CCConf

from ccserver.exceptions import (AlreadyRegistered, AuthenticationError,

                                 RightError, ReservedTagError, BadObjectError,

                                 BadRoleError, NotConnectedAccountError)



def listed(func):

    func.__listed__ = True

ccserver/objectsdb.py

+5 −3
Original line number Diff line number Diff line
@@ -5,13 +5,15 @@ 
The current living objects database.

'''



from __future__ import absolute_import



from datetime import datetime, timedelta

import logging

from threading import RLock



from tql import TqlObject

from orderedset import OrderedSet

from exceptions import AlreadyRegistered

from ccserver.tql import TqlObject

from ccserver.orderedset import OrderedSet

from ccserver.exceptions import AlreadyRegistered



DEFAULT_TTL = 0

TTL_SERVER_DELTA = 2 # Delta to apply for all tags

ccserver/tql.py

+3 −1
Original line number Diff line number Diff line
@@ -5,9 +5,11 @@ 
    Tag Query Language tools module.

'''



from __future__ import absolute_import



import re

from fnmatch import fnmatch

from orderedset import OrderedSet

from ccserver.orderedset import OrderedSet



# Helpers functions: