Changeset 3325
- Timestamp:
- 07/20/07 13:38:16 (1 year ago)
- Files:
-
- branches/1.0/turbogears/database.py (modified) (2 diffs)
- branches/1.0/turbogears/release.py (modified) (1 diff)
- branches/1.0/turbogears/toolbox/base.py (modified) (1 diff)
- branches/1.0/turbogears/toolbox/catwalk/__init__.py (modified) (2 diffs)
- branches/1.0/turbogears/util.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.0/turbogears/database.py
r3290 r3325 39 39 if "sqlalchemy" in k: 40 40 alch_args[k.split(".")[-1]] = v 41 41 42 dburi = alch_args.pop('dburi') 42 43 if not dburi: 43 44 raise KeyError("No sqlalchemy database config found!") 45 44 46 _engine = sqlalchemy.create_engine(dburi, **alch_args) 45 47 metadata.connect(_engine) 48 46 49 elif not metadata.is_bound(): 47 50 metadata.connect(_engine) 51 48 52 return _engine 49 53 … … 52 56 if not metadata.is_bound(): 53 57 bind_meta_data() 58 54 59 return sqlalchemy.create_session() 55 60 branches/1.0/turbogears/release.py
r2988 r3325 1 version = "1.0.3 "1 version = "1.0.3.2" 2 2 author = "Kevin Dangoor" 3 3 email = "dangoor+turbogears@gmail.com" branches/1.0/turbogears/toolbox/base.py
r2470 r3325 104 104 105 105 tool = i.load() 106 tools.append((tool, i.name))106 tools.append((tool, i.name)) 107 107 setattr(self, i.name, tool()) 108 108 toolbox = [] branches/1.0/turbogears/toolbox/catwalk/__init__.py
r2852 r3325 100 100 icon = "/tg_static/images/catwalk.png" 101 101 102 def __init__(self,model=None): 103 """CatWalks initializer 104 105 @param model: reference to a project model module 106 @type model: yourproject.model 102 def __init__(self, model=None): 103 """ 104 CatWalks initializer 105 106 @param model: reference to a project model module 107 @type model: yourproject.model 107 108 """ 108 109 … … 111 112 else: 112 113 self.model = turbogears.util.get_model() 114 113 115 self.browse.catwalk = self 114 116 branches/1.0/turbogears/util.py
r3232 r3325 125 125 def get_model(): 126 126 package_name = get_package_name() 127 127 128 if not package_name: 128 129 return None 130 129 131 package = __import__(package_name, {}, {}, ["model"]) 132 130 133 if hasattr(package, "model"): 131 134 return package.model