Author: aschnell Date: Fri May 15 17:01:25 2009 New Revision: 57198 URL: http://svn.opensuse.org/viewcvs/yast?rev=57198&view=rev Log: - updated Modified: trunk/storage/libstorage/bindings/python/LibStorage.i trunk/storage/libstorage/bindings/python/Makefile trunk/storage/libstorage/bindings/python/example.py Modified: trunk/storage/libstorage/bindings/python/LibStorage.i URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/python/LibStorage.i?rev=57198&r1=57197&r2=57198&view=diff ============================================================================== --- trunk/storage/libstorage/bindings/python/LibStorage.i (original) +++ trunk/storage/libstorage/bindings/python/LibStorage.i Fri May 15 17:01:25 2009 @@ -6,15 +6,18 @@ %{ #include "../../src/StorageInterface.h" +#include "../../src/HumanString.h" +#include "../../src/Graph.h" %} using namespace std; %include "std_string.i" %include "std_deque.i" +%include "std_list.i" %typemap(out) std::string* { - $result = PyString_FromString ($1->c_str ()); + $result = PyString_FromString($1->c_str()); } %include "../../src/StorageInterface.h" Modified: trunk/storage/libstorage/bindings/python/Makefile URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/python/Makefile?rev=57198&r1=57197&r2=57198&view=diff ============================================================================== --- trunk/storage/libstorage/bindings/python/Makefile (original) +++ trunk/storage/libstorage/bindings/python/Makefile Fri May 15 17:01:25 2009 @@ -9,7 +9,10 @@ LibStorage.pyo: LibStorage_wrap.cxx python -O -c "import LibStorage" -LibStorage_wrap.cxx: LibStorage.i ../../src/StorageInterface.h +LibStorage_wrap.cxx: LibStorage.i \ + ../../src/StorageInterface.h \ + ../../src/HumanString.h \ + ../../src/Graph.h swig -Wall -c++ -python LibStorage.i g++ -c -I/usr/include/python -O2 -fPIC -pipe LibStorage_wrap.cxx g++ -shared LibStorage_wrap.o -o _LibStorage.so -ly2storage Modified: trunk/storage/libstorage/bindings/python/example.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/bindings/python/example.py?rev=57198&r1=57197&r2=57198&view=diff ============================================================================== --- trunk/storage/libstorage/bindings/python/example.py (original) +++ trunk/storage/libstorage/bindings/python/example.py Fri May 15 17:01:25 2009 @@ -3,11 +3,13 @@ import LibStorage -c = LibStorage.createStorageInterface (1, 0, 1) +env = LibStorage.Environment(1) +c = LibStorage.createStorageInterface(env) -containers = LibStorage.dequecontainerinfo () -c.getContainers (containers) + +containers = LibStorage.dequecontainerinfo() +c.getContainers(containers) for container in containers: @@ -15,12 +17,12 @@ if container.type == LibStorage.DISK: - diskinfo = LibStorage.DiskInfo () - c.getDiskInfo (container.name, diskinfo) + diskinfo = LibStorage.DiskInfo() + c.getDiskInfo(container.name, diskinfo) print " ", diskinfo.sizeK - partitioninfos = LibStorage.dequepartitioninfo () - c.getPartitionInfo (container.name, partitioninfos) + partitioninfos = LibStorage.dequepartitioninfo() + c.getPartitionInfo(container.name, partitioninfos) for partitioninfo in partitioninfos: print " ", partitioninfo.v.device, partitioninfo.v.sizeK, \ @@ -28,20 +30,20 @@ if container.type == LibStorage.LVM: - lvmvginfo = LibStorage.LvmVgInfo () - c.getLvmVgInfo (container.name, lvmvginfo) + lvmvginfo = LibStorage.LvmVgInfo() + c.getLvmVgInfo(container.name, lvmvginfo) print " ", lvmvginfo.sizeK - lvmlvinfos = LibStorage.dequelvmlvinfo () - c.getLvmLvInfo (container.name, lvmlvinfos) + lvmlvinfos = LibStorage.dequelvmlvinfo() + c.getLvmLvInfo(container.name, lvmlvinfos) for lvmlvinfo in lvmlvinfos: print " ", lvmlvinfo.v.device, lvmlvinfo.v.sizeK -fscapabilities = LibStorage.FsCapabilities () -c.getFsCapabilities (LibStorage.REISERFS, fscapabilities) -print fscapabilities.isExtendable,fscapabilities.minimalFsSizeK +fscapabilities = LibStorage.FsCapabilities() +c.getFsCapabilities(LibStorage.REISERFS, fscapabilities) +print fscapabilities.isExtendable, fscapabilities.minimalFsSizeK -LibStorage.destroyStorageInterface (c) +LibStorage.destroyStorageInterface(c) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org