commit 39f5316e9eba3885e0db2cbd1e1966bd1cad2a8a
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jul 18 16:24:31 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jul 19 17:22:51 2013 -0700
tree 7bde22878d45a32d748796964f9d7461258dbf6c
parent 0a15a2b79e38ab2cca294c50765d257b1495e80d

PyNDN: Finishing basic implementation of PyNDN emulation

Not yet fully tested

Refs #1010 (http://redmine.named-data.net/issues/1010)

PyNDN/Interest.py

diff --git a/PyNDN/Interest.py b/PyNDN/Interest.py
index ddafb65..be1eacc 100644
--- a/PyNDN/Interest.py
+++ b/PyNDN/Interest.py
@@ -19,18 +19,27 @@
 
 import ns.ndnSIM
 import ns.core
-import Name
+from Name import Name
 
 class Interest (object):
     _interest = None
 
-    def __init__(self, name = None, 
-                 scope = None, interestLifetime = None):
-        self._interest = ns.ndnSIM.ndn.Interest ()
+    def __init__(self,
+                 name = None, scope = None, interestLifetime = None,
+                 interest = None):
+        if interest:
+            if type (interest) is Interest:
+                self._interest = interest._interest
+            elif type (interest) is ns.ndnSIM.ndn.Interest:
+                self._interest = interest
+            else:
+                raise TypeError ("Invalid type supplied for 'interest' parameter [%s]" % type (interest))
+        else:
+            self._interest = ns.ndnSIM.ndn.Interest ()
         
-        self.name = name
-        self.scope = scope
-        self.interestLifetime = interestLifetime
+            self.name = name
+            self.scope = scope
+            self.interestLifetime = interestLifetime
 
     def __getattr__ (self, name):
         if name == "name":