Changeset 10468

Timestamp:

10/25/10 10:52:47 (3 years ago)

Author:

Snyder.Jason

Message:

changed getInterfaces to try the 2 argument version of compile, then use the 1 argument version if the 2 argument version fails, rather than checking the omniORB version number

Files:

• ossiedev/trunk/tools/WaveDev/wavedev/importIDL.py (modified) (1 diff)

ossiedev/trunk/tools/WaveDev/wavedev/importIDL.py

@@ -123 +123 @@
   f = os.popen(main.preprocessor_cmd + ' -I "/usr/local/include" -I "/usr/local/include/ossie" -I "/usr/include" "' \
                + filename + '"','r')
-  if omniORB._coreVersion == "4.1.4":
+  try:
       tree = _omniidl.compile(f, filename)
-  else:
+  except TypeError:
       tree = _omniidl.compile(f)
+      
   ints = run(tree,'')
   f.close()