[Pkg-debile-commits] [debile-master] 08/126: syntax fixes
Sylvestre Ledru
sylvestre at alioth.debian.org
Mon Aug 19 14:56:05 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 cf714b53f678dbdcaaa594508d42a1a6231f7295
Author: Paul Tagliamonte <tag at pault.ag>
Date: Tue May 21 16:00:19 2013 -0400
syntax fixes
---
lucy/cli/init.py | 4 ----
lucy/server.py | 8 ++++----
lucy/tests/test_envelope.py | 1 -
lucy/utils.py | 1 +
setup.py | 2 +-
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/lucy/cli/init.py b/lucy/cli/init.py
index 86191de..8668432 100644
--- a/lucy/cli/init.py
+++ b/lucy/cli/init.py
@@ -12,7 +12,6 @@ def main():
if not args.files:
raise Exception("WTF - need a config")
-
config = args.files.pop(0)
obj = json.load(open(config, 'r'))
@@ -20,19 +19,16 @@ def main():
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)
diff --git a/lucy/server.py b/lucy/server.py
index f49623c..dfaa3e6 100644
--- a/lucy/server.py
+++ b/lucy/server.py
@@ -108,9 +108,9 @@ def serve(server, port):
server.serve_forever()
-if __name__ == "__main__":
- main()
-
-
def main():
serve("localhost", 20017)
+
+
+if __name__ == "__main__":
+ main()
diff --git a/lucy/tests/test_envelope.py b/lucy/tests/test_envelope.py
index d665389..726f81c 100644
--- a/lucy/tests/test_envelope.py
+++ b/lucy/tests/test_envelope.py
@@ -8,7 +8,6 @@ foo
bar"""
-
def test_env_round_trip():
env = Envelope.load(tfoo)
assert env['hello'] == 'world'
diff --git a/lucy/utils.py b/lucy/utils.py
index 4b8a37a..6413ae8 100644
--- a/lucy/utils.py
+++ b/lucy/utils.py
@@ -1,5 +1,6 @@
import subprocess
import contextlib
+import shlex
import glob
import os
diff --git a/setup.py b/setup.py
index 3414440..9116983 100755
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ setup(
license="Expat",
url="http://deb.io/",
platforms=['any'],
- entry_points = {
+ entry_points={
'console_scripts': [
'lucy-nuke = lucy.cli.nuke:main',
'lucy-process-incoming = lucy.cli.incoming: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