Attachment 296913 Details for Bug 435947 – Remove dependency on Python 2.5

[patch] Remove dependency on Python 2.5

sca-python2.4.patch (text/plain), 6.37 KB, created by Miloslav Trmač on 2008-03-05 19:12:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miloslav Trmač

Created: 2008-03-05 19:12:05 UTC

Size: 6.37 KB

patch

obsolete

>diff -r f262995f023c -r 0e5e18c72395 ChangeLog
>--- a/ChangeLog	Thu Jan 24 23:50:06 2008 +0100
>+++ b/ChangeLog	Wed Mar 05 20:09:38 2008 +0100
>@@ -1,3 +1,13 @@ 2008-01-24  Miloslav TrmaÄ  <mitr@redha
>+2008-03-05  Miloslav TrmaÄ  <mitr@redhat.com>
>+
>+	* src/audit_rules.py (AuditRules.read)
>+	* src/auditd_config.py (AuditdConfig.read)
>+	* src/event_type_dialog.py (EventTypeDialog._validate_get_failure)
>+	* src/rule_dialog.py (RuleDialog._validate_get_failure)
>+	(RuleDialog.__rule_syscall_add_clicked)
>+	(RuleDialog.__rule_arch_focus_out)
>+	(RuleDialog.__rule_field_add_clicked): Be compatible with Python 2.4.
>+
> 2008-01-24  Miloslav TrmaÄ  <mitr@redhat.com>
> 
> 	* src/server.h: Fix typos.
>diff -r f262995f023c -r 0e5e18c72395 src/audit_rules.py
>--- a/src/audit_rules.py	Thu Jan 24 23:50:06 2008 +0100
>+++ b/src/audit_rules.py	Wed Mar 05 20:09:38 2008 +0100
>@@ -1,6 +1,6 @@
> # audit.rules parsing and creation.
> #
>-# Copyright (C) 2007 Red Hat, Inc.  All rights reserved.
>+# Copyright (C) 2007, 2008 Red Hat, Inc.  All rights reserved.
> # This copyrighted material is made available to anyone wishing to use, modify,
> # copy, or redistribute it subject to the terms and conditions of the GNU
> # General Public License v.2.  This program is distributed in the hope that it
>@@ -688,7 +688,7 @@ class AuditRules(object):
>             try:
>                 self.__interpret_line(self.__whitespace_re.split(line))
>             except ParsingError, e:
>-                print >> sys.stderr, "audit.rules:%d: %s" % (line_no, e.message)
>+                print >> sys.stderr, "audit.rules:%d: %s" % (line_no, str(e))
> 
>     def write(self, client):
>         '''Write current state to the auditd configuration file using client.
>diff -r f262995f023c -r 0e5e18c72395 src/auditd_config.py
>--- a/src/auditd_config.py	Thu Jan 24 23:50:06 2008 +0100
>+++ b/src/auditd_config.py	Wed Mar 05 20:09:38 2008 +0100
>@@ -1,6 +1,6 @@
> # Auditd.conf parsing and updating.
> #
>-# Copyright (C) 2007 Red Hat, Inc.  All rights reserved.
>+# Copyright (C) 2007, 2008 Red Hat, Inc.  All rights reserved.
> # This copyrighted material is made available to anyone wishing to use, modify,
> # copy, or redistribute it subject to the terms and conditions of the GNU
> # General Public License v.2.  This program is distributed in the hope that it
>@@ -244,7 +244,7 @@ class AuditdConfig(object):
>                 if a is not None:
>                     self.__interpret_option(*a)
>             except ParsingError, e:
>-                print >> sys.stderr, "auditd.conf:%d: %s" % (line_no, e.message)
>+                print >> sys.stderr, "auditd.conf:%d: %s" % (line_no, str(e))
> 
>     def __option_values(self):
>         '''Return option values to write to the config file.
>diff -r f262995f023c -r 0e5e18c72395 src/event_type_dialog.py
>--- a/src/event_type_dialog.py	Thu Jan 24 23:50:06 2008 +0100
>+++ b/src/event_type_dialog.py	Wed Mar 05 20:09:38 2008 +0100
>@@ -1,6 +1,6 @@
> # Event type rule dialog.
> #
>-# Copyright (C) 2007 Red Hat, Inc.  All rights reserved.
>+# Copyright (C) 2007, 2008 Red Hat, Inc.  All rights reserved.
> # This copyrighted material is made available to anyone wishing to use, modify,
> # copy, or redistribute it subject to the terms and conditions of the GNU
> # General Public License v.2.  This program is distributed in the hope that it
>@@ -111,7 +111,7 @@ class EventTypeDialog(DialogBase):
>             try:
>                 util.parse_msgtype(self.event_type_value.child.get_text())
>             except ParsingError, e:
>-                return (e.message, None, self.event_type_value)
>+                return (str(e), None, self.event_type_value)
>         return None
> 
>     def __event_type_condition_toggled(self, *_):
>diff -r f262995f023c -r 0e5e18c72395 src/rule_dialog.py
>--- a/src/rule_dialog.py	Thu Jan 24 23:50:06 2008 +0100
>+++ b/src/rule_dialog.py	Wed Mar 05 20:09:38 2008 +0100
>@@ -1,6 +1,6 @@
> # Rule dialog.
> #
>-# Copyright (C) 2007 Red Hat, Inc.  All rights reserved.
>+# Copyright (C) 2007, 2008 Red Hat, Inc.  All rights reserved.
> # This copyrighted material is made available to anyone wishing to use, modify,
> # copy, or redistribute it subject to the terms and conditions of the GNU
> # General Public License v.2.  This program is distributed in the hope that it
>@@ -264,7 +264,7 @@ class RuleDialog(DialogBase):
>             try:
>                 util.parse_elf(self.rule_arch.child.get_text())
>             except util.ParsingError, e:
>-                return (e.message, 0, self.rule_arch)
>+                return (str(e), 0, self.rule_arch)
>         if (audit.AUDIT_ARCH not in self.excluded_fields and
>             self.rule_syscalls_not_all.get_active()):
>             it = self.syscall_store.get_iter_first()
>@@ -274,7 +274,7 @@ class RuleDialog(DialogBase):
>                     util.parse_syscall(name, self.machine_id)
>                 except util.ParsingError, e:
>                     self.syscalls_selection.select_iter(it)
>-                    return (e.message, 1, self.rule_syscalls)
>+                    return (str(e), 1, self.rule_syscalls)
>                 it = self.syscall_store.iter_next(it)
>             if self.syscall_store.get_iter_first() is None:
>                 return (_('The system call list must not be empty'), 1,
>@@ -318,7 +318,7 @@ class RuleDialog(DialogBase):
>         try:
>             util.parse_syscall(name, self.machine_id)
>         except util.ParsingError, e:
>-            self._modal_error_dialog(e.message)
>+            self._modal_error_dialog(str(e))
>             self.rule_syscall_name.grab_focus()
>             return
>         it = self.syscall_store.get_iter_first()
>@@ -340,7 +340,7 @@ class RuleDialog(DialogBase):
>             # Changing the focus within a focus change callback looks evil,
>             # defer it until it is safe.
>             def callback():
>-                self._modal_error_dialog(e.message)
>+                self._modal_error_dialog(str(e))
>                 self.rule_notebook.set_current_page(0)
>                 self.rule_arch.child.grab_focus()
>                 return False
>@@ -413,7 +413,7 @@ class RuleDialog(DialogBase):
>             field.parse_triple(var, op, self.rule_field_value.child.get_text())
>         except util.ParsingError, e:
>             self.rule_notebook.set_current_page(self.fields_page)
>-            self._modal_error_dialog(e.message)
>+            self._modal_error_dialog(str(e))
>             # Guess which widget is incorrect
>             self.rule_field_value.child.grab_focus()
>             return

Actions: View | Diff

Attachments on bug 435947: 296913