commit fce5bbdcb4cc46135b3adaa534e014006f1fa368
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Aug 07 18:50:00 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Aug 07 18:50:00 2013 -0700
tree 5152c39b59a75962caf31b1c00b0282371c2bc80
parent b4921ec203e561092ee8a657049c4e7f1094abf4

PyNDN: Bug fixing and API unification

PyNDN/__init__.py

diff --git a/PyNDN/__init__.py b/PyNDN/__init__.py
index 0c0e288..2054d49 100644
--- a/PyNDN/__init__.py
+++ b/PyNDN/__init__.py
@@ -1,12 +1,12 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-# 
+#
 # Copyright (c) 2011-2013, Regents of the University of California
 #                          Alexander Afanasyev
-# 
+#
 # GNU 3.0 license, See the LICENSE file for more information
-# 
+#
 # Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
-# 
+#
 
 #
 # Based on PyCCN code, copyrighted and licensed as follows
@@ -17,7 +17,7 @@
 #             Jeff Burke <jburke@ucla.edu>
 #
 
-__all__ = ['Face', 'Name', 'Interest', 'Data', 'Key', 'ContentObject']
+__all__ = ['Face', 'Name', 'Interest', 'Data', 'Key', 'EventLoop']
 
 VERSION = 0.3
 NDNSIM = True
@@ -25,12 +25,22 @@
 import sys as _sys
 
 try:
-    from Face import Face, EventLoop
+    from Face import Face
     from Name import Name
     from Interest import Interest
-    from Data import Data, ContentObject, SignedInfo
+    from Data import Data
     from Key import Key
 
+    from EventLoop import EventLoop
+    from KeyLocator import KeyLocator
+    from SignedInfo import SignedInfo, CONTENT_DATA, CONTENT_ENCR, CONTENT_GONE, CONTENT_KEY, CONTENT_LINK, CONTENT_NACK
+    # no signature
+
+    # no NameCrypto
+    # no LocalPrefixDiscovery
+
+    import nre
+
 except ImportError:
     del _sys.modules[__name__]
     raise