Changeset 7663:c86f9280b9d1

Timestamp:

11/30/07 20:12:32 (5 years ago)

Author:

Yi Qiang <yqiang@…>

Branch:

default

Message:

Cleaned up BlockingDSage to use inheritance, fixed import of dsage.

Location:

sage/dsage

Files:

• all.py (modified) (2 diffs)
• interface/dsage_interface.py (modified) (5 diffs)

sage/dsage/all.py

@@ -23 +23 @@
 from sage.dsage.dist_functions.all import *
 from sage.dsage.misc.constants import DSAGE_DIR
+from sage.dsage.dsage import *
 
 def DSage(server='localhost', port=8081, 
@@ -47 +48 @@
     return BlockingDSage(server=server, port=port, username=username,
                          pubkey_file=pubkey_file, privkey_file=privkey_file,
-                         log_leve=log_level, ssl=ssl)
+                         log_level=log_level, ssl=ssl)
 

sage/dsage/interface/dsage_interface.py

@@ -33 +33 @@
 
 class DSageThread(threading.Thread):
+    """
+    DSage thread
+    
+    """
     def run(self):
         from twisted.internet import reactor
@@ -43 +47 @@
                 # during shutdown that one sees doing doctests (on some
                 # systems?).
-
- 
-
+    
+    
 class DSage(object):
     """
@@ -83 +86 @@
         self.remoteobj = None
         self.result = None
+        self.jobs = []
         self.info_str = 'Connected to: %s:%s'
+        
         # public key authentication information
         self.pubkey_str = keys.getPublicKeyString(filename=self.pubkey_file)
@@ -105 +110 @@
                                                self.data,
                                                self.signature)
-
-        self.jobs = []
-
         self.connect()
+
 
     def __repr__(self):
@@ -364 +367 @@
                  log_level=0,
                  ssl=True):
-                 
-        from twisted.cred import credentials
-        from twisted.conch.ssh import keys
-        from twisted.spread import banana
-        banana.SIZE_LIMIT = 100*1024*1024 # 100 MegaBytes
-        
-        self.server = server
-        self.port = port
-        self.username = username
-        self.data = random_str(500)
-        self.ssl = ssl
-        self.log_level = log_level
-        self.privkey_file = privkey_file
-        self.pubkey_file = pubkey_file
-        self.remoteobj = None
-        self.result = None 
-
-        # public key authentication information
-        self.pubkey_str = keys.getPublicKeyString(filename=self.pubkey_file)
-        
-        # try getting the private key object without a passphrase first
-        try:
-            self.priv_key = keys.getPrivateKeyObject(
-                                filename=self.privkey_file)
-        except keys.BadKeyError:
-            passphrase = self._getpassphrase()
-            self.priv_key = keys.getPrivateKeyObject(
-                            filename=self.privkey_file,
-                            passphrase=passphrase)
-            
-        self.pub_key = keys.getPublicKeyObject(self.pubkey_str)
-        self.algorithm = 'rsa'
-        self.blob = keys.makePublicKeyBlob(self.pub_key)
-        self.signature = keys.signData(self.priv_key, self.data)
-        self.creds = credentials.SSHPrivateKey(self.username,
-                                               self.algorithm, 
-                                               self.blob, 
-                                               self.data,
-                                               self.signature)
-
         self.dsage_thread = DSageThread()
         self.dsage_thread.setDaemon(False)
         self.dsage_thread.start()
-        self.connect()
+        
+        DSage.__init__(self, server=server, port=port, username=username,
+                       pubkey_file=pubkey_file, privkey_file=privkey_file,
+                       log_level=log_level, ssl=ssl)
         
     def connect(self):