[Pkg-debile-commits] [debile-master] 01/01: fix more warnings (but not all)
Sylvestre Ledru
sylvestre at alioth.debian.org
Thu Sep 12 15:35:11 UTC 2013
This is an automated email from the git hooks/post-receive script.
sylvestre pushed a commit to branch master
in repository debile-master.
commit a9e7066c44dfca5988e2f7d03d003d83a188aca7
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date: Thu Sep 12 17:35:01 2013 +0200
fix more warnings (but not all)
---
debilemaster/archive.py | 17 ++++-------------
debilemaster/cli/init.py | 5 ++---
debilemaster/config.py | 5 ++++-
debilemaster/mail.py | 1 -
debilemaster/orm.py | 3 +--
debilemaster/server.py | 19 ++++++++++---------
6 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/debilemaster/archive.py b/debilemaster/archive.py
index b7aafdf..9421113 100644
--- a/debilemaster/archive.py
+++ b/debilemaster/archive.py
@@ -20,9 +20,7 @@
# DEALINGS IN THE SOFTWARE.
from debilemaster.config import Config
-from debilemaster.orm import User, Source, Binary, Package
from debilemaster.utils import run_command, listize
-from debian import deb822
import shutil
import os
import logging
@@ -146,7 +144,6 @@ class UserRepository:
logging.debug("Creating incoming directory : %s" % path)
os.makedirs(path)
-
# Create the pool directory
logging.debug("Creating pool directory : %s" % self.pool_path)
os.makedirs(self.pool_path)
@@ -196,9 +193,9 @@ class UserRepository:
"profile-user.json")
template = Template(open(jinjafile).read())
return template.render(
- incoming = os.path.join(self.incoming_path, 'source'),
- username = self.user.login,
- debile_fqdn = self.config.get('paths', 'debile_fqdn'))
+ incoming=os.path.join(self.incoming_path, 'source'),
+ username=self.user.login,
+ debile_fqdn=self.config.get('paths', 'debile_fqdn'))
def generate_aptsourcelist(self):
l = "# source debile mirror of %s packages\n" % self.user.name
@@ -216,14 +213,7 @@ class UserRepository:
return l
-
-
-
-
-
-
# FIXME: really who duplicates code like this ?
-
def move_to_pool_source(package, changes, root=None):
config = Config()
pool = config.get('paths', 'pool_path')
@@ -240,6 +230,7 @@ def move_to_pool_source(package, changes, root=None):
dest = os.path.join(path, bn)
os.rename(entry, dest)
+
def move_to_pool_binary(package, bfilename, root=None):
config = Config()
pool = config.get('paths', 'pool_path')
diff --git a/debilemaster/cli/init.py b/debilemaster/cli/init.py
index b9f187e..d513442 100644
--- a/debilemaster/cli/init.py
+++ b/debilemaster/cli/init.py
@@ -19,7 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-from clint.textui import progress, puts
from clint import args
import debilemaster.orm as debilemodel
from sqlalchemy import create_engine
@@ -27,15 +26,15 @@ from sqlalchemy.orm import sessionmaker
from debilemaster.config import Config
from debilemaster.archive import UserRepository
-import json
import shutil
import os
metadata = debilemodel.Base.metadata
+
def main():
config = Config()
- engine = create_engine(config.get('db', 'engine') , echo=True)
+ engine = create_engine(config.get('db', 'engine'), echo=True)
Session = sessionmaker(bind=engine)
session = Session()
diff --git a/debilemaster/config.py b/debilemaster/config.py
index 2f5ad24..1369cdf 100644
--- a/debilemaster/config.py
+++ b/debilemaster/config.py
@@ -21,16 +21,19 @@
import ConfigParser
+
class IncompleteConfig(Exception):
def __init__(self, section, option):
self.section = section
self.option = option
+
def __str__(self):
print " >> Missing option %s in section [%s] in config file" % (self.option, self.section)
class Config(ConfigParser.ConfigParser):
_instance = None
+
def __new__(cls, *args, **kwargs):
if not cls._instance:
cls._instance = super(Config, cls).__new__(cls, *args, **kwargs)
@@ -39,7 +42,7 @@ class Config(ConfigParser.ConfigParser):
def __init__(self, location="/etc/debile-master.ini"):
ConfigParser.ConfigParser.__init__(self)
self.read(location)
- self.verify()
+ self.verify()2
def verify(self):
# db section
diff --git a/debilemaster/mail.py b/debilemaster/mail.py
index b04aa8c..796d3a0 100644
--- a/debilemaster/mail.py
+++ b/debilemaster/mail.py
@@ -19,7 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
-from email.mime.text import MIMEText
from email.parser import Parser
from jinja2 import Template
from io import StringIO
diff --git a/debilemaster/orm.py b/debilemaster/orm.py
index bbd5e47..73bfa40 100644
--- a/debilemaster/orm.py
+++ b/debilemaster/orm.py
@@ -29,7 +29,6 @@ from sqlalchemy.orm import relationship, backref
from sqlalchemy import Column, Integer, String, DateTime, ForeignKey, Boolean
from sqlalchemy import types as sqltypes
-import datetime as dt
def row2dict(row):
"""
@@ -210,7 +209,6 @@ class Binary(Package):
ForeignKey('packages.package_id'),
primary_key=True)
-
# Creation time of the Binary, meaning when it was processed via incoming/
# and not when it was output by the builder
created_at = Column(DateTime)
@@ -292,6 +290,7 @@ class Job(Base):
serial['machine'] = self.machine.serialize()
serial['package'] = self.package.serialize()
return serial
+
# Helper methods
def is_pending(self):
if self.finished_at is None:
diff --git a/debilemaster/server.py b/debilemaster/server.py
index 2b16d7f..f4f99f0 100644
--- a/debilemaster/server.py
+++ b/debilemaster/server.py
@@ -20,11 +20,10 @@
# DEALINGS IN THE SOFTWARE.
from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker, scoped_session, with_polymorphic, contains_eager, joinedload
-from sqlalchemy.orm.util import aliased
-from sqlalchemy.orm.exc import NoResultFound, MultipleResultsFound
+from sqlalchemy.orm import sessionmaker, scoped_session, joinedload
+from sqlalchemy.orm.exc import NoResultFound
-from debilemaster.orm import Machine, Job, Source, Binary, User, Package
+from debilemaster.orm import Machine, Job, Source, Binary, User
from debilemaster.config import Config
#from debilemaster.mail import send_mail
from debilemaster.archive import UserRepository
@@ -56,6 +55,7 @@ gpg = gnupg.GPG(gnupghome=gnupg_default_home, verbose=False)
PAUSED = False
+
def row2dict(row):
d = {}
for column in row.__table__.columns:
@@ -100,6 +100,7 @@ def user_method(fn):
raise Exception("You can't do that")
return _
+
def admin_method(fn):
def _(*args, **kwargs):
try:
@@ -110,6 +111,7 @@ def admin_method(fn):
raise Exception("You can't do that")
return _
+
class DebileMasterInterface(object):
@admin_method
def get_paused_status(self):
@@ -183,7 +185,7 @@ class DebileMasterInterface(object):
Return a list of python dictionnaries with the users.
"""
session = Session()
- users = [ u.serialize() for u in session.query(User).all()]
+ users = [u.serialize() for u in session.query(User).all()]
for u in users:
u.pop('password', None)
return users
@@ -227,12 +229,11 @@ class DebileMasterInterface(object):
List the machines registered in the database.
"""
session = Session()
- machines = [ m.serialize() for m in session.query(Machine).all()]
+ machines = [m.serialize() for m in session.query(Machine).all()]
for m in machines:
m.pop('password', None)
return machines
-
def get_dsc_url(self, source_id):
"""
Get the .dsc path if the package is a valid source package. Otherwise
@@ -348,8 +349,8 @@ class DebileMasterInterface(object):
session = Session()
j = session.query(Job).\
- filter(Job.assigned_at == None).\
- filter(Job.machine == None).\
+ filter(Job.assigned_at is None).\
+ filter(Job.machine is None).\
filter(Job.type.in_(types)).\
filter(Job.arch.in_(arches)).\
filter(Job.suite.in_(suites)).\
--
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