[Pkg-debile-commits] [debile-master] 115/126: Remove dead code and use clint properly

Sylvestre Ledru sylvestre at alioth.debian.org
Mon Aug 19 14:56:26 UTC 2013


This is an automated email from the git hooks/post-receive script.

sylvestre pushed a commit to branch scan-build-html
in repository debile-master.

commit a513d0e22d3ce9da939d50ce56258028ca68c7b5
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Tue Aug 6 14:48:43 2013 +0200

    Remove dead code and use clint properly
---
 lucy/cli/init.py |   36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/lucy/cli/init.py b/lucy/cli/init.py
index 07f8047..67bdc80 100644
--- a/lucy/cli/init.py
+++ b/lucy/cli/init.py
@@ -2,44 +2,20 @@ from clint.textui import progress, puts
 from clint import args
 import lucy.orm as lucymodel
 from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
+from lucy.config import Config
 
 import json
 
 metadata = lucymodel.Base.metadata
 
 def main():
-    engine = create_engine('postgresql://lucy:adamngoodpassword@localhost/lucy', echo=True)
-
-    metadata.drop_all(bind=engine)
-    metadata.create_all(bind=engine)
+    config = Config()
+    engine = create_engine(config.get('db', 'engine') , echo=True)
 
+    if args.flags.contains('--drop'):
+        metadata.drop_all(bind=engine)
 
-#    if not args.files:
-#        raise Exception("WTF - need a config")
-#
-#    config = args.files.pop(0)
-#    obj = json.load(open(config, 'r'))
-#
-#    machines = obj['machines']
-#    configs = obj['configs']
-#    users = obj['users']
-#
-#    puts("Loading users:")
-#    for conf in progress.bar(users):
-#        u = User(**conf)
-#        u.save()
-#
-#    puts("Loading machines:")
-#    for conf in progress.bar(machines):
-#        m = Machine(**conf)
-#        m.save()
-#
-#    puts("Loading configs:")
-#    for conf in progress.bar(configs):
-#        c = Config(**conf)
-#        c.save()
-
+    metadata.create_all(bind=engine)
 
 if __name__ == "__main__":
     main()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-master.git



More information about the Pkg-debile-commits mailing list