[Pkg-debile-commits] [debile-master] 01/01: Deduplicate code

Léo Cavaillé leo.cavaille-guest at alioth.debian.org
Sun Aug 25 19:51:52 UTC 2013


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

leo.cavaille-guest pushed a commit to branch master
in repository debile-master.

commit b14de513ff88de7d4e2341bb84c4fe733a05f23b
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Sun Aug 25 21:51:38 2013 +0200

    Deduplicate code
---
 debile/master/archive.py  |    6 +-----
 debile/master/incoming.py |    6 +-----
 debile/master/server.py   |    1 +
 debile/master/utils.py    |    4 ++++
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/debile/master/archive.py b/debile/master/archive.py
index 81741c2..d16ab04 100644
--- a/debile/master/archive.py
+++ b/debile/master/archive.py
@@ -1,6 +1,6 @@
 from debile.master.config import Config
 from debile.master.orm import User, Source, Binary, Package
-from debile.master.utils import run_command
+from debile.master.utils import run_command, listize
 from debian import deb822
 import shutil
 import os
@@ -8,10 +8,6 @@ import logging
 
 from jinja2 import Template
 
-def listize(entry):
-    items = [x.strip() for x in entry.split(",")]
-    return [None if x == "null" else x for x in items]
-
 
 def check_user_repository_consitency():
     """
diff --git a/debile/master/incoming.py b/debile/master/incoming.py
index d81c66c..a4644dd 100644
--- a/debile/master/incoming.py
+++ b/debile/master/incoming.py
@@ -3,7 +3,7 @@ from debile.master.orm import User, Source, Machine, Binary, Job, Group
 from debile.master.archive import move_to_pool_source, move_to_pool_binary, UserRepository
 
 from debile.master.changes import parse_changes_file, ChangesFileException
-from debile.master.utils import cd, fglob
+from debile.master.utils import cd, fglob, listize
 from debile.master.config import Config
 from debile.master.server import Session
 #from lucy.mail import send_mail
@@ -12,10 +12,6 @@ import os
 import logging
 import datetime as dt
 
-def listize(entry):
-    items = [x.strip() for x in entry.split(",")]
-    return [None if x == "null" else x for x in items]
-
 
 def process():
     config = Config()
diff --git a/debile/master/server.py b/debile/master/server.py
index a17511b..be8ef31 100644
--- a/debile/master/server.py
+++ b/debile/master/server.py
@@ -7,6 +7,7 @@ from debile.master.orm import Machine, Job, Source, Binary, User, Package
 from debile.master.config import Config
 #from debile.master.mail import send_mail
 from debile.master.archive import UserRepository
+from debile.master.utils import listize
 
 from SimpleXMLRPCServer import SimpleXMLRPCServer
 from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
diff --git a/debile/master/utils.py b/debile/master/utils.py
index 6413ae8..3bf0fde 100644
--- a/debile/master/utils.py
+++ b/debile/master/utils.py
@@ -36,3 +36,7 @@ def run_command(command, stdin=None):
 
     (output, stderr) = pipe.communicate(**kwargs)
     return (output, stderr, pipe.returncode)
+
+def listize(entry):
+    items = [x.strip() for x in entry.split(",")]
+    return [None if x == "null" else x for x in items]

-- 
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