Adapt to the change from dmlib to nexlibs

daemons/zwave/zwaved.py

@@ -6,8 +6,8 @@ from libopenzwave import PyManager
 from twisted.internet import epollreactor
 epollreactor.install()
 from twisted.internet import reactor
-from dmlib.daemonizer import Daemonizer
-from dmlib.utils.genutils import configFile
+from nexlibs.daemonizer import Daemonizer
+from nexlibs.utils.genutils import configFile
 import logging, time, sys, os
 from logging import handlers as loghandlers
 from corepost import Response, NotFoundException, AlreadyExistsException

domotika/asterisk/fastagi.py

@@ -34,7 +34,7 @@ from domotika.clouds.google import speech
 from domotika.clouds.responsivevoice import tts
 import tempfile
 from txscheduling.cron import CronSchedule, parseCronLine
-from dmlib.utils import genutils
+from nexlibs.utils import genutils
 
 log = logging.getLogger( 'FastAGI' )
 

domotika/boards/boardtype.py

@@ -25,15 +25,14 @@ import logging
 from dmlib import constants as C
 from zope.interface import implements
 import iboards
-from dmlib.utils import webutils as wu
+from nexlibs.utils import webutils as wu
 from twisted.internet import defer
-from dmlib import constants as C
 from twisted.web import microdom as xml
 from domotika.lang import lang
 from iotype import BoardAnalog, BoardInput, BoardOutput, BoardRelay
 from twisted.web import error
-from dmlib.utils.pwgen import GeneratePwd
-from dmlib.utils import genutils
+from nexlibs.utils.pwgen import GeneratePwd
+from nexlibs.utils import genutils
 from twisted.internet import reactor
 from domotika.db import dmdb
 import urllib

domotika/clouds/google/speech.py

@@ -22,7 +22,7 @@
 ##############################################################################
 
 import urllib
-from dmlib.utils import webutils as web
+from nexlibs.utils import webutils as web
 from twisted.internet import reactor
 import tempfile
 from twisted.internet import defer

domotika/clouds/google/tts.py

@@ -22,7 +22,7 @@
 ##############################################################################
 
 import urllib
-from dmlib.utils import webutils as web
+from nexlibs.utils import webutils as web
 from twisted.internet import reactor
 import tempfile
 from twisted.internet import defer

domotika/clouds/openweathermap/weather.py

@@ -22,7 +22,7 @@
 ##############################################################################
 
 from twisted.internet import defer, reactor, task
-from dmlib.utils import webutils as wu
+from nexlibs.utils import webutils as wu
 import json
 import logging
 from domotika.db import dmdb

domotika/clouds/responsivevoice/tts.py

@@ -22,7 +22,7 @@
 ##############################################################################
 
 import urllib
-from dmlib.utils import webutils as web
+from nexlibs.utils import webutils as web
 from twisted.internet import reactor
 import tempfile
 from twisted.internet import defer

domotika/db/dmdb.py

@@ -29,7 +29,7 @@ import time
 from twisted.internet import defer, reactor
 import logging
 from dmlib import dmdomain
-from dmlib.utils import genutils
+from nexlibs.utils import genutils
 from MySQLdb.converters import conversions
 
 from twistar.dbconfig.base import InteractionBase

domotika/domotika.py

@@ -23,8 +23,8 @@
 
 from twisted.application import service
 from twisted.internet import defer, reactor, task, protocol, threads
-from dmlib.utils.genutils import configFile, FakeObject, ConvenienceCaller
-from dmlib.utils import genutils
+from nexlibs.utils.genutils import configFile, FakeObject, ConvenienceCaller
+from nexlibs.utils import genutils
 from lang import lang
 import logging, sys, os
 from web import web
@@ -35,7 +35,7 @@ from web import proxy, mediaproxy
 from twisted.web import microdom as xml
 from singleton import clients, sequences, crontabs, statuses, messengerlinks
 from singleton import oldboards as oldb
-from dmlib.utils import webutils as wu
+from nexlibs.utils import webutils as wu
 from dmlib import constants as C
 from db import dmdb 
 import time

domotika/events.py

@@ -24,7 +24,7 @@
 import logging
 log = logging.getLogger( 'Core' )
 
