from __future__ imports

docstring corrections
xxx_ for extensions of existing packages

Author: tomvanmele

src/compas/cad/__init__.py

@@ -53,7 +53,7 @@ class MeshGeometryInterface(GeometryInterface):
 
 
 # ==============================================================================
-# Testing
+# Main
 # ==============================================================================
 
 if __name__ == "__main__":

src/compas/com/__init__.py

@@ -8,9 +8,6 @@
 .. module:: compas.com
 
 
-Interface(s) for communication with external software.
-
-
 Matlab
 ======
 
@@ -49,11 +46,11 @@ class Client(object):
     pass
 
 
-from .matlab import *
+from .matlab_ import *
 from .ssh import *
 # from .rhino import *
 
-from .matlab import __all__ as a
+from .matlab_ import __all__ as a
 from .ssh import __all__ as b
 # from .rhino import __all__ as b
 

src/compas/com/matlab/__init__.py renamed to src/compas/com/matlab_/__init__.py

@@ -1,11 +1,13 @@
 from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
+
+import sys
 
 try:
     import System
 except ImportError:
-    import platform
-    if platform.python_implementation() == 'IronPython':
+    if 'ironpython' in sys.version.lower():
         raise
 
 
@@ -327,7 +329,7 @@ def get(self, name):
 
 
 # ==============================================================================
-# Testing
+# Main
 # ==============================================================================
 
 if __name__ == "__main__":

src/compas/com/matlab/client.py renamed to src/compas/com/matlab_/client.py

@@ -1,5 +1,6 @@
 from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
 
 
 __author__     = ['Tom Van Mele <vanmelet@ethz.ch>', ]
@@ -177,7 +178,7 @@ def connect(self, name=None):
 
 
 # ==============================================================================
-# Testing
+# Main
 # ==============================================================================
 
 if __name__ == "__main__":

src/compas/com/matlab/engine.py renamed to src/compas/com/matlab_/engine.py

@@ -1,6 +1,8 @@
 from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
 
+import sys
 import time
 
 from subprocess import Popen
@@ -10,10 +12,9 @@
     from scipy.io import savemat
     from scipy.io import loadmat
 except ImportError:
-    pass
-    # import platform
-    # if platform.python_implementation() != 'IronPython':
-    #     raise
+    if 'ironpython' not in sys.version.lower():
+        raise
+
 
 __author__     = ['Tom Van Mele <vanmelet@ethz.ch>', ]
 __copyright__  = 'Copyright 2014, Block Research Group - ETH Zurich'
@@ -182,7 +183,7 @@ def read_workspace(self):
 
 
 # ==============================================================================
-# Testing
+# Main
 # ==============================================================================
 
 if __name__ == "__main__":

src/compas/com/matlab/process.py renamed to src/compas/com/matlab_/process.py

@@ -1,5 +1,6 @@
 from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
 
 
 __author__     = ['Tom Van Mele <vanmelet@ethz.ch>', ]
@@ -88,7 +89,7 @@ def connect(self, name=None):
 
 
 # ==============================================================================
-# Testing
+# Main
 # ==============================================================================
 
 if __name__ == "__main__":

src/compas/com/matlab/session.py renamed to src/compas/com/matlab_/session.py

@@ -1,4 +1,6 @@
 from __future__ import print_function
+from __future__ import absolute_import
+from __future__ import division
 
 import time
 
@@ -7,7 +9,7 @@
     from comtypes.client import GetModule
 except ImportError:
     import platform
-    if platform.python_implementation() == 'IronPython':
+    if 'windows' in platform.system().lower():
         raise
 
 
@@ -61,16 +63,33 @@ def wrapper(*args, **kwargs):
             raise RhinoClientError()
 
     def start(self):
-        self.app = CreateObject('Rhino5.Application')
-        self.rsm = GetModule(['{75B1E1B4-8CAA-43C3-975E-373504024FDB}', 1, 0])
+        # self.rsm = GetModule(['{75B1E1B4-8CAA-43C3-975E-373504024FDB}', 1, 0])
+        # self.rsm = GetModule(['{1C7A3523-9A8F-4CEC-A8E0-310F580536A7}', 1, 0])
+        # self.rsm = GetModule(['{814d908a-e25c-493d-97e9-ee3861957f49}', 1, 0])
+        # self.rsm = GetModule(['{8ABB4303-8057-47AD-BAEB-263965E5565D}', 1, 0])
+        # self.rsm = GetModule(['{75B1E1B4-8CAA-43C3-975E-373504024FDB}', 1, 0])
+        R = GetModule(r"C:\Program Files\Rhinoceros 5\System\Rhino5.tlb")
+        RS = GetModule(r"C:\Program Files\Rhinoceros 5\Plug-ins\RhinoScript.tlb")
+
+        print(dir(R))
+        print(dir(RS))
+
         print('loading script interface...')
+
         attempts = 20
+
+        self.app = CreateObject('Rhino5x64.Application')
+
         while attempts:
             try:
                 print('attempt %s' % attempts)
-                self.rsi = self.app.GetScriptObject.QueryInterface(self.rsm.IRhinoScript)
+                # self.rsi = self.app.GetScriptObject.QueryInterface(self.rsm.IRhinoScript)
+                # self.rsi = self.app.QueryInterface(self.rsm.IRhino5x64Application).GetScriptObject()
+                o = self.app.QueryInterface(R.IRhino5x64Interface).GetScriptObject()
+                self.rsi = o.QueryInterface(RS.IRhinoScript)
                 break
-            except Exception:
+            except Exception as e:
+                print(e)
                 time.sleep(0.5)
             attempts -= 1
         if self.rsi is None:
@@ -89,8 +108,10 @@ def wait(self):
 
 
 # ==============================================================================
-# Testing
+# Main
 # ==============================================================================
 
 if __name__ == "__main__":
-    pass
+
+    client = RhinoClient()
+    client.rsi.AddPoint([0, 0, 0])

src/compas/com/rhino/client.py

@@ -141,7 +141,7 @@ def server_command(client, command):
 
 
 # ==============================================================================
-# Testing
+# Main
 # ==============================================================================
 
 if __name__ == '__main__':

src/compas/com/ssh/ssh.py

@@ -14,18 +14,9 @@
 
     Mesh
     Network
+    FaceNetwork
     VolMesh
 
-Mesh
-====
-
-Network
-=======
-
-VolMesh
-=======
-
-
 """
 
 from __future__ import print_function