Changeset 335
- Timestamp:
- 12/05/06 22:11:15
- Files:
-
- trunk/storage/storeado.py (modified) (2 diffs)
- trunk/test/test_dejavu.py (modified) (1 diff)
- trunk/test/test_storemsaccess.py (modified) (1 diff)
- trunk/test/test_storesqlserver.py (modified) (1 diff)
- trunk/test/zoo_fixture.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/storage/storeado.py
r334 r335 588 588 raise x 589 589 590 # This line could use some optimization 590 591 columns = [(x.Name, x.Type) for x in res.Fields] 591 592 … … 1170 1171 1171 1172 def gen_py(): 1172 # Auto generate .py support for ADO 2.7+1173 """Auto generate .py support for ADO 2.7+""" 1173 1174 print 'Please wait while support for ADO 2.7+ is verified...' 1174 CLSID = '{EF53050B-882E-4776-B643-EDA472E8E3F2}' 1175 return win32com.client.gencache.EnsureModule(CLSID, 0, 2, 7) 1175 1176 # Microsoft ActiveX Data Objects 2.8 Library 1177 result = win32com.client.gencache.EnsureModule('{2A75196C-D9EB-4129-B803-931327F72D5C}', 0, 2, 8) 1178 if result is not None: 1179 return 1180 1181 # Microsoft ActiveX Data Objects 2.7 Library 1182 result = win32com.client.gencache.EnsureModule('{EF53050B-882E-4776-B643-EDA472E8E3F2}', 0, 2, 7) 1183 if result is not None: 1184 return 1185 1186 raise ImportError("ADO 2.7 support could not be imported/cached") 1176 1187 1177 1188 trunk/test/test_dejavu.py
r334 r335 8 8 9 9 10 arena.add_store("default", "dejavu.storage.CachingProxy") 11 arena.register(Animal) 12 arena.register(Lecture) 13 arena.register(Vet) 14 arena.register(Visit) 15 arena.register(Zoo) 16 arena.register(Exhibit) 10 arena.add_store("default", "dejavu.storage.storeram.RAMStorage") 11 12 for cls in (Animal, Lecture, Vet, Visit, Zoo, Exhibit): 13 arena.register(cls) 14 arena.create_storage(cls) 17 15 18 16 trunk/test/test_storemsaccess.py
r334 r335 12 12 else: 13 13 from dejavu.storage import storeado 14 mod = storeado.gen_py() 15 if mod is None: 14 try: 15 storeado.gen_py() 16 except ImportError: 16 17 def run(): 17 18 warnings.warn("ADO 2.7 support could not be verified. " trunk/test/test_storesqlserver.py
r334 r335 9 9 else: 10 10 from dejavu.storage import storeado 11 mod = storeado.gen_py() 12 if mod is None: 11 try: 12 storeado.gen_py() 13 except ImportError: 13 14 def run(): 14 15 warnings.warn("ADO 2.7 support could not be verified. " trunk/test/zoo_fixture.py
r334 r335 801 801 802 802 def test_Multithreading(self): 803 print "skipped ",804 return805 806 803 # Test threads overlapping on separate sandboxes 807 804 f = (lambda x: x.Legs == 4)