-from dmlib.singleton import Singleton
+from nexlibs.singleton import Singleton
 
 class EventListenersRegistry(Singleton):
    registry={}

domotika/ikapserver.py

@@ -29,16 +29,16 @@ import sys
 from socket import SOL_SOCKET, SO_BROADCAST, AF_INET, SOCK_DGRAM, socket
 import IN
 import struct
-from dmlib.dmcrypt import AES256
-from dmlib import dmcrypt
+from nexlibs.dmcrypt import AES256
+from nexlibs import nexcrypt as dmcrypt
 import logging
 from dmlib import constants as C
 from dmlib import ikaprotocol as proto
-from dmlib.utils.genutils import revlist, isTrue
+from nexlibs.utils.genutils import revlist, isTrue
 import copy
 from singleton import oldboards as oldb
 from singleton import Singleton
-from dmlib.utils import pwgen
+from nexlibs.utils import pwgen
 
 log = logging.getLogger( 'IKAPServer' )
 

domotika/mediasources/modules/OpenPLI/enigma1.py

@@ -27,7 +27,7 @@ from domotika.db import dmdb
 from domotika.lang import lang
 from zope.interface import implements
 from twisted.plugin import IPlugin
-from dmlib.utils import webutils as wu
+from nexlibs.utils import webutils as wu
 from twisted.internet import defer
 from dmlib import constants as C
 import logging

domotika/mediasources/modules/Sitecom/LN406.py

@@ -27,7 +27,7 @@ from domotika.db import dmdb
 from domotika.lang import lang
 from zope.interface import implements
 from twisted.plugin import IPlugin
-from dmlib.utils import webutils as wu
+from nexlibs.utils import webutils as wu
 from twisted.internet import defer
 from dmlib import constants as C
 import logging

domotika/parsers.py

@@ -22,7 +22,7 @@
 ##############################################################################
 
 
-from dmlib.utils import genutils
+from nexlibs.utils import genutils
 from twisted.internet import defer
 from db import dmdb
 from dmlib import dmdomain

domotika/plugins.py

@@ -23,7 +23,7 @@
 
 from twisted.internet import reactor, protocol, task
 from db import dmdb as dmdb
-from dmlib.singleton import Singleton
+from nexlibs.singleton import Singleton
 import time
 import os, sys, logging, traceback
 import base64

domotika/singleton/__init__.py

@@ -21,4 +21,4 @@
 #
 ##############################################################################
 
-from dmlib.singleton import *
+from nexlibs.singleton import *

domotika/singleton/clients.py

@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-from dmlib.singleton import Singleton
+from nexlibs.singleton import Singleton
 import time
 
 

domotika/singleton/crontabs.py

@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-from dmlib.singleton import Singleton
+from nexlibs.singleton import Singleton
 import time
 
 

domotika/singleton/mediaclients.py

@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-from dmlib.singleton import Singleton
+from nexlibs.singleton import Singleton
 
 
 class MediaClientsRegister(Singleton):

domotika/singleton/mediaproducers.py

@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-from dmlib.singleton import Singleton
+from nexlibs.singleton import Singleton
 
 
 class MediaProducersRegister(Singleton):

domotika/singleton/oldboards.py

@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-from dmlib.singleton import Singleton
+from nexlibs.singleton import Singleton
 
 
 class OldBoardsRegister(Singleton):

domotika/singleton/sequences.py

@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-from dmlib.singleton import Singleton
+from nexlibs.singleton import Singleton
 import time
 
 

domotika/singleton/statuses.py

@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-from dmlib.singleton import Singleton
+from nexlibs.singleton import Singleton
 import time
 
 

domotika/upnp.py

@@ -22,7 +22,7 @@
 ##############################################################################
 
 from coherence.base import Coherence
-from dmlib.utils import webutils as wu
+from nexlibs.utils import webutils as wu
 import logging
 from twisted.web import microdom as xml
 #import traceback

domotika/web/auth.py

@@ -39,7 +39,7 @@ except:
    import md5
    import sha1
 
-from dmlib.utils import genutils
+from nexlibs.utils import genutils
 
 
 log = logging.getLogger("Webgui")

domotika/web/bot.py

@@ -29,7 +29,7 @@ from corepost.web import RESTResource, route, Http
 from corepost.convert import convertToJson
 from corepost.enums import MediaType, HttpHeader
 
-from dmlib.utils import webutils as wu
+from nexlibs.utils import webutils as wu
 
 import hashlib
 import hmac

domotika/web/common.py

@@ -35,7 +35,7 @@ except:
    import md5
    import sha1
 import logging
-from dmlib.utils.blockingdefer import blockingDeferred
+from nexlibs.utils.blockingdefer import blockingDeferred
 import cgi, logging
 from zope.interface import implements
 from twisted.cred import portal, checkers, credentials

domotika/web/mediaproxy.py

@@ -31,7 +31,7 @@ from nevow import inevow, rend, tags, loaders, flat, athena, stan, guard
 from twisted.web import resource, static
 from common import permissionDenied
 from twisted.web.server import NOT_DONE_YET
-from dmlib.utils import webutils as wu
+from nexlibs.utils import webutils as wu
 import urllib
 from urlparse import urlsplit, urlparse
 from urllib import quote as urlquote

domotika/web/proxy.py

@@ -30,7 +30,7 @@ from twisted.web import resource, static
 from common import permissionDenied
 from twisted.web.server import NOT_DONE_YET
 from domotika.db import dmdb as dmdb
-from dmlib.utils import webutils as wu
+from nexlibs.utils import webutils as wu
 import urllib
 from urlparse import urlsplit, urlparse
 from urllib import quote as urlquote

domotika/web/rest.py

@@ -35,7 +35,7 @@ import yaml
 
 from functools import wraps, partial
 from twisted.web.http import Request
-from dmlib.utils import genutils 
+from nexlibs.utils import genutils 
 
 import logging, os, sys
 

domotika/web/sse.py

@@ -27,7 +27,7 @@ from twisted.web import server
 from zope.interface import implements
 from corepost.convert import convertForSerialization, generateXml, convertToJson
 import logging, time
-from dmlib.utils import genutils
+from nexlibs.utils import genutils
 
 log = logging.getLogger( 'Webgui' )
 

domotika/web/web.py

@@ -22,7 +22,7 @@
 ##############################################################################
 
 from twisted.web import server, resource, static, client
-from dmlib import dmcrypt
+from nexlibs import nexcrypt as dmcrypt
 try:
    from twisted.web import http
 except ImportError:
@@ -40,8 +40,8 @@ except:
    import sha1
 import urllib
 import logging
-from dmlib.utils.blockingdefer import blockingDeferred
-from dmlib.utils import genutils 
+from nexlibs.utils.blockingdefer import blockingDeferred
+from nexlibs.utils import genutils 
 import cgi, logging
 from zope.interface import implements
 from twisted.cred import portal, checkers, credentials
@@ -55,7 +55,7 @@ from twisted.internet import defer
 from nevow import appserver
 import time
 import auth
-from dmlib.utils.genutils import configFile
+from nexlibs.utils.genutils import configFile
 import phpserialize
 
 log = logging.getLogger( 'Webgui' )

domotikad

@@ -30,9 +30,9 @@ from twisted.internet import reactor, ssl, protocol, endpoints
 from twisted.application import service, internet, app, reactors
 from twisted.web import server #, soap
 import logging, time, sys, os
-from dmlib.daemonizer import Daemonizer
+from nexlibs.daemonizer import Daemonizer
 from domotika import domotika
-from dmlib.utils.genutils import configFile
+from nexlibs.utils.genutils import configFile
 from logging import handlers as loghandlers
 
 try:

plugins/krb_xbee/krbXbee.py

@@ -26,7 +26,7 @@ from twisted.internet.protocol import Factory
 from twisted.internet.endpoints import TCP4ServerEndpoint, TCP4ClientEndpoint
 from domotika.plugins import BasePlugin
 import base64, os, sys
-from dmlib.utils.genutils import configFile
+from nexlibs.utils.genutils import configFile
 from domotika.db import dmdb
 from dmlib import dmdomain
 import time

plugins/stats/stats.py

@@ -24,7 +24,7 @@
 from twisted.internet import reactor, stdio, task, defer
 from domotika.plugins import BasePlugin
 import base64, os, sys
-from dmlib.utils.genutils import configFile
+from nexlibs.utils.genutils import configFile
 from domotika.db import dmdb
 from dmlib import dmdomain
 import time