Menu
▾
▴
[Pyscard-devel] SF.net SVN: pyscard:[538] trunk/pyscard/src/smartcard/pyro/server
|
From: <lu...@us...> - 2011-07-01 13:32:30
|
Revision: 538
http://pyscard.svn.sourceforge.net/pyscard/?rev=538&view=rev
Author: ludov
Date: 2011-07-01 13:32:23 +0000 (Fri, 01 Jul 2011)
Log Message:
-----------
Fix PEP8 warnings
Modified Paths:
--------------
trunk/pyscard/src/smartcard/pyro/server/PyroEventServer.py
trunk/pyscard/src/smartcard/pyro/server/PyroNameServer.py
trunk/pyscard/src/smartcard/pyro/server/RemoteCardConnection.py
trunk/pyscard/src/smartcard/pyro/server/RemoteReaderServer.py
Modified: trunk/pyscard/src/smartcard/pyro/server/PyroEventServer.py
===================================================================
--- trunk/pyscard/src/smartcard/pyro/server/PyroEventServer.py 2011-07-01 13:23:46 UTC (rev 537)
+++ trunk/pyscard/src/smartcard/pyro/server/PyroEventServer.py 2011-07-01 13:32:23 UTC (rev 538)
@@ -32,40 +32,42 @@
import Pyro.nsc
import Pyro.util
+
class PyroEventServer(Thread):
"""Thread running the Pyro Event server.
"""
- def __init__(self,args=[]):
+ def __init__(self, args=[]):
"""Initialize pyro event server with command line arguments.
For a complete list of command line arguments, see pyro documentation
for pyro-es start script."""
- Thread.__init__( self )
- self.setDaemon( True )
- self.setName( 'smartcard.pyro.server.PyroEventServer' )
+ Thread.__init__(self)
+ self.setDaemon(True)
+ self.setName('smartcard.pyro.server.PyroEventServer')
self.args = args
- self.handler = signal.signal( signal.SIGINT, self )
+ self.handler = signal.signal(signal.SIGINT, self)
self.starter = None
def run(self):
- """Starts Pyro naming server with command line arguments (see pyro documentation)
- """
- args=[]
- for arg in self.args: args.append(arg)
+ """Starts Pyro naming server with command line arguments (see
+ pyro documentation) """
+ args = []
+ for arg in self.args:
+ args.append(arg)
Args = Pyro.util.ArgParser()
- Args.parse(args,'hkmrvxn:p:b:c:d:s:i:1:2:')
+ Args.parse(args, 'hkmrvxn:p:b:c:d:s:i:1:2:')
- hostname = Args.getOpt('n',None)
- identification = Args.getOpt('i',None)
+ hostname = Args.getOpt('n', None)
+ identification = Args.getOpt('i', None)
port = None
useNameServer = True
if port:
- port=int(port)
- norange = (port==0)
+ port = int(port)
+ norange = (port == 0)
self.starter = Pyro.EventService.Server.EventServiceStarter(identification=identification)
- self.starter.start(hostname,port,useNameServer=useNameServer,norange=norange)
+ self.starter.start(hostname, port, useNameServer=useNameServer, norange=norange)
def stop(self):
"""Shutdown pyro event server."""
@@ -75,7 +77,7 @@
"""wait until name server is started."""
started = False
while not started:
- if self.starter!=None:
+ if self.starter != None:
started = self.starter.waitUntilStarted(0.5)
def __call__(self, signame, sf):
@@ -84,7 +86,7 @@
print 'PyroEventServer Ctrl+C handler'
self.stop()
time.sleep(1)
- self.handler( signame, sf )
+ self.handler(signame, sf)
if __name__ == '__main__':
@@ -99,5 +101,3 @@
pn.listall()
pe.stop()
pn.stop()
-
-
Modified: trunk/pyscard/src/smartcard/pyro/server/PyroNameServer.py
===================================================================
--- trunk/pyscard/src/smartcard/pyro/server/PyroNameServer.py 2011-07-01 13:23:46 UTC (rev 537)
+++ trunk/pyscard/src/smartcard/pyro/server/PyroNameServer.py 2011-07-01 13:32:23 UTC (rev 538)
@@ -31,62 +31,69 @@
import Pyro.nsc
import Pyro.util
+
class PyroNameServer(Thread):
"""Thread running the Pyro Name server.
"""
- def __init__(self,args=[]):
+ def __init__(self, args=[]):
"""Initialize pyro name server with command line arguments.
For a complete list of command line arguments, see pyro documentation
for pyro-ns start script."""
- Thread.__init__( self )
- self.setDaemon( True )
- self.setName( 'smartcard.pyro.server.PyroNameServer' )
+ Thread.__init__(self)
+ self.setDaemon(True)
+ self.setName('smartcard.pyro.server.PyroNameServer')
self.args = args
- self.handler = signal.signal( signal.SIGINT, self )
+ self.handler = signal.signal(signal.SIGINT, self)
- _args=[]
- for arg in self.args: _args.append(arg)
+ _args = []
+ for arg in self.args:
+ _args.append(arg)
Args = Pyro.util.ArgParser()
- Args.parse(_args,'hkmrvxn:p:b:c:d:s:i:1:2:')
- self.host = Args.getOpt('n',None)
- self.bcport = Args.getOpt('b',None)
- self.bcaddr = Args.getOpt('c',None)
- self.identification = Args.getOpt('i',None)
+ Args.parse(_args, 'hkmrvxn:p:b:c:d:s:i:1:2:')
+ self.host = Args.getOpt('n', None)
+ self.bcport = Args.getOpt('b', None)
+ self.bcaddr = Args.getOpt('c', None)
+ self.identification = Args.getOpt('i', None)
def getShutdownArgs(self):
"""return command line arguments for shutting down the
server; this command line is built from the name server
startup arguments."""
shutdownArgs = []
- if self.host: shutdownArgs += [ '-h', self.host ]
- if self.bcport: shutdownArgs += [ '-p', self.bcport ]
- if self.bcaddr: shutdownArgs += [ '-c', self.bcaddr ]
- if self.identification: shutdownArgs += [ '-i', self.identification ]
+ if self.host:
+ shutdownArgs += ['-h', self.host]
+ if self.bcport:
+ shutdownArgs += ['-p', self.bcport]
+ if self.bcaddr:
+ shutdownArgs += ['-c', self.bcaddr]
+ if self.identification:
+ shutdownArgs += ['-i', self.identification]
return shutdownArgs
def listall(self):
"""List pyro namespace."""
args = self.getShutdownArgs() + ['listall']
- Pyro.nsc.main( args )
+ Pyro.nsc.main(args)
def ping(self):
"""Ping pyro naming server."""
args = self.getShutdownArgs() + ['ping']
- Pyro.nsc.main( args )
+ Pyro.nsc.main(args)
def run(self):
"""Starts Pyro naming server with command line arguments (see pyro documentation)
"""
- args=[]
- for arg in self.args: args.append(arg)
- Pyro.naming.main( args )
+ args = []
+ for arg in self.args:
+ args.append(arg)
+ Pyro.naming.main(args)
def stop(self):
"""Shutdown pyro naming server."""
args = self.getShutdownArgs() + ['shutdown']
- Pyro.nsc.main( args )
+ Pyro.nsc.main(args)
self.join()
def waitStarted(self):
@@ -95,7 +102,7 @@
while not ns:
try:
time.sleep(3)
- ns=Pyro.naming.NameServerLocator(identification=self.identification).getNS()
+ ns = Pyro.naming.NameServerLocator(identification=self.identification).getNS()
except Pyro.errors.NamingError as er:
pass
@@ -105,14 +112,12 @@
print 'PyroNameServer Ctrl+C handler'
self.stop()
time.sleep(1)
- self.handler( signame, sf )
+ self.handler(signame, sf)
if __name__ == '__main__':
import sys
- pt = PyroNameServer( sys.argv[1:] )
+ pt = PyroNameServer(sys.argv[1:])
pt.start()
pt.waitStarted()
pt.stop()
-
-
Modified: trunk/pyscard/src/smartcard/pyro/server/RemoteCardConnection.py
===================================================================
--- trunk/pyscard/src/smartcard/pyro/server/RemoteCardConnection.py 2011-07-01 13:23:46 UTC (rev 537)
+++ trunk/pyscard/src/smartcard/pyro/server/RemoteCardConnection.py 2011-07-01 13:32:23 UTC (rev 538)
@@ -31,14 +31,15 @@
from smartcard.Exceptions import CardConnectionException, NoCardException
from smartcard.Observer import Observable
-class RemoteCardConnection(CardConnectionDecorator,Pyro.core.ObjBase):
- """Remote connection class. Handles connection with a card inserted inside a remote PC."""
+class RemoteCardConnection(CardConnectionDecorator, Pyro.core.ObjBase):
+ """Remote connection class. Handles connection with a card inserted
+ inside a remote PC."""
+
def __init__(self, cardConnectionComponent):
"""Construct a new remote card connection.
connection: the reader connection
"""
Pyro.core.ObjBase.__init__(self)
- CardConnectionDecorator.__init__( self, cardConnectionComponent )
-
+ CardConnectionDecorator.__init__(self, cardConnectionComponent)
Modified: trunk/pyscard/src/smartcard/pyro/server/RemoteReaderServer.py
===================================================================
--- trunk/pyscard/src/smartcard/pyro/server/RemoteReaderServer.py 2011-07-01 13:23:46 UTC (rev 537)
+++ trunk/pyscard/src/smartcard/pyro/server/RemoteReaderServer.py 2011-07-01 13:32:23 UTC (rev 538)
@@ -1,4 +1,4 @@
-"""RemoteReaderServer: monitor local readers and publish them as pyro
+"""RemoteReaderServer: monitor local readers and publish them as pyro
Remote Readers.
__author__ = "gemalto http://www.gemalto.com"
@@ -41,10 +41,11 @@
from smartcard.pyro.server import PyroDaemon
from smartcard.pyro.server import PyroNameServer
-class RemoteReader(Reader,Pyro.core.ObjBase):
+
+class RemoteReader(Reader, Pyro.core.ObjBase):
"""Remote reader class that embeds a local reader."""
- def __init__(self,reader):
+ def __init__(self, reader):
"""Encapsulate a local reader and publish as a pyro remote reader.
reader: the local reader to publish remotely
@@ -53,23 +54,22 @@
self.readerobj = reader
self.name = reader.name
- def addtoreadergroup( self, groupname ):
+ def addtoreadergroup(self, groupname):
"""Add reader to a reader group."""
- self.readerobj.reader.addtoreadergroup( groupname )
+ self.readerobj.reader.addtoreadergroup(groupname)
- def removefromreadergroup( self, groupname ):
+ def removefromreadergroup(self, groupname):
"""Remove a reader from a reader group"""
- self.readerobj.reader.removefromreadergroup( groupname )
+ self.readerobj.reader.removefromreadergroup(groupname)
- def createConnection( self ):
+ def createConnection(self):
"""Return a card connection thru the reader."""
- connection = RemoteCardConnection( self.readerobj.createConnection() )
+ connection = RemoteCardConnection(self.readerobj.createConnection())
daemon = PyroDaemon.PyroDaemon()
uri = daemon.connect(connection)
return uri
-
class RemoteReaderServer(ReaderObserver):
"""Monitor local readers, and publish them as remote pyro readers.
"""
@@ -78,9 +78,9 @@
self.pn = PyroNameServer.PyroNameServer()
self.pn.start()
self.pn.waitStarted()
-
+
Pyro.core.initServer()
- self.ns=Pyro.naming.NameServerLocator().getNS()
+ self.ns = Pyro.naming.NameServerLocator().getNS()
try:
self.ns.createGroup(':pyscard')
self.ns.createGroup(':pyscard.smartcard')
@@ -93,7 +93,6 @@
def start(self):
"""Start pyro daemon and accept incoming requests."""
self.daemon.start()
-
def update(self, observable, (addedreaders, removedreaders)):
"""Called when a local reader is added or removed.
@@ -103,8 +102,8 @@
remotereader = RemoteReader(reader)
self.remotereaders[reader.name] = remotereader
name = "".join(reader.name.split(' '))
- name = ":pyscard.smartcard.readers."+"".join(name.split('.'))
- uri = self.daemon.connect(remotereader,name)
+ name = ":pyscard.smartcard.readers." + "".join(name.split('.'))
+ uri = self.daemon.connect(remotereader, name)
for reader in removedreaders:
remotereader = self.remotereaders[reader.name]
self.daemon.disconnect(remotereader)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
