commit 2d716615a8388169feee9aeb199cf4bb5dd16eb3
Author: Yoann Vandoorselaere <[email protected]>
Date: Thu May 21 11:54:05 2009 +0200
Whitespace police.
========================================
prewikka/Database.py | 62 +++++++++++++++++++++++++-------------------------
prewikka/User.py | 26 ++++++++++----------
prewikka/view.py | 40 ++++++++++++++++----------------
setup.py | 30 ++++++++++++------------
4 files changed, 79 insertions(+), 79 deletions(-)
========================================
diff --git a/prewikka/Database.py b/prewikka/Database.py
index 22ba557..ba84759 100644
--- a/prewikka/Database.py
+++ b/prewikka/Database.py
@@ -32,7 +32,7 @@ class DatabaseError(Exception):
class _DatabaseInvalidError(DatabaseError):
def __init__(self, resource):
self._resource = resource
-
+
def __str__(self):
return "invalid %s '%s'" % (self.type, self._resource)
@@ -53,7 +53,7 @@ class DatabaseInvalidFilterError(_DatabaseInvalidError):
class DatabaseSchemaError(Exception):
- pass
+ pass
def get_timestamp(s):
@@ -63,12 +63,12 @@ def get_timestamp(s):
class Database:
required_version = "0.9.11"
-
+
# We reference preludedb_sql_destroy since it might be deleted
# prior Database.__del__() is called.
_sql_destroy = preludedb_sql_destroy
_sql = None
-
+
def __init__(self, config):
settings = preludedb_sql_settings_new()
for name, default in (("file", None),
@@ -82,7 +82,7 @@ class Database:
preludedb_sql_settings_set(settings, name, value)
db_type = config.get("type", "mysql")
-
+
self._sql = preludedb_sql_new(db_type, settings)
if config.has_key("log"):
@@ -93,15 +93,15 @@ class Database:
version = self.query("SELECT version FROM Prewikka_Version")[0][0]
except PreludeDBError, e:
raise DatabaseSchemaError(str(e))
-
+
if version != self.required_version:
d = { "version": version, "reqversion": self.required_version }
raise DatabaseSchemaError(_("Database schema version %(version)s found when %(reqversion)s was required") % d)
-
+
def __del__(self):
if self._sql:
self._sql_destroy(self._sql)
-
+
def queries_from_file(self, filename):
content = open(filename).read()
for query in content.split(";"):
@@ -114,7 +114,7 @@ class Database:
_table = preludedb_sql_query(self._sql, query)
if not _table:
return [ ]
-
+
columns = preludedb_sql_table_get_column_count(_table)
table = [ ]
while True:
@@ -126,13 +126,13 @@ class Database:
table.append(row)
for col in range(columns):
_field = preludedb_sql_row_fetch_field(_row, col)
- if _field:
+ if _field:
row.append(preludedb_sql_field_to_string(_field))
else:
row.append(None)
-
+
preludedb_sql_table_destroy(_table)
-
+
except PreludeDBError, e:
raise PreludeDBError(e.errno)
@@ -148,7 +148,7 @@ class Database:
preludedb_sql_transaction_abort(self._sql)
def error(self):
- return
+ return
def escape(self, data):
return preludedb_sql_escape(self._sql, data)
@@ -160,7 +160,7 @@ class Database:
def hasUser(self, login):
rows = self.query("SELECT login FROM Prewikka_User WHERE login = %s" % self.escape(login))
-
+
return bool(rows)
def createUser(self, login, email=None):
@@ -174,42 +174,42 @@ class Database:
self.query("DELETE FROM Prewikka_User WHERE login = %s" % login)
self.query("DELETE FROM Prewikka_Permission WHERE login = %s" % login)
self.query("DELETE FROM Prewikka_Session WHERE login = %s" % login)
-
- rows = self.query("SELECT id FROM Prewikka_Filter WHERE login = %s" % login)
+
+ rows = self.query("SELECT id FROM Prewikka_Filter WHERE login = %s" % login)
if len(rows) > 0:
lst = ", ".join([ id[0] for id in rows ])
- self.query("DELETE FROM Prewikka_Filter_Criterion WHERE Prewikka_Filter_Criterion.id IN (%s)" % lst)
-
+ self.query("DELETE FROM Prewikka_Filter_Criterion WHERE Prewikka_Filter_Criterion.id IN (%s)" % lst)
+
self.query("DELETE FROM Prewikka_Filter WHERE login = %s" % login)
except:
self.transaction_abort()
raise
-
+
self.transaction_end()
-
+
def getConfiguration(self, login):
-
+
login = self.escape(login)
rows = self.query("SELECT view, name, value FROM Prewikka_User_Configuration WHERE login = %s" % login)
-
+
config = { }
for view, name, value in rows:
if not config.has_key(view):
config[view] = { }
-
+
if not config[view].has_key(name):
config[view][name] = value
else:
if type(config[view][name]) is str:
config[view][name] = [ config[view][name] ]
-
+
config[view][name] = config[view][name] + [ value ]
return config
-
+
def getUserLogins(self):
return map(lambda r: r[0], self.query("SELECT login FROM Prewikka_User"))
-
+
def getUser(self, login):
return User.User(self, login, self.getLanguage(login), self.getPermissions(login), self.getConfiguration(login))
@@ -228,14 +228,14 @@ class Database:
def setLanguage(self, login, lang):
self.query("UPDATE Prewikka_User SET lang=%s WHERE login = %s" % (self.escape(lang), self.escape(login)))
-
+
def getLanguage(self, login):
rows = self.query("SELECT lang FROM Prewikka_User WHERE login = %s" % (self.escape(login)))
if len(rows) > 0:
return rows[0][0]
-
+
return None
-
+
def setPermissions(self, login, permissions):
self.transaction_start()
self.query("DELETE FROM Prewikka_Permission WHERE login = %s" % self.escape(login))
@@ -275,7 +275,7 @@ class Database:
if self.query("SELECT name FROM Prewikka_Filter WHERE login = %s AND name = %s" %
(self.escape(login), self.escape(filter.name))):
self.deleteFilter(login, filter.name)
-
+
self.transaction_start()
self.query("INSERT INTO Prewikka_Filter (login, name, comment, formula) VALUES (%s, %s, %s, %s)" %
(self.escape(login), self.escape(filter.name), self.escape(filter.comment), self.escape(filter.formula)))
@@ -290,7 +290,7 @@ class Database:
(self.escape(login), self.escape(name)))
if len(rows) == 0:
return None
-
+
id, comment, formula = rows[0]
elements = { }
for element_name, path, operator, value in \
diff --git a/prewikka/User.py b/prewikka/User.py
index 55f0dba..8cbeced 100644
--- a/prewikka/User.py
+++ b/prewikka/User.py
@@ -40,28 +40,28 @@ class PermissionDeniedError(Error.PrewikkaUserError):
def __init__(self, action_name):
Error.PrewikkaUserError.__init__(self, _("Permission Denied"),
_("Access to view '%s' forbidden") % action_name, log=Log.WARNING)
-
-
+
+
class User:
def __init__(self, db, login, language, permissions, configuration):
self._db = db
self.login = login
self.permissions = permissions
- self.configuration = configuration
+ self.configuration = configuration
self.setLanguage(language)
-
+
def setLanguage(self, lang):
self.language = lang
localization.setLocale(lang)
-
+
def delConfigValue(self, view, key=None):
login = self._db.escape(self.login)
-
+
if key != None:
qstr = " AND name = %s" % (self._db.escape(key))
else:
qstr = ""
-
+
self._db.query("DELETE FROM Prewikka_User_Configuration WHERE view = %s AND login = %s%s" %
(self._db.escape(view), login, qstr))
@@ -70,22 +70,22 @@ class User:
def delConfigValueMatch(self, view, key):
login = self._db.escape(self.login)
-
+
self._db.query("DELETE FROM Prewikka_User_Configuration WHERE view = %s AND login = %s AND name LIKE %s"
% (self._db.escape(view), login, self._db.escape(key)))
for k in self.configuration[view].keys():
if k.find(key) != -1:
self.configuration.pop(key)
-
+
def getConfigValue(self, view, key):
return self.configuration[view][key]
-
+
def setConfigValue(self, view, key, value):
k = self._db.escape(key)
v = self._db.escape(view)
login = self._db.escape(self.login)
-
+
self._db.query("DELETE FROM Prewikka_User_Configuration WHERE view = %s AND login = %s AND name = %s" % (v, login, k))
if not type(value) is list:
self._db.query("INSERT INTO Prewikka_User_Configuration (view, login, name, value) VALUES (%s,%s,%s,%s)" %
@@ -97,9 +97,9 @@ class User:
if not self.configuration.has_key(view):
self.configuration[view] = { }
-
+
self.configuration[view][key] = value
-
+
def has(self, perm):
if type(perm) in (list, tuple):
return filter(lambda p: self.has(p), perm) == perm
diff --git a/prewikka/view.py b/prewikka/view.py
index 31a6e16..89335c2 100644
--- a/prewikka/view.py
+++ b/prewikka/view.py
@@ -23,29 +23,29 @@ import Error, Log
class ParameterError(Exception):
pass
-
+
class InvalidParameterError(Error.PrewikkaUserError):
def __init__(self, name):
- Error.PrewikkaUserError.__init__(self, _("Parameters Normalization failed"),
+ Error.PrewikkaUserError.__init__(self, _("Parameters Normalization failed"),
"Parameter '%s' is not valid" % name, log=Log.WARNING)
class InvalidParameterValueError(Error.PrewikkaUserError):
def __init__(self, name, value):
- Error.PrewikkaUserError.__init__(self, _("Parameters Normalization failed"),
+ Error.PrewikkaUserError.__init__(self, _("Parameters Normalization failed"),
"Invalid value '%s' for parameter '%s'" % (value, name), log=Log.WARNING)
class MissingParameterError(Error.PrewikkaUserError):
def __init__(self, name):
- Error.PrewikkaUserError.__init__(self, _("Parameters Normalization failed"),
+ Error.PrewikkaUserError.__init__(self, _("Parameters Normalization failed"),
"Required parameter '%s' is missing" % name, log=Log.WARNING)
class Parameters(dict):
allow_extra_parameters = False
-
+
def __init__(self, *args, **kwargs):
apply(dict.__init__, (self, ) + args, kwargs)
self._parameters = { }
@@ -53,10 +53,10 @@ class Parameters(dict):
self.optional("_error_back", str)
self.optional("_error_retry", str)
self.optional("_save", str)
-
+
def register(self):
pass
-
+
def mandatory(self, name, type):
self._parameters[name] = { "type": type, "mandatory": True, "save": False }
@@ -65,19 +65,19 @@ class Parameters(dict):
def normalize(self, view, user):
do_load = True
-
+
for name, value in self.items():
try:
parameter_type = self._parameters[name]["type"]
except KeyError:
if self.allow_extra_parameters:
continue
-
+
raise InvalidParameterError(name)
-
+
if not self._parameters.has_key(name) or self._parameters[name]["mandatory"] is not True:
do_load = False
-
+
if parameter_type is list and not type(value) is list:
value = [ value ]
@@ -85,7 +85,7 @@ class Parameters(dict):
value = parameter_type(value)
except (ValueError, TypeError):
raise InvalidParameterValueError(name, value)
-
+
if self._parameters[name]["save"] and self.has_key("_save"):
user.setConfigValue(view, name, value)
@@ -99,29 +99,29 @@ class Parameters(dict):
for name in self._parameters.keys():
if self.has_key(name):
continue
-
+
if self._parameters[name]["mandatory"]:
raise MissingParameterError(name)
-
+
elif self._parameters[name]["default"] != None:
self[name] = self._parameters[name]["default"]
if self._parameters[name]["save"] and do_load:
try:
value = user.getConfigValue(view, name)
-
+
parameter_type = self._parameters[name]["type"]
if parameter_type is list and not type(value) is list:
value = [ value ]
-
+
self[name] = parameter_type(value)
-
+
except KeyError:
pass
-
+
try: self.pop("_save")
except: pass
-
+
return do_load
def __add__(self, src):
@@ -141,7 +141,7 @@ class Parameters(dict):
def copy(self):
new = self.__class__()
new.update(self)
-
+
return new
diff --git a/setup.py b/setup.py
index 950bab8..9bb4727 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ def listfiles(*dirs):
return [os.path.join(dir, filename)
for filename in os.listdir(os.path.abspath(dir))
if filename[0] != '.' and fnmatch(filename, pattern)]
-
+
class my_install_data(install_data):
def run(self):
self.data_files.extend(self._compile_po_files())
@@ -56,7 +56,7 @@ class my_install_data(install_data):
def _compile_po_files(self):
data_files = []
-
+
for po in listfiles("po", "*.po"):
lang = os.path.basename(po[:-3])
mo = os.path.join("locale", lang, "LC_MESSAGES", "prewikka.mo")
@@ -66,18 +66,18 @@ class my_install_data(install_data):
if not os.path.exists(directory):
print "creating %s" % directory
os.makedirs(directory)
-
+
cmd = 'msgfmt -o %s %s' % (mo, po)
print "compiling %s -> %s" % (po, mo)
if os.system(cmd) != 0:
raise SystemExit("Error while running msgfmt")
-
+
dest = os.path.dirname(os.path.join('share', mo))
data_files.append((dest, [mo]))
-
+
return data_files
-
-
+
+
class my_build_py(build_py):
def finalize_options(self):
@@ -86,11 +86,11 @@ class my_build_py(build_py):
def get_outputs(self, *args, **kwargs):
return self.outfiles + apply(build_py.get_outputs, (self, ) + args, kwargs)
-
+
def build_templates(self):
cheetah = CheetahWrapper()
argbkp = sys.argv[0][:]
-
+
for package in self.packages:
package_dir = self.get_package_dir(package)
templates = glob.glob(package_dir + '/*.tmpl')
@@ -140,12 +140,12 @@ class my_install_scripts (install_scripts):
self.run_command('build_scripts')
self.outfiles = []
-
+
self.mkpath(os.path.normpath(self.install_dir))
ofile, copied = self.copy_file(os.path.join(self.build_dir, 'prewikka-httpd'), self.install_dir)
if copied:
self.outfiles.append(ofile)
-
+
cgi_dir = os.path.join(self.install_data, 'share', 'prewikka', 'cgi-bin')
if not os.path.exists(cgi_dir):
os.makedirs(cgi_dir)
@@ -183,13 +183,13 @@ class my_install(install):
print >> config, "libprelude_required_version = '%s'" % LIBPRELUDE_REQUIRED_VERSION
print >> config, "libpreludedb_required_version = '%s'" % LIBPRELUDEDB_REQUIRED_VERSION
config.close()
-
+
def run(self):
os.umask(022)
self.install_conf()
self.init_siteconfig()
install.run(self)
-
+
for dir in ("/",
"share/prewikka",
"share/prewikka/htdocs",
@@ -197,7 +197,7 @@ class my_install(install):
"share/prewikka/database", "share/prewikka/cgi-bin"):
os.chmod((self.root or "") + self.prefix + "/" + dir, 0755)
os.chmod((self.root or "") + self.conf_prefix, 0755)
-
+
if not self.dry_run:
for filename in self.get_outputs():
if filename.find(".conf") != -1:
@@ -209,7 +209,7 @@ class my_install(install):
os.chmod(filename, mode)
-sqlite = open("database/sqlite.sql", "w")
+sqlite = open("database/sqlite.sql", "w")
for line in os.popen("database/mysql2sqlite.sh database/mysql.sql"):
print >> sqlite, line.rstrip()
sqlite.close()
_______________________________________________
Prelude-cvslog site list
[email protected]
http://lists.prelude-ids.org/mailman/listinfo/prelude-cvslog
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.