rename protocols to protocol

rdpy/display/qt/adaptor.py

@@ -3,7 +3,7 @@ Created on 4 sept. 2013
 @author: sylvain
 '''
 from PyQt4 import QtGui
-from rdpy.protocols.rfb.observer import RfbObserver
+from rdpy.protocol.rfb.observer import RfbObserver
 
 class QAdaptor(object):
     '''

rdpy/main.py

@@ -5,9 +5,9 @@ Created on 4 sept. 2013
 '''
 import sys
 from PyQt4 import QtGui
-from rdpy.ui.qt import adaptor, widget
-from rdpy.protocols.rfb import rfb, factory
-from rdpy.protocols.rdp import tpkt, tpdu
+from rdpy.display.qt import adaptor, widget
+from rdpy.protocol.rfb import rfb, factory
+from rdpy.protocol.rdp import tpkt, tpdu
 from twisted.internet import ssl
 from OpenSSL import SSL
 

rdpy/protocol/rdp/tpdu.py

@@ -3,8 +3,8 @@ Created on 5 sept. 2013
 
 @author: sylvain
 '''
-from rdpy.protocols.common.layer import Layer
-from rdpy.protocols.common.stream import Stream
+from rdpy.protocol.common.layer import Layer
+from rdpy.protocol.common.stream import Stream
 class TPDU(Layer):
     '''
     classdocs

rdpy/protocol/rdp/tpkt.py

@@ -4,9 +4,9 @@ Created on 5 sept. 2013
 @author: sylvain
 '''
 
-from rdpy.protocols.common.protocolbuffer import ProtocolBuffer
-from rdpy.protocols.common.layer import Layer
-from rdpy.protocols.common.stream import Stream
+from rdpy.protocol.common.protocolbuffer import ProtocolBuffer
+from rdpy.protocol.common.layer import Layer
+from rdpy.protocol.common.stream import Stream
 class TPKT(ProtocolBuffer, Layer):
     '''
     classdocs

rdpy/protocol/rfb/rfb.py

@@ -4,8 +4,8 @@ Created on 12 aout 2013
 @author: sylvain
 '''
 
-from rdpy.protocols.common.stream import Stream
-from rdpy.protocols.common.protocolbuffer import ProtocolBuffer
+from rdpy.protocol.common.stream import Stream
+from rdpy.protocol.common.protocolbuffer import ProtocolBuffer
 from types import PixelFormat,ProtocolVersion,SecurityType, Rectangle, Encoding
 
 class Rfb(ProtocolBuffer):