Merge lp:~sbeattie/apparmor-profile-tools/pre-merger-cleanups into lp:apparmor-profile-tools

[Steve Beattie]

Here are some simple cleanups in preparation for merging the new profile tools into trunk.

[Christian Boltz (cboltz)]

Hello,

Am Dienstag, 11. Februar 2014 schrieb Steve Beattie:
> Steve Beattie has proposed merging
> lp:~sbeattie/apparmor-profile-tools/pre-merger-cleanups into
> lp:apparmor-profile-tools.
>
> Requested reviews:
> Kshitij Gupta (kgupta8592)
>
> For more details, see:
> https://code.launchpad.net/~sbeattie/apparmor-profile-tools/pre-merger
> -cleanups/+merge/205701
>
> Here are some simple cleanups in preparation for merging the new
> profile tools into trunk.

I had a look at the changes (hint: they are easier to read if you check
the individual commits, for example via the "For more details" link
above - for the pep8 commit, you might want to ignore whitespace
changes) and they all look good.

The only detail I don't like too much is that the changed translation
handling adds some lines to all aa-* tools - but that's something we
should fix with one of the next commits.

To sum it up: Kshitij, IMHO you can merge this :-)
or to say it in a more formal way:
Acked-by: Christian Boltz <email address hidden>

I'd recommend to merge it _before_ commiting my patches - Steve's
changes affect more lines, which also means the risk of merge conflicts
is quite big if you commit my patches first.

Regards,

Christian Boltz
--
Unix: Alles ist ein File, und was kein File ist, hat sich gefaelligst
als ein solches zu tarnen. [Wolfgang Weisselberg in linux-liste]

[lp:~sbeattie/apparmor-profile-tools/pre-merger-cleanups]

100. By Steve Beattie on 2014-02-12

Simplify the work tools and modules need to do to get the shared
translations. External utilities can still use their own textdomains
if they have strings that are not part of the apparmor-utils catalog.

=== modified file 'Tools/aa-audit'
--- Tools/aa-audit	2014-02-01 01:34:08 +0000
+++ Tools/aa-audit	2014-02-12 00:39:55 +0000
@@ -15,11 +15,12 @@
 import argparse
 import traceback
 
-from apparmor.common import init_translations
-init_translations()
-
 import apparmor.tools
 
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
+
 parser = argparse.ArgumentParser(description=_('Switch the given programs to audit mode'))
 parser.add_argument('-d', '--dir', type=str, help=_('path to profiles'))
 parser.add_argument('-r', '--remove', action='store_true', help=_('remove audit mode'))
 
=== modified file 'Tools/aa-autodep'
--- Tools/aa-autodep	2013-10-21 21:36:23 +0000
+++ Tools/aa-autodep	2014-02-12 00:39:55 +0000
@@ -14,11 +14,12 @@
 # ----------------------------------------------------------------------
 import argparse
 
-from apparmor.common import init_translations
-init_translations()
-
 import apparmor.tools
 
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
+
 parser = argparse.ArgumentParser(description=_('Generate a basic AppArmor profile by guessing requirements'))
 parser.add_argument('--force', type=str, help=_('overwrite existing profile'))
 parser.add_argument('-d', '--dir', type=str, help=_('path to profiles'))
@@ -27,4 +28,4 @@
 
 autodep = apparmor.tools.aa_tools('autodep', args)
 
-autodep.act()
 \ No newline at end of file
+autodep.act()
 
=== modified file 'Tools/aa-cleanprof'
--- Tools/aa-cleanprof	2013-10-21 21:36:23 +0000
+++ Tools/aa-cleanprof	2014-02-12 00:39:55 +0000
@@ -14,11 +14,12 @@
 # ----------------------------------------------------------------------
 import argparse
 
-from apparmor.common import init_translations
-init_translations()
-
 import apparmor.tools
 
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
+
 parser = argparse.ArgumentParser(description=_('Cleanup the profiles for the given programs'))
 parser.add_argument('-d', '--dir', type=str, help=_('path to profiles'))
 parser.add_argument('program', type=str, nargs='+', help=_('name of program'))
@@ -27,4 +28,4 @@
 
 clean = apparmor.tools.aa_tools('cleanprof', args)
 
-clean.act()
 \ No newline at end of file
+clean.act()
 
=== modified file 'Tools/aa-complain'
--- Tools/aa-complain	2013-12-29 09:42:30 +0000
+++ Tools/aa-complain	2014-02-12 00:39:55 +0000
@@ -14,11 +14,12 @@
 # ----------------------------------------------------------------------
 import argparse
 
-from apparmor.common import init_translations
-init_translations()
-
 import apparmor.tools
 
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
+
 parser = argparse.ArgumentParser(description=_('Switch the given program to complain mode'))
 parser.add_argument('-d', '--dir', type=str, help=_('path to profiles'))
 parser.add_argument('-r', '--remove', action='store_true', help=_('remove complain mode'))
 
=== modified file 'Tools/aa-disable'
--- Tools/aa-disable	2013-10-21 21:36:23 +0000
+++ Tools/aa-disable	2014-02-12 00:39:55 +0000
@@ -14,11 +14,12 @@
 # ----------------------------------------------------------------------
 import argparse
 
-from apparmor.common import init_translations
-init_translations()
-
 import apparmor.tools
 
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
+
 parser = argparse.ArgumentParser(description=_('Disable the profile for the given programs'))
 parser.add_argument('-d', '--dir', type=str, help=_('path to profiles'))
 parser.add_argument('-r', '--revert', action='store_true', help=_('enable the profile for the given programs'))
 
=== modified file 'Tools/aa-enforce'
--- Tools/aa-enforce	2013-10-21 21:36:23 +0000
+++ Tools/aa-enforce	2014-02-12 00:39:55 +0000
@@ -14,11 +14,12 @@
 # ----------------------------------------------------------------------
 import argparse
 
-from apparmor.common import init_translations
-init_translations()
-
 import apparmor.tools
 
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
+
 parser = argparse.ArgumentParser(description=_('Switch the given program to enforce mode'))
 parser.add_argument('-d', '--dir', type=str, help=_('path to profiles'))
 parser.add_argument('-r', '--remove', action='store_true', help=_('switch to complain mode'))
 
=== modified file 'Tools/aa-genprof'
--- Tools/aa-genprof	2013-12-29 09:42:30 +0000
+++ Tools/aa-genprof	2014-02-12 00:39:55 +0000
@@ -19,11 +19,12 @@
 import subprocess
 import sys
 
-from apparmor.common import init_translations
-init_translations()
-
 import apparmor.aa as apparmor
 
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
+
 def sysctl_read(path):
     value = None
     with open(path, 'r') as f_in:
 
=== modified file 'Tools/aa-logprof'
--- Tools/aa-logprof	2013-12-29 09:42:30 +0000
+++ Tools/aa-logprof	2014-02-12 00:39:55 +0000
@@ -15,11 +15,12 @@
 import argparse
 import os
 
-from apparmor.common import init_translations
-init_translations()
-
 import apparmor.aa as apparmor
 
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
+
 parser = argparse.ArgumentParser(description=_('Process log entries to generate profiles'))
 parser.add_argument('-d', '--dir', type=str, help=_('path to profiles'))
 parser.add_argument('-f', '--file', type=str, help=_('path to logfile'))
 
=== modified file 'Tools/aa-mergeprof'
--- Tools/aa-mergeprof	2013-10-21 21:36:23 +0000
+++ Tools/aa-mergeprof	2014-02-12 00:39:55 +0000
@@ -15,14 +15,15 @@
 import argparse
 import sys
 
-from apparmor.common import init_translations
-init_translations()
-
 import apparmor.aa
 import apparmor.aamode
 import apparmor.severity
 import apparmor.cleanprofile as cleanprofile
 
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
+
 parser = argparse.ArgumentParser(description=_('Perform a 3way merge on the given profiles'))
 parser.add_argument('mine', type=str, help=_('your profile'))
 parser.add_argument('base', type=str, help=_('base profile'))
 
=== modified file 'Tools/aa-unconfined'
--- Tools/aa-unconfined	2013-12-29 09:42:30 +0000
+++ Tools/aa-unconfined	2014-02-12 00:39:55 +0000
@@ -17,11 +17,12 @@
 import re
 import sys
 
-from apparmor.common import init_translations
-init_translations()
-
 import apparmor.aa as apparmor
 
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
+
 parser = argparse.ArgumentParser(description=_("Lists unconfined processes having tcp or udp ports"))
 parser.add_argument("--paranoid", action="store_true", help=_("scan all processes from /proc"))
 args = parser.parse_args()
 
=== modified file 'apparmor/__init__.py'
--- apparmor/__init__.py	2013-12-19 21:42:58 +0000
+++ apparmor/__init__.py	2014-02-12 00:39:55 +0000
@@ -1,24 +1,9 @@
 # ------------------------------------------------------------------
 #
 #    Copyright (C) 2011-2012 Canonical Ltd.
-#    Copyright (C) 2013 Kshitij Gupta <[e-mail]>
 #
 #    This program is free software; you can redistribute it and/or
 #    modify it under the terms of version 2 of the GNU General Public
 #    License published by the Free Software Foundation.
 #
 # ------------------------------------------------------------------
-import gettext
-import locale
-
-def init_localisation():
-    locale.setlocale(locale.LC_ALL, '')
-    #If a correct locale has been provided set filename else let an IOError be raised
-    filename = '/usr/share/locale/%s/LC_MESSAGES/apparmor-utils.mo' % locale.getlocale()[0]
-    try:
-        trans = gettext.GNUTranslations(open(filename, 'rb'))
-    except IOError:
-        trans = gettext.NullTranslations()
-    trans.install()
-
-init_localisation()
 
=== modified file 'apparmor/aa.py'
--- apparmor/aa.py	2014-02-01 00:44:05 +0000
+++ apparmor/aa.py	2014-02-12 00:39:55 +0000
@@ -13,11 +13,11 @@
 # ----------------------------------------------------------------------
 # No old version logs, only 2.6 + supported
 from __future__ import with_statement
+import gettext
 import inspect
 import os
 import re
 import shutil
-import stat
 import subprocess
 import sys
 import time
@@ -33,12 +33,20 @@
 from copy import deepcopy
 
 from apparmor.common import (AppArmorException, error, debug, msg, cmd,
-                             open_file_read, valid_path,
-                             hasher, open_file_write, convert_regexp, DebugLogger)
-
-from apparmor.ui import *
-
-from apparmor.aamode import *
+                             open_file_read, valid_path, hasher,
+                             open_file_write, convert_regexp, DebugLogger)
+
+import apparmor.ui as aaui
+
+from apparmor.aamode import (str_to_mode, mode_to_str, contains, split_mode,
+                             mode_to_str_user, mode_contains, AA_OTHER,
+                             flatten_mode, owner_flatten_mode)
+
+from apparmor.yasti import SendDataToYast, GetDataFromYast, shutdown_yast
+
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
 
 # Setup logging incase of debugging is enabled
 debug_logger = DebugLogger('aa')
@@ -67,7 +75,7 @@
 
 existing_profiles = dict()
 
-seen_events = 0     # was our
+seen_events = 0  # was our
 # To store the globs entered by users so they can be provided again
 user_globs = []
 
@@ -76,7 +84,7 @@
 t = hasher()  # dict()
 transitions = hasher()
 aa = hasher()  # Profiles originally in sd, replace by aa
-original_aa =  hasher()
+original_aa = hasher()
 extras = hasher()  # Inactive profiles from extras
 ### end our
 log = []
@@ -85,11 +93,11 @@
 seen = hasher()  # dir()
 profile_changes = hasher()
 prelog = hasher()
-log_dict = hasher()#dict()
+log_dict = hasher()  # dict()
 changed = dict()
 created = []
 skip = hasher()
-helpers = dict() # Preserve this between passes # was our
+helpers = dict()  # Preserve this between passes # was our
 ### logprof ends
 
 filelist = hasher()    # File level variables and stuff in config files
@@ -110,7 +118,7 @@
         return False
     size = os.stat(file).st_size
     # Limit to checking files under 100k for the sake of speed
-    if size >100000:
+    if size > 100000:
         return False
     with open_file_read(file, encoding='ascii') as f_in:
         for line in f_in:
@@ -128,11 +136,11 @@
     caller = inspect.stack()[1][3]
 
     # If caller is SendDataToYast or GetDatFromYast simply exit
-    if caller == 'SendDataToYast' or caller== 'GetDatFromYast':
+    if caller == 'SendDataToYast' or caller == 'GetDatFromYast':
         sys.exit(1)
 
     # Else tell user what happened
-    UI_Important(message)
+    aaui.UI_Important(message)
     shutdown_yast()
     sys.exit(1)
 
@@ -164,7 +172,7 @@
 
 def which(file):
     """Returns the executable fullpath for the file, None otherwise"""
-    if sys.version_info >= (3,3):
+    if sys.version_info >= (3, 3):
         return shutil.which(file)
     env_dirs = os.getenv('PATH').split(':')
     for env_dir in env_dirs:
@@ -238,33 +246,33 @@
 def complain(path):
     """Sets the profile to complain mode if it exists"""
     prof_filename, name = name_to_prof_filename(path)
-    if not prof_filename :
+    if not prof_filename:
         fatal_error(_("Can't find %s") % path)
     set_complain(prof_filename, name)
 
 def enforce(path):
     """Sets the profile to enforce mode if it exists"""
     prof_filename, name = name_to_prof_filename(path)
-    if not prof_filename :
+    if not prof_filename:
         fatal_error(_("Can't find %s") % path)
     set_enforce(prof_filename, name)
 
 def set_complain(filename, program):
     """Sets the profile to complain mode"""
-    UI_Info(_('Setting %s to complain mode.') % program)
+    aaui.UI_Info(_('Setting %s to complain mode.') % program)
     create_symlink('force-complain', filename)
     change_profile_flags(filename, program, 'complain', True)
 
 def set_enforce(filename, program):
     """Sets the profile to enforce mode"""
-    UI_Info(_('Setting %s to enforce mode.') % program)
+    aaui.UI_Info(_('Setting %s to enforce mode.') % program)
     delete_symlink('force-complain', filename)
     delete_symlink('disable', filename)
     change_profile_flags(filename, program, 'complain', False)
 
 def delete_symlink(subdir, filename):
     path = filename
-    link = re.sub('^%s'%profile_dir, '%s/%s'%(profile_dir, subdir), path)
+    link = re.sub('^%s' % profile_dir, '%s/%s' % (profile_dir, subdir), path)
     if link != path and os.path.islink(link):
         os.remove(link)
 
@@ -272,13 +280,13 @@
     path = filename
     bname = os.path.basename(filename)
     if not bname:
-        raise AppArmorException(_('Unable to find basename for %s.')%filename)
+        raise AppArmorException(_('Unable to find basename for %s.') % filename)
     #print(filename)
-    link = re.sub('^%s'%profile_dir, '%s/%s'%(profile_dir, subdir), path)
+    link = re.sub('^%s' % profile_dir, '%s/%s' % (profile_dir, subdir), path)
     #print(link)
     #link = link + '/%s'%bname
     #print(link)
-    symlink_dir=os.path.dirname(link)
+    symlink_dir = os.path.dirname(link)
     if not os.path.exists(symlink_dir):
         # If the symlink directory does not exist create it
         os.makedirs(symlink_dir)
@@ -287,7 +295,7 @@
         try:
             os.symlink(filename, link)
         except:
-            raise AppArmorException(_('Could not create %s symlink to %s.')%(link, filename))
+            raise AppArmorException(_('Could not create %s symlink to %s.') % (link, filename))
 
 def head(file):
     """Returns the first/head line of the file"""
@@ -300,7 +308,7 @@
                 pass
             return first
     else:
-        raise AppArmorException(_('Unable to read first line from %s: File Not Found') %file)
+        raise AppArmorException(_('Unable to read first line from %s: File Not Found') % file)
 
 def get_output(params):
     """Returns the return code output by running the program with the args given in the list"""
@@ -314,7 +322,7 @@
             # Get the output of the program
             output = subprocess.check_output(params)
         except OSError as e:
-            raise  AppArmorException(_("Unable to fork: %s\n\t%s") %(program, str(e)))
+            raise AppArmorException(_("Unable to fork: %s\n\t%s") % (program, str(e)))
             # If exit-codes besides 0
         except subprocess.CalledProcessError as e:
             output = e.output
@@ -419,7 +427,7 @@
 
     created.append(localfile)
     changed.append(localfile)
-    
+
     debug_logger.debug("Profile for %s:\n\t%s" % (localfile, local_profile.__str__()))
     return {localfile: local_profile}
 
@@ -434,9 +442,9 @@
     #prof_unload(local_prof)
 
 def confirm_and_abort():
-    ans = UI_YesNo(_('Are you sure you want to abandon this set of profile changes and exit?'), 'n')
+    ans = aaui.UI_YesNo(_('Are you sure you want to abandon this set of profile changes and exit?'), 'n')
     if ans == 'y':
-        UI_Info(_('Abandoning all changes.'))
+        aaui.UI_Info(_('Abandoning all changes.'))
         shutdown_yast()
         for prof in created:
             delete_profile(prof)
@@ -449,13 +457,13 @@
     local_profiles = []
     profile_hash = hasher()
     if repo_is_enabled():
-        UI_BusyStart(_('Connecting to repository...'))
+        aaui.UI_BusyStart(_('Connecting to repository...'))
         status_ok, ret = fetch_profiles_by_name(repo_url, distro, prof_name)
-        UI_BusyStop()
+        aaui.UI_BusyStop()
         if status_ok:
             profile_hash = ret
         else:
-            UI_Important(_('WARNING: Error fetching profiles from the repository'))
+            aaui.UI_Important(_('WARNING: Error fetching profiles from the repository'))
     inactive_profile = get_inactive_profile(prof_name)
     if inactive_profile:
         uname = 'Inactive local profile for %s' % prof_name
@@ -493,13 +501,12 @@
 
     ans = ''
     while 'CMD_USE_PROFILE' not in ans and 'CMD_CREATE_PROFILE' not in ans:
-        ans, arg = UI_PromptUser(q)
+        ans, arg = aaui.UI_PromptUser(q)
         p = profile_hash[options[arg]]
         q['selected'] = options.index(options[arg])
         if ans == 'CMD_VIEW_PROFILE':
-            if UI_mode == 'yast':
-                SendDataToYast({
-                                'type': 'dialogue-view-profile',
+            if aaui.UI_mode == 'yast':
+                SendDataToYast({'type': 'dialogue-view-profile',
                                 'user': options[arg],
                                 'profile': p['profile'],
                                 'profile_type': p['profile_type']
@@ -530,7 +537,7 @@
             if complain:
                 fname = get_profile_filename(pname)
                 set_profile_flags(profile_dir + fname, 'complain')
-                UI_Info(_('Setting %s to complain mode.') % pname)
+                aaui.UI_Info(_('Setting %s to complain mode.') % pname)
     except Exception as e:
             sys.stderr.write(_("Error activating profiles: %s") % e)
 
@@ -585,7 +592,7 @@
                 if profile == program:
                     return flags
 
-    raise AppArmorException(_('%s contains no profile')%filename)
+    raise AppArmorException(_('%s contains no profile') % filename)
 
 def change_profile_flags(filename, program, flag, set_flag):
     old_flags = get_profile_flags(filename, program)
@@ -595,7 +602,7 @@
         # Flags maybe white-space and/or , separated
         old_flags = old_flags.split(',')
 
-        if type(old_flags) == type([]):
+        if not isinstance(old_flags, str):
             for i in old_flags:
                 newflags += i.split()
         else:
@@ -619,7 +626,7 @@
     regex_hat_flag = re.compile('^([a-z]*)\s+([A-Z]*)\s*(#.*)?$')
     if os.path.isfile(prof_filename):
         with open_file_read(prof_filename) as f_in:
-            temp_file = tempfile.NamedTemporaryFile('w', prefix=prof_filename , suffix='~', delete=False, dir=profile_dir)
+            temp_file = tempfile.NamedTemporaryFile('w', prefix=prof_filename, suffix='~', delete=False, dir=profile_dir)
             shutil.copymode(prof_filename, temp_file.name)
             with open_file_write(temp_file.name) as f_out:
                 for line in f_in:
@@ -679,7 +686,7 @@
     if not status_ok:
         if not ret:
             ret = 'UNKNOWN ERROR'
-        UI_Important(_('WARNING: Error synchronizing profiles with the repository:\n%s\n') % ret)
+        aaui.UI_Important(_('WARNING: Error synchronizing profiles with the repository:\n%s\n') % ret)
     else:
         users_repo_profiles = ret
         serialize_opts['NO_FLAGS'] = True
@@ -717,7 +724,7 @@
                         else:
                             if not ret:
                                 ret = 'UNKNOWN ERROR'
-                            UI_Important(_('WARNING: Error synchronizing profiles with the repository\n%s') % ret)
+                            aaui.UI_Important(_('WARNING: Error synchronizing profiles with the repository\n%s') % ret)
                             continue
                     if p_repo != p_local:
                         changed_profiles.append(prof)
@@ -743,7 +750,7 @@
 def submit_created_profiles(new_profiles):
     #url = cfg['repository']['url']
     if new_profiles:
-        if UI_mode == 'yast':
+        if aaui.UI_mode == 'yast':
             title = 'New Profiles'
             message = 'Please select the newly created profiles that you would like to store in the repository'
             yast_select_and_upload_profiles(title, message, new_profiles)
@@ -755,7 +762,7 @@
 def submit_changed_profiles(changed_profiles):
     #url = cfg['repository']['url']
     if changed_profiles:
-        if UI_mode == 'yast':
+        if aaui.UI_mode == 'yast':
             title = 'Changed Profiles'
             message = 'Please select which of the changed profiles would you like to upload to the repository'
             yast_select_and_upload_profiles(title, message, changed_profiles)
@@ -770,8 +777,7 @@
     profs = profiles_up[:]
     for p in profs:
         profile_changes[p[0]] = get_profile_diff(p[2], p[1])
-    SendDataToYast({
-                    'type': 'dialog-select-profiles',
+    SendDataToYast({'type': 'dialog-select-profiles',
                     'title': title,
                     'explanation': message,
                     'default_select': 'false',
@@ -806,8 +812,8 @@
         else:
             if not ret:
                 ret = 'UNKNOWN ERROR'
-            UI_Important(_('WARNING: An error occurred while uploading the profile %s\n%s') % (p, ret))
-    UI_Info(_('Uploaded changes to repository.'))
+            aaui.UI_Important(_('WARNING: An error occurred while uploading the profile %s\n%s') % (p, ret))
+    aaui.UI_Info(_('Uploaded changes to repository.'))
     if yarg.get('NEVER_ASK_AGAIN'):
         unselected_profiles = []
         for p in profs:
@@ -833,13 +839,13 @@
     q['selected'] = 0
     ans = ''
     while 'CMD_UPLOAD_CHANGES' not in ans and 'CMD_ASK_NEVER' not in ans and 'CMD_ASK_LATER' not in ans:
-        ans, arg = UI_PromptUser(q)
+        ans, arg = aaui.UI_PromptUser(q)
         if ans == 'CMD_VIEW_CHANGES':
             display_changes(profs[arg][2], profs[arg][1])
     if ans == 'CMD_NEVER_ASK':
         set_profiles_local_only([i[0] for i in profs])
     elif ans == 'CMD_UPLOAD_CHANGES':
-        changelog = UI_GetString(_('Changelog Entry: '), '')
+        changelog = aaui.UI_GetString(_('Changelog Entry: '), '')
         user, passw = get_repo_user_pass()
         if user and passw:
             for p_data in profs:
@@ -847,19 +853,19 @@
                 prof_string = p_data[1]
                 status_ok, ret = upload_profile(url, user, passw,
                                                 cfg['repository']['distro'],
-                                                prof, prof_string, changelog )
+                                                prof, prof_string, changelog)
                 if status_ok:
                     newprof = ret
                     newid = newprof['id']
                     set_repo_info(aa[prof][prof], url, user, newid)
                     write_profile_ui_feedback(prof)
-                    UI_Info('Uploaded %s to repository' % prof)
+                    aaui.UI_Info('Uploaded %s to repository' % prof)
                 else:
                     if not ret:
                         ret = 'UNKNOWN ERROR'
-                    UI_Important(_('WARNING: An error occurred while uploading the profile %s\n%s') % (prof, ret))
+                    aaui.UI_Important(_('WARNING: An error occurred while uploading the profile %s\n%s') % (prof, ret))
         else:
-            UI_Important(_('Repository Error\nRegistration or Signin was unsuccessful. User login\ninformation is required to upload profiles to the repository.\nThese changes could not be sent.'))
+            aaui.UI_Important(_('Repository Error\nRegistration or Signin was unsuccessful. User login\ninformation is required to upload profiles to the repository.\nThese changes could not be sent.'))
 
 def set_profiles_local_only(profs):
     for p in profs:
@@ -886,7 +892,7 @@
                 ret_list.append('CMD_EXEC_IX_OFF')
         if 'u' in options:
             ret_list.append('CMD_ux')
-            
+
     else:
         if 'i' in options:
             ret_list.append('CMD_ix')
@@ -985,7 +991,7 @@
 
                     seen_events += 1
 
-                    ans = UI_PromptUser(q)
+                    ans = aaui.UI_PromptUser(q)
 
                 transitions[context] = ans
 
@@ -1043,7 +1049,7 @@
                     else:
                         do_execute = True
 
-                if mode & AA_MAY_LINK:
+                if mode & apparmor.aamode.AA_MAY_LINK:
                     regex_link = re.compile('^from (.+) to (.+)$')
                     match = regex_link.search(detail)
                     if match:
@@ -1090,7 +1096,7 @@
                     combinedaudit = set()
                     ## Check return Value Consistency
                     # Check if path matches any existing regexps in profile
-                    cm, am , m = rematchfrag(aa[profile][hat], 'allow', exec_target)
+                    cm, am, m = rematchfrag(aa[profile][hat], 'allow', exec_target)
                     if cm:
                         combinedmode |= cm
                     if am:
@@ -1202,7 +1208,7 @@
                         default = None
                         if 'p' in options and os.path.exists(get_profile_filename(exec_target)):
                             default = 'CMD_px'
-                            sys.stdout.write(_('Target profile exists: %s\n') %get_profile_filename(exec_target))
+                            sys.stdout.write(_('Target profile exists: %s\n') % get_profile_filename(exec_target))
                         elif 'i' in options:
                             default = 'CMD_ix'
                         elif 'c' in options:
@@ -1241,7 +1247,7 @@
 
                         ans = ''
                         while not regex_options.search(ans):
-                            ans = UI_PromptUser(q)[0].strip()
+                            ans = aaui.UI_PromptUser(q)[0].strip()
                             if ans.startswith('CMD_EXEC_IX_'):
                                 exec_toggle = not exec_toggle
                                 q['functions'] = []
@@ -1252,7 +1258,7 @@
                                 arg = exec_target
                                 ynans = 'n'
                                 if profile == hat:
-                                    ynans = UI_YesNo(_('Are you specifying a transition to a local profile?'), 'n')
+                                    ynans = aaui.UI_YesNo(_('Are you specifying a transition to a local profile?'), 'n')
                                 if ynans == 'y':
                                     if ans == 'CMD_nx':
                                         ans = 'CMD_cx'
@@ -1264,7 +1270,7 @@
                                     else:
                                         ans = 'CMD_pix'
 
-                                to_name = UI_GetString(_('Enter profile name to transition to: '), arg)
+                                to_name = aaui.UI_GetString(_('Enter profile name to transition to: '), arg)
 
                             regex_optmode = re.compile('CMD_(px|cx|nx|pix|cix|nix)')
                             if ans == 'CMD_ix':
@@ -1277,18 +1283,18 @@
                                 if parent_uses_ld_xxx:
                                     px_msg = _("Should AppArmor sanitise the environment when\nswitching profiles?\n\nSanitising environment is more secure,\nbut this application appears to be using LD_PRELOAD\nor LD_LIBRARY_PATH and sanitising the environment\ncould cause functionality problems.")
 
-                                ynans = UI_YesNo(px_msg, px_default)
+                                ynans = aaui.UI_YesNo(px_msg, px_default)
                                 if ynans == 'y':
                                     # Disable the unsafe mode
-                                    exec_mode = exec_mode - (AA_EXEC_UNSAFE | AA_OTHER(AA_EXEC_UNSAFE))
+                                    exec_mode = exec_mode - (apparmor.aamode.AA_EXEC_UNSAFE | AA_OTHER(apparmor.aamode.AA_EXEC_UNSAFE))
                             elif ans == 'CMD_ux':
                                 exec_mode = str_to_mode('ux')
-                                ynans = UI_YesNo(_("Launching processes in an unconfined state is a very\ndangerous operation and can cause serious security holes.\n\nAre you absolutely certain you wish to remove all\nAppArmor protection when executing %s ?") % exec_target, 'n')
+                                ynans = aaui.UI_YesNo(_("Launching processes in an unconfined state is a very\ndangerous operation and can cause serious security holes.\n\nAre you absolutely certain you wish to remove all\nAppArmor protection when executing %s ?") % exec_target, 'n')
                                 if ynans == 'y':
-                                    ynans = UI_YesNo(_("Should AppArmor sanitise the environment when\nrunning this program unconfined?\n\nNot sanitising the environment when unconfining\na program opens up significant security holes\nand should be avoided if at all possible."), 'y')
+                                    ynans = aaui.UI_YesNo(_("Should AppArmor sanitise the environment when\nrunning this program unconfined?\n\nNot sanitising the environment when unconfining\na program opens up significant security holes\nand should be avoided if at all possible."), 'y')
                                     if ynans == 'y':
                                         # Disable the unsafe mode
-                                        exec_mode = exec_mode - (AA_EXEC_UNSAFE | AA_OTHER(AA_EXEC_UNSAFE))
+                                        exec_mode = exec_mode - (apparmor.aamode.AA_EXEC_UNSAFE | AA_OTHER(apparmor.aamode.AA_EXEC_UNSAFE))
                                 else:
                                     ans = 'INVALID'
                         transitions[context_new] = ans
@@ -1345,7 +1351,7 @@
 
                     if ans == 'CMD_ix':
                         if hat:
-                            profile_changes[pid] = '%s//%s' %(profile, hat)
+                            profile_changes[pid] = '%s//%s' % (profile, hat)
                         else:
                             profile_changes[pid] = '%s//' % profile
                     elif re.search('^CMD_(px|nx|pix|nix)', ans):
@@ -1361,7 +1367,7 @@
                         if not os.path.exists(get_profile_filename(exec_target)):
                             ynans = 'y'
                             if exec_mode & str_to_mode('i'):
-                                ynans = UI_YesNo(_('A profile for %s does not exist.\nDo you want to create one?') %exec_target, 'n')
+                                ynans = aaui.UI_YesNo(_('A profile for %s does not exist.\nDo you want to create one?') % exec_target, 'n')
                             if ynans == 'y':
                                 helpers[exec_target] = 'enforce'
                                 if to_name:
@@ -1379,7 +1385,7 @@
                         if not aa[profile].get(exec_target, False):
                             ynans = 'y'
                             if exec_mode & str_to_mode('i'):
-                                ynans = UI_YesNo(_('A profile for %s does not exist.\nDo you want to create one?') % exec_target, 'n')
+                                ynans = aaui.UI_YesNo(_('A profile for %s does not exist.\nDo you want to create one?') % exec_target, 'n')
                             if ynans == 'y':
                                 hat = exec_target
                                 aa[profile][hat]['declared'] = False
@@ -1488,9 +1494,9 @@
     for aamode in sorted(log_dict.keys()):
         # Describe the type of changes
         if aamode == 'PERMITTING':
-            UI_Info(_('Complain-mode changes:'))
+            aaui.UI_Info(_('Complain-mode changes:'))
         elif aamode == 'REJECTING':
-            UI_Info(_('Enforce-mode changes:'))
+            aaui.UI_Info(_('Enforce-mode changes:'))
         else:
             # This is so wrong!
             fatal_error(_('Invalid mode found: %s') % aamode)
@@ -1520,7 +1526,7 @@
                     q = hasher()
 
                     if newincludes:
-                        options += list(map(lambda inc: '#include <%s>' %inc, sorted(set(newincludes))))
+                        options += list(map(lambda inc: '#include <%s>' % inc, sorted(set(newincludes))))
 
                     if options:
                         options.append('capability %s' % capability)
@@ -1546,7 +1552,7 @@
 
                     done = False
                     while not done:
-                        ans, selected = UI_PromptUser(q)
+                        ans, selected = aaui.UI_PromptUser(q)
                         # Ignore the log entry
                         if ans == 'CMD_IGNORE_ENTRY':
                             done = True
@@ -1574,27 +1580,27 @@
                             match = re_match_include(selection)
                             if match:
                                 deleted = False
-                                inc = match #.groups()[0]
+                                inc = match  # .groups()[0]
                                 deleted = delete_duplicates(aa[profile][hat], inc)
                                 aa[profile][hat]['include'][inc] = True
 
-                                UI_Info(_('Adding %s to profile.') % selection)
+                                aaui.UI_Info(_('Adding %s to profile.') % selection)
                                 if deleted:
-                                    UI_Info(_('Deleted %s previous matching profile entries.') % deleted)
+                                    aaui.UI_Info(_('Deleted %s previous matching profile entries.') % deleted)
 
                             aa[profile][hat]['allow']['capability'][capability]['set'] = True
                             aa[profile][hat]['allow']['capability'][capability]['audit'] = audit_toggle
 
                             changed[profile] = True
 
-                            UI_Info(_('Adding capability %s to profile.') % capability)
+                            aaui.UI_Info(_('Adding capability %s to profile.') % capability)
                             done = True
 
                         elif ans == 'CMD_DENY':
                             aa[profile][hat]['deny']['capability'][capability]['set'] = True
                             changed[profile] = True
 
-                            UI_Info(_('Denying capability %s to profile.') % capability)
+                            aaui.UI_Info(_('Denying capability %s to profile.') % capability)
                             done = True
                         else:
                             done = False
@@ -1632,7 +1638,7 @@
                     if cam:
                         deny_audit |= cam
 
-                    if deny_mode & AA_MAY_EXEC:
+                    if deny_mode & apparmor.aamode.AA_MAY_EXEC:
                         deny_mode |= apparmor.aamode.ALL_AA_EXEC_TYPE
 
                     # Mask off the denied modes
@@ -1641,10 +1647,10 @@
                     # If we get an exec request from some kindof event that generates 'PERMITTING X'
                     # check if its already in allow_mode
                     # if not add ix permission
-                    if mode & AA_MAY_EXEC:
+                    if mode & apparmor.aamode.AA_MAY_EXEC:
                         # Remove all type access permission
                         mode = mode - apparmor.aamode.ALL_AA_EXEC_TYPE
-                        if not allow_mode & AA_MAY_EXEC:
+                        if not allow_mode & apparmor.aamode.AA_MAY_EXEC:
                             mode |= str_to_mode('ix')
 
                     # m is not implied by ix
@@ -1678,7 +1684,7 @@
                             if aa[profile][hat][incname]:
                                 continue
                             if incname.startswith(profile_dir):
-                                incname = incname.replace(profile_dir+'/', '', 1)
+                                incname = incname.replace(profile_dir + '/', '', 1)
 
                             include_valid = valid_include('', incname)
 
@@ -1725,7 +1731,7 @@
                             owner_toggle = cfg['settings']['default_owner_prompt']
                         done = False
                         while not done:
-                            q =  hasher()
+                            q = hasher()
                             q['headers'] = [_('Profile'), combine_name(profile, hat),
                                             _('Path'), path]
 
@@ -1789,7 +1795,7 @@
 
                             seen_events += 1
 
-                            ans, selected = UI_PromptUser(q)
+                            ans, selected = aaui.UI_PromptUser(q)
 
                             if ans == 'CMD_IGNORE_ENTRY':
                                 done = True
@@ -1806,16 +1812,16 @@
                             elif ans == 'CMD_ALLOW':
                                 path = options[selected]
                                 done = True
-                                match = re_match_include(path) #.search('^#include\s+<(.+)>$', path)
+                                match = re_match_include(path)  # .search('^#include\s+<(.+)>$', path)
                                 if match:
-                                    inc = match #.groups()[0]
+                                    inc = match  # .groups()[0]
                                     deleted = 0
                                     deleted = delete_duplicates(aa[profile][hat], inc)
-                                    aa[profile][hat]['include'][inc] =  True
-                                    changed[profile] =  True
-                                    UI_Info(_('Adding %s to profile.') % path)
+                                    aa[profile][hat]['include'][inc] = True
+                                    changed[profile] = True
+                                    aaui.UI_Info(_('Adding %s to profile.') % path)
                                     if deleted:
-                                        UI_Info(_('Deleted %s previous matching profile entries.') % deleted)
+                                        aaui.UI_Info(_('Deleted %s previous matching profile entries.') % deleted)
 
                                 else:
                                     if aa[profile][hat]['allow']['path'][path].get('mode', False):
@@ -1845,7 +1851,7 @@
 
                                     tmpmode = set()
                                     if audit_toggle == 1:
-                                        tmpmode = mode- allow_mode
+                                        tmpmode = mode - allow_mode
                                     elif audit_toggle == 2:
                                         tmpmode = mode
 
@@ -1853,9 +1859,9 @@
 
                                     changed[profile] = True
 
-                                    UI_Info(_('Adding %s %s to profile') % (path, mode_to_str_user(mode)))
+                                    aaui.UI_Info(_('Adding %s %s to profile') % (path, mode_to_str_user(mode)))
                                     if deleted:
-                                        UI_Info(_('Deleted %s previous matching profile entries.') % deleted)
+                                        aaui.UI_Info(_('Deleted %s previous matching profile entries.') % deleted)
 
                             elif ans == 'CMD_DENY':
                                 path = options[selected].strip()
@@ -1871,11 +1877,11 @@
                             elif ans == 'CMD_NEW':
                                 arg = options[selected]
                                 if not re_match_include(arg):
-                                    ans = UI_GetString(_('Enter new path: '), arg)
+                                    ans = aaui.UI_GetString(_('Enter new path: '), arg)
                                     if ans:
                                         if not matchliteral(ans, path):
-                                            ynprompt = _('The specified path does not match this log entry:\n\n  Log Entry: %s\n  Entered Path:  %s\nDo you really want to use this path?') % (path,ans)
-                                            key = UI_YesNo(ynprompt, 'n')
+                                            ynprompt = _('The specified path does not match this log entry:\n\n  Log Entry: %s\n  Entered Path:  %s\nDo you really want to use this path?') % (path, ans)
+                                            key = aaui.UI_YesNo(ynprompt, 'n')
                                             if key == 'n':
                                                 continue
 
@@ -1919,7 +1925,7 @@
                         newincludes = match_net_includes(aa[profile][hat], family, sock_type)
                         q = hasher()
                         if newincludes:
-                            options += list(map(lambda s: '#include <%s>'%s, sorted(set(newincludes))))
+                            options += list(map(lambda s: '#include <%s>' % s, sorted(set(newincludes))))
                         if options:
                             options.append('network %s %s' % (family, sock_type))
                             q['options'] = options
@@ -1941,7 +1947,7 @@
 
                         done = False
                         while not done:
-                            ans, selected = UI_PromptUser(q)
+                            ans, selected = aaui.UI_PromptUser(q)
                             if ans == 'CMD_IGNORE_ENTRY':
                                 done = True
                                 break
@@ -1963,18 +1969,18 @@
                             elif ans == 'CMD_ALLOW':
                                 selection = options[selected]
                                 done = True
-                                if re_match_include(selection): #re.search('#include\s+<.+>$', selection):
-                                    inc =  re_match_include(selection) #re.search('#include\s+<(.+)>$', selection).groups()[0]
-                                    deleted =  0
+                                if re_match_include(selection):  # re.search('#include\s+<.+>$', selection):
+                                    inc = re_match_include(selection)  # re.search('#include\s+<(.+)>$', selection).groups()[0]
+                                    deleted = 0
                                     deleted = delete_duplicates(aa[profile][hat], inc)
 
                                     aa[profile][hat]['include'][inc] = True
 
                                     changed[profile] = True
 
-                                    UI_Info(_('Adding %s to profile') % selection)
+                                    aaui.UI_Info(_('Adding %s to profile') % selection)
                                     if deleted:
-                                        UI_Info(_('Deleted %s previous matching profile entries.') % deleted)
+                                        aaui.UI_Info(_('Deleted %s previous matching profile entries.') % deleted)
 
                                 else:
                                     aa[profile][hat]['allow']['netdomain']['audit'][family][sock_type] = audit_toggle
@@ -1982,13 +1988,13 @@
 
                                     changed[profile] = True
 
-                                    UI_Info(_('Adding network access %s %s to profile.') % (family, sock_type))
+                                    aaui.UI_Info(_('Adding network access %s %s to profile.') % (family, sock_type))
 
                             elif ans == 'CMD_DENY':
                                 done = True
                                 aa[profile][hat]['deny']['netdomain']['rule'][family][sock_type] = True
                                 changed[profile] = True
-                                UI_Info(_('Denying network access %s %s to profile') % (family, sock_type))
+                                aaui.UI_Info(_('Denying network access %s %s to profile') % (family, sock_type))
 
                             else:
                                 done = False
@@ -1998,13 +2004,13 @@
     if newpath[-1] == '/':
         if newpath[-4:] == '/**/' or newpath[-3:] == '/*/':
             # /foo/**/ and /foo/*/ => /**/
-            newpath = re.sub('/[^/]+/\*{1,2}/$', '/**/', newpath) #re.sub('/[^/]+/\*{1,2}$/', '/\*\*/', newpath)
+            newpath = re.sub('/[^/]+/\*{1,2}/$', '/**/', newpath)  # re.sub('/[^/]+/\*{1,2}$/', '/\*\*/', newpath)
         elif re.search('/[^/]+\*\*[^/]*/$', newpath):
             # /foo**/ and /foo**bar/ => /**/
-            newpath =  re.sub('/[^/]+\*\*[^/]*/$', '/**/', newpath)
+            newpath = re.sub('/[^/]+\*\*[^/]*/$', '/**/', newpath)
         elif re.search('/\*\*[^/]+/$', newpath):
             # /**bar/ => /**/
-            newpath =  re.sub('/\*\*[^/]+/$', '/**/', newpath)
+            newpath = re.sub('/\*\*[^/]+/$', '/**/', newpath)
         else:
             newpath = re.sub('/[^/]+/$', '/*/', newpath)
     else:
@@ -2016,7 +2022,7 @@
                 newpath = re.sub('/[^/]*\*\*[^/]+$', '/**', newpath)
             elif re.search('/[^/]+\*\*$', newpath):
                 # /foo** => /**
-                newpath =  re.sub('/[^/]+\*\*$', '/**', newpath)
+                newpath = re.sub('/[^/]+\*\*$', '/**', newpath)
             else:
                 newpath = re.sub('/[^/]+$', '/*', newpath)
     return newpath
@@ -2027,19 +2033,19 @@
     match = re.search('/\*{1,2}(\.[^/]+)$', newpath)
     if match:
         # /foo/**.ext and /foo/*.ext => /**.ext
-        newpath = re.sub('/[^/]+/\*{1,2}\.[^/]+$', '/**'+match.groups()[0], newpath)
+        newpath = re.sub('/[^/]+/\*{1,2}\.[^/]+$', '/**' + match.groups()[0], newpath)
     elif re.search('/[^/]+\*\*[^/]*\.[^/]+$', newpath):
         # /foo**.ext and /foo**bar.ext => /**.ext
         match = re.search('/[^/]+\*\*[^/]*(\.[^/]+)$', newpath)
-        newpath = re.sub('/[^/]+\*\*[^/]*\.[^/]+$', '/**'+match.groups()[0], newpath)
+        newpath = re.sub('/[^/]+\*\*[^/]*\.[^/]+$', '/**' + match.groups()[0], newpath)
     elif re.search('/\*\*[^/]+\.[^/]+$', newpath):
         # /**foo.ext => /**.ext
         match = re.search('/\*\*[^/]+(\.[^/]+)$', newpath)
-        newpath = re.sub('/\*\*[^/]+\.[^/]+$', '/**'+match.groups()[0], newpath)
+        newpath = re.sub('/\*\*[^/]+\.[^/]+$', '/**' + match.groups()[0], newpath)
     else:
         match = re.search('(\.[^/]+)$', newpath)
         if match:
-            newpath = re.sub('/[^/]+(\.[^/]+)$', '/*'+match.groups()[0], newpath)
+            newpath = re.sub('/[^/]+(\.[^/]+)$', '/*' + match.groups()[0], newpath)
     return newpath
 
 def delete_net_duplicates(netrules, incnetrules):
@@ -2081,7 +2087,7 @@
 def delete_path_duplicates(profile, incname, allow):
     deleted = []
     for entry in profile[allow]['path'].keys():
-        if entry == '#include <%s>'%incname:
+        if entry == '#include <%s>' % incname:
             continue
         cm, am, m = match_include_to_path(incname, allow, entry)
         if cm and mode_contains(cm, profile[allow]['path'][entry]['mode']) and mode_contains(am, profile[allow]['path'][entry]['audit']):
@@ -2201,10 +2207,10 @@
     skip = hasher()
 #    filelist = hasher()
 
-    UI_Info(_('Reading log entries from %s.') %filename)
+    aaui.UI_Info(_('Reading log entries from %s.') % filename)
 
     if not passno:
-        UI_Info(_('Updating AppArmor profiles in %s.') %profile_dir)
+        aaui.UI_Info(_('Updating AppArmor profiles in %s.') % profile_dir)
         read_profiles()
 
     if not sev_db:
@@ -2231,7 +2237,7 @@
 
     ask_the_questions()
 
-    if UI_mode == 'yast':
+    if aaui.UI_mode == 'yast':
         # To-Do
         pass
 
@@ -2263,7 +2269,7 @@
 
     if changed_list:
 
-        if UI_mode == 'yast':
+        if aaui.UI_mode == 'yast':
             # To-Do
             selected_profiles = []
             profile_changes = dict()
@@ -2273,8 +2279,7 @@
                 profile_changes[prof] = get_profile_diff(oldprofile, newprofile)
             explanation = _('Select which profile changes you would like to save to the\nlocal profile set.')
             title = _('Local profile changes')
-            SendDataToYast({
-                            'type': 'dialog-select-profiles',
+            SendDataToYast({'type': 'dialog-select-profiles',
                             'title': title,
                             'explanation': explanation,
                             'dialog_select': 'true',
@@ -2299,13 +2304,13 @@
             q['default'] = 'CMD_VIEW_CHANGES'
             q['options'] = changed
             q['selected'] = 0
-            p =None
+            p = None
             ans = ''
             arg = None
             while ans != 'CMD_SAVE_CHANGES':
                 if not changed:
                     return
-                ans, arg = UI_PromptUser(q)
+                ans, arg = aaui.UI_PromptUser(q)
                 if ans == 'CMD_SAVE_SELECTED':
                     profile_name = list(changed.keys())[arg]
                     write_profile_ui_feedback(profile_name)
@@ -2350,7 +2355,7 @@
 
     difftemp = tempfile.NamedTemporaryFile('w', delete=False)
 
-    subprocess.call('diff -u -p %s %s > %s' %(oldtemp.name, newtemp.name, difftemp.name), shell=True)
+    subprocess.call('diff -u -p %s %s > %s' % (oldtemp.name, newtemp.name, difftemp.name), shell=True)
 
     oldtemp.close()
     newtemp.close()
@@ -2369,19 +2374,19 @@
     return ''.join(diff)
 
 def display_changes(oldprofile, newprofile):
-    if UI_mode == 'yast':
-        UI_LongMessage(_('Profile Changes'), get_profile_diff(oldprofile, newprofile))
+    if aaui.UI_mode == 'yast':
+        aaui.UI_LongMessage(_('Profile Changes'), get_profile_diff(oldprofile, newprofile))
     else:
         difftemp = generate_diff(oldprofile, newprofile)
-        subprocess.call('less %s' %difftemp.name, shell=True)
+        subprocess.call('less %s' % difftemp.name, shell=True)
         difftemp.delete = True
         difftemp.close()
 
 def display_changes_with_comments(oldprofile, newprofile):
     """Compare the new profile with the existing profile inclusive of all the comments"""
     if not os.path.exists(oldprofile):
-        raise AppArmorException(_("Can't find existing profile %s to compare changes.") %oldprofile)
-    if UI_mode == 'yast':
+        raise AppArmorException(_("Can't find existing profile %s to compare changes.") % oldprofile)
+    if aaui.UI_mode == 'yast':
         #To-Do
         pass
     else:
@@ -2391,10 +2396,10 @@
 
         difftemp = tempfile.NamedTemporaryFile('w')
 
-        subprocess.call('diff -u -p %s %s > %s' %(oldprofile, newtemp.name, difftemp.name), shell=True)
+        subprocess.call('diff -u -p %s %s > %s' % (oldprofile, newtemp.name, difftemp.name), shell=True)
 
         newtemp.close()
-        subprocess.call('less %s' %difftemp.name, shell=True)
+        subprocess.call('less %s' % difftemp.name, shell=True)
         difftemp.close()
 
 def set_process(pid, profile):
@@ -2497,8 +2502,8 @@
 def is_skippable_file(path):
     """Returns True if filename matches something to be skipped"""
     if (re.search('(^|/)\.[^/]*$', path) or re.search('\.rpm(save|new)$', path)
-        or re.search('\.dpkg-(old|new)$', path) or re.search('\.swp$', path)
-        or path[-1] == '~' or path == 'README'):
+            or re.search('\.dpkg-(old|new)$', path) or re.search('\.swp$', path)
+            or path[-1] == '~' or path == 'README'):
         return True
 
 def is_skippable_dir(path):
@@ -2517,7 +2522,7 @@
 def read_profiles():
     try:
         os.listdir(profile_dir)
-    except :
+    except:
         fatal_error(_("Can't read AppArmor profiles in %s") % profile_dir)
 
     for file in os.listdir(profile_dir):
@@ -2532,7 +2537,7 @@
         return None
     try:
         os.listdir(profile_dir)
-    except :
+    except:
         fatal_error(_("Can't read AppArmor profiles in %s") % extra_profile_dir)
 
     for file in os.listdir(profile_dir):
@@ -2548,7 +2553,7 @@
         with open_file_read(file) as f_in:
             data = f_in.readlines()
     except IOError:
-        debug_logger.debug("read_profile: can't read %s - skipping" %file)
+        debug_logger.debug("read_profile: can't read %s - skipping" % file)
         return None
 
     profile_data = parse_profile_data(data, file, 0)
@@ -2609,13 +2614,13 @@
             if profile:
                 #print(profile, hat)
                 if profile != hat or not matches[3]:
-                    raise AppArmorException(_('%s profile in %s contains syntax errors in line: %s.') % (profile, file, lineno+1))
+                    raise AppArmorException(_('%s profile in %s contains syntax errors in line: %s.') % (profile, file, lineno + 1))
             # Keep track of the start of a profile
             if profile and profile == hat and matches[3]:
                 # local profile
                 hat = matches[3]
                 in_contained_hat = True
-                profile_data[profile][hat]['profile'] =  True
+                profile_data[profile][hat]['profile'] = True
             else:
                 if matches[1]:
                     profile = matches[1]
@@ -2661,7 +2666,7 @@
         elif RE_PROFILE_END.search(line):
             # If profile ends and we're not in one
             if not profile:
-                raise AppArmorException(_('Syntax Error: Unexpected End of Profile reached in file: %s line: %s') % (file, lineno+1))
+                raise AppArmorException(_('Syntax Error: Unexpected End of Profile reached in file: %s line: %s') % (file, lineno + 1))
 
             if in_contained_hat:
                 hat = profile
@@ -2676,7 +2681,7 @@
             matches = RE_PROFILE_CAP.search(line).groups()
 
             if not profile:
-                raise AppArmorException(_('Syntax Error: Unexpected capability entry found in file: %s line: %s') % (file, lineno+1))
+                raise AppArmorException(_('Syntax Error: Unexpected capability entry found in file: %s line: %s') % (file, lineno + 1))
 
             audit = False
             if matches[0]:
@@ -2695,7 +2700,7 @@
             matches = RE_PROFILE_LINK.search(line).groups()
 
             if not profile:
-                raise AppArmorException(_('Syntax Error: Unexpected link entry found in file: %s line: %s') % (file, lineno+1))
+                raise AppArmorException(_('Syntax Error: Unexpected link entry found in file: %s line: %s') % (file, lineno + 1))
 
             audit = False
             if matches[0]:
@@ -2709,13 +2714,13 @@
             link = strip_quotes(matches[6])
             value = strip_quotes(matches[7])
             profile_data[profile][hat][allow]['link'][link]['to'] = value
-            profile_data[profile][hat][allow]['link'][link]['mode'] = profile_data[profile][hat][allow]['link'][link].get('mode', set()) | AA_MAY_LINK
+            profile_data[profile][hat][allow]['link'][link]['mode'] = profile_data[profile][hat][allow]['link'][link].get('mode', set()) | apparmor.aamode.AA_MAY_LINK
 
             if subset:
-                profile_data[profile][hat][allow]['link'][link]['mode'] |= AA_LINK_SUBSET
+                profile_data[profile][hat][allow]['link'][link]['mode'] |= apparmor.aamode.AA_LINK_SUBSET
 
             if audit:
-                profile_data[profile][hat][allow]['link'][link]['audit'] = profile_data[profile][hat][allow]['link'][link].get('audit', set()) | AA_LINK_SUBSET
+                profile_data[profile][hat][allow]['link'][link]['audit'] = profile_data[profile][hat][allow]['link'][link].get('audit', set()) | apparmor.aamode.AA_LINK_SUBSET
             else:
                 profile_data[profile][hat][allow]['link'][link]['audit'] = set()
 
@@ -2723,7 +2728,7 @@
             matches = RE_PROFILE_CHANGE_PROFILE.search(line).groups()
 
             if not profile:
-                raise AppArmorException(_('Syntax Error: Unexpected change profile entry found in file: %s line: %s') % (file, lineno+1))
+                raise AppArmorException(_('Syntax Error: Unexpected change profile entry found in file: %s line: %s') % (file, lineno + 1))
 
             cp = strip_quotes(matches[0])
             profile_data[profile][hat]['changes_profile'][cp] = True
@@ -2745,7 +2750,7 @@
             matches = RE_PROFILE_RLIMIT.search(line).groups()
 
             if not profile:
-                raise AppArmorException(_('Syntax Error: Unexpected rlimit entry found in file: %s line: %s') % (file, lineno+1))
+                raise AppArmorException(_('Syntax Error: Unexpected rlimit entry found in file: %s line: %s') % (file, lineno + 1))
 
             from_name = matches[0]
             to_name = matches[2]
@@ -2756,7 +2761,7 @@
             matches = RE_PROFILE_BOOLEAN.search(line)
 
             if not profile:
-                raise AppArmorException(_('Syntax Error: Unexpected boolean definition found in file: %s line: %s') % (file, lineno+1))
+                raise AppArmorException(_('Syntax Error: Unexpected boolean definition found in file: %s line: %s') % (file, lineno + 1))
 
             bool_var = matches[0]
             value = matches[1]
@@ -2796,7 +2801,7 @@
             matches = RE_PROFILE_PATH_ENTRY.search(line).groups()
 
             if not profile:
-                raise AppArmorException(_('Syntax Error: Unexpected path entry found in file: %s line: %s') % (file, lineno+1))
+                raise AppArmorException(_('Syntax Error: Unexpected path entry found in file: %s line: %s') % (file, lineno + 1))
 
             audit = False
             if matches[0]:
@@ -2820,10 +2825,10 @@
             try:
                 re.compile(p_re)
             except:
-                raise AppArmorException(_('Syntax Error: Invalid Regex %s in file: %s line: %s') % (path, file, lineno+1))
+                raise AppArmorException(_('Syntax Error: Invalid Regex %s in file: %s line: %s') % (path, file, lineno + 1))
 
             if not validate_profile_mode(mode, allow, nt_name):
-                raise AppArmorException(_('Invalid mode %s in file: %s line: %s') % (mode, file, lineno+1))
+                raise AppArmorException(_('Invalid mode %s in file: %s line: %s') % (mode, file, lineno + 1))
 
             tmpmode = set()
             if user:
@@ -2847,7 +2852,6 @@
             if include_name.startswith('local/'):
                 profile_data[profile][hat]['localinclude'][include_name] = True
 
-
             if profile:
                 profile_data[profile][hat]['include'][include_name] = True
             else:
@@ -2862,7 +2866,7 @@
                         continue
                     if os.path.isfile(profile_dir + '/' + include_name + '/' + path):
                         file_name = include_name + '/' + path
-                        file_name = file_name.replace(profile_dir+'/', '')
+                        file_name = file_name.replace(profile_dir + '/', '')
                         if not include.get(file_name, False):
                             load_include(file_name)
             else:
@@ -2873,7 +2877,7 @@
             matches = RE_PROFILE_NETWORK.search(line).groups()
 
             if not profile:
-                raise AppArmorException(_('Syntax Error: Unexpected network entry found in file: %s line: %s') % (file, lineno+1))
+                raise AppArmorException(_('Syntax Error: Unexpected network entry found in file: %s line: %s') % (file, lineno + 1))
 
             audit = False
             if matches[0]:
@@ -2889,7 +2893,7 @@
                 ##Simply ignore any type subrules if family has True (seperately for allow and deny)
                 ##This will lead to those type specific rules being lost when written
                 #if type(profile_data[profile][hat][allow]['netdomain']['rule'].get(fam, False)) == dict:
-                profile_data[profile][hat][allow]['netdomain']['rule'][fam][typ] =  1
+                profile_data[profile][hat][allow]['netdomain']['rule'][fam][typ] = 1
                 profile_data[profile][hat][allow]['netdomain']['audit'][fam][typ] = audit
             elif RE_NETWORK_FAMILY.search(network):
                 fam = RE_NETWORK_FAMILY.search(network).groups()[0]
@@ -2897,13 +2901,13 @@
                 profile_data[profile][hat][allow]['netdomain']['audit'][fam] = audit
             else:
                 profile_data[profile][hat][allow]['netdomain']['rule']['all'] = True
-                profile_data[profile][hat][allow]['netdomain']['audit']['all'] = audit # True
+                profile_data[profile][hat][allow]['netdomain']['audit']['all'] = audit  # True
 
         elif RE_PROFILE_CHANGE_HAT.search(line):
             matches = RE_PROFILE_CHANGE_HAT.search(line).groups()
 
             if not profile:
-                raise AppArmorException(_('Syntax Error: Unexpected change hat declaration found in file: %s line: %s') % (file, lineno+1))
+                raise AppArmorException(_('Syntax Error: Unexpected change hat declaration found in file: %s line: %s') % (file, lineno + 1))
 
             hat = matches[0]
             hat = strip_quotes(hat)
@@ -2915,7 +2919,7 @@
             # An embedded hat syntax definition starts
             matches = RE_PROFILE_HAT_DEF.search(line).groups()
             if not profile:
-                raise AppArmorException(_('Syntax Error: Unexpected hat definition found in file: %s line: %s') % (file, lineno+1))
+                raise AppArmorException(_('Syntax Error: Unexpected hat definition found in file: %s line: %s') % (file, lineno + 1))
 
             in_contained_hat = True
             hat = matches[0]
@@ -2931,7 +2935,7 @@
                 profile_data[profile][hat]['initial_comment'] = initial_comment
             initial_comment = ''
             if filelist[file]['profiles'][profile].get(hat, False):
-                raise AppArmorException(_('Error: Multiple definitions for hat %s in profile %s.') %(hat, profile))
+                raise AppArmorException(_('Error: Multiple definitions for hat %s in profile %s.') % (hat, profile))
             filelist[file]['profiles'][profile][hat] = True
 
         elif line[0] == '#':
@@ -2951,7 +2955,7 @@
                     initial_comment = ' '.join(line) + '\n'
 
         else:
-            raise AppArmorException(_('Syntax Error: Unknown line found in file: %s line: %s') % (file, lineno+1))
+            raise AppArmorException(_('Syntax Error: Unknown line found in file: %s line: %s') % (file, lineno + 1))
 
     # Below is not required I'd say
     if not do_include:
@@ -2995,18 +2999,18 @@
             var[list_var] = set(vlist)
         else:
             #print('Ignored: New definition for variable for:',list_var,'=', value, 'operation was:',var_operation,'old value=', var[list_var])
-            raise AppArmorException(_('An existing variable redefined: %s') %list_var)
+            raise AppArmorException(_('An existing variable redefined: %s') % list_var)
     elif var_operation == '+=':
         if var.get(list_var, False):
             var[list_var] = set(var[list_var] + vlist)
         else:
-            raise AppArmorException(_('Values added to a non-existing variable: %s') %list_var)
+            raise AppArmorException(_('Values added to a non-existing variable: %s') % list_var)
     else:
-        raise AppArmorException(_('Unknown variable operation: %s') %var_operation)
+        raise AppArmorException(_('Unknown variable operation: %s') % var_operation)
 
 
 def strip_quotes(data):
-    if data[0]+data[-1] == '""':
+    if data[0] + data[-1] == '""':
         return data[1:-1]
     else:
         return data
@@ -3029,7 +3033,7 @@
     data = []
     name = quote_if_needed(name)
 
-    if (not embedded_hat and re.search('^[^/]|^"[^/]', name)) or (embedded_hat and re.search('^[^^]' ,name)):
+    if (not embedded_hat and re.search('^[^/]|^"[^/]', name)) or (embedded_hat and re.search('^[^^]', name)):
         name = 'profile %s' % name
 
     if write_flags and prof_data['flags']:
@@ -3047,7 +3051,7 @@
     if ref.get(name, False):
         for key in sorted(ref[name].keys()):
             qkey = quote_if_needed(key)
-            data.append('%s%s%s%s%s' %(pre, allow, prefix, qkey, tail))
+            data.append('%s%s%s%s%s' % (pre, allow, prefix, qkey, tail))
         if ref[name].keys():
             data.append('')
 
@@ -3077,8 +3081,8 @@
 
     if ref.get(name, False):
         for key in sorted(ref[name].keys()):
-            value = fn(ref[name][key])#eval('%s(%s)' % (fn, ref[name][key]))
-            data.append('%s%s%s%s%s%s' %(pre, allow, prefix, key, sep, value))
+            value = fn(ref[name][key])  # eval('%s(%s)' % (fn, ref[name][key]))
+            data.append('%s%s%s%s%s%s' % (pre, allow, prefix, key, sep, value))
         if ref[name].keys():
             data.append('')
 
@@ -3116,7 +3120,7 @@
             if prof_data[allow]['capability'][cap].get('audit', False):
                 audit = 'audit '
             if prof_data[allow]['capability'][cap].get('set', False):
-                data.append('%s%s%scapability %s,' %(pre, audit, allowstr, cap))
+                data.append('%s%s%scapability %s,' % (pre, audit, allowstr, cap))
         data.append('')
 
     return data
@@ -3136,10 +3140,10 @@
         if prof_data[allow]['netdomain'].get('rule', False) == 'all':
             if prof_data[allow]['netdomain']['audit'].get('all', False):
                 audit = 'audit '
-            data.append('%s%snetwork,' %(pre, audit))
+            data.append('%s%snetwork,' % (pre, audit))
         else:
             for fam in sorted(prof_data[allow]['netdomain']['rule'].keys()):
-                if prof_data[allow]['netdomain']['rule'][fam] == True:
+                if prof_data[allow]['netdomain']['rule'][fam] is True:
                     if prof_data[allow]['netdomain']['audit'][fam]:
                         audit = 'audit'
                     data.append('%s%s%snetwork %s' % (pre, audit, allowstr, fam))
@@ -3147,7 +3151,7 @@
                     for typ in sorted(prof_data[allow]['netdomain']['rule'][fam].keys()):
                         if prof_data[allow]['netdomain']['audit'][fam].get(typ, False):
                             audit = 'audit'
-                        data.append('%s%s%snetwork %s %s,' % (pre, audit, allowstr,fam, typ))
+                        data.append('%s%s%snetwork %s %s,' % (pre, audit, allowstr, fam, typ))
         if prof_data[allow].get('netdomain', False):
             data.append('')
 
@@ -3167,14 +3171,14 @@
         for path in sorted(prof_data[allow]['link'].keys()):
             to_name = prof_data[allow]['link'][path]['to']
             subset = ''
-            if prof_data[allow]['link'][path]['mode'] & AA_LINK_SUBSET:
+            if prof_data[allow]['link'][path]['mode'] & apparmor.aamode.AA_LINK_SUBSET:
                 subset = 'subset'
             audit = ''
             if prof_data[allow]['link'][path].get('audit', False):
                 audit = 'audit '
             path = quote_if_needed(path)
             to_name = quote_if_needed(to_name)
-            data.append('%s%s%slink %s%s -> %s,' %(pre, audit, allowstr, subset, path, to_name))
+            data.append('%s%s%slink %s%s -> %s,' % (pre, audit, allowstr, subset, path, to_name))
         data.append('')
 
     return data
@@ -3226,13 +3230,13 @@
                 if tmpmode & tmpaudit:
                     modestr = mode_to_str(tmpmode & tmpaudit)
                     path = quote_if_needed(path)
-                    data.append('%saudit %s%s%s %s%s,' %(pre, allowstr, ownerstr, path, modestr, tail))
+                    data.append('%saudit %s%s%s %s%s,' % (pre, allowstr, ownerstr, path, modestr, tail))
                     tmpmode = tmpmode - tmpaudit
 
                 if tmpmode:
                     modestr = mode_to_str(tmpmode)
                     path = quote_if_needed(path)
-                    data.append('%s%s%s%s %s%s,' %(pre, allowstr, ownerstr, path, modestr, tail))
+                    data.append('%s%s%s%s %s%s,' % (pre, allowstr, ownerstr, path, modestr, tail))
 
         data.append('')
     return data
@@ -3268,13 +3272,13 @@
         name = nhat
         inhat = True
     data += write_header(profile_data[name], depth, wname, False, write_flags)
-    data += write_rules(profile_data[name], depth+1)
+    data += write_rules(profile_data[name], depth + 1)
 
-    pre2 = '  ' * (depth+1)
+    pre2 = '  ' * (depth + 1)
     # External hat declarations
     for hat in list(filter(lambda x: x != name, sorted(profile_data.keys()))):
         if profile_data[hat].get('declared', False):
-            data.append('%s^%s,' %(pre2, hat))
+            data.append('%s^%s,' % (pre2, hat))
 
     if not inhat:
         # Embedded hats
@@ -3282,21 +3286,21 @@
             if not profile_data[hat]['external'] and not profile_data[hat]['declared']:
                 data.append('')
                 if profile_data[hat]['profile']:
-                    data += list(map(str, write_header(profile_data[hat], depth+1, hat, True, write_flags)))
+                    data += list(map(str, write_header(profile_data[hat], depth + 1, hat, True, write_flags)))
                 else:
-                    data += list(map(str, write_header(profile_data[hat], depth+1, '^'+hat, True, write_flags)))
-
-                data += list(map(str, write_rules(profile_data[hat], depth+2)))
-
-                data.append('%s}' %pre2)
-
-        data.append('%s}' %pre)
+                    data += list(map(str, write_header(profile_data[hat], depth + 1, '^' + hat, True, write_flags)))
+
+                data += list(map(str, write_rules(profile_data[hat], depth + 2)))
+
+                data.append('%s}' % pre2)
+
+        data.append('%s}' % pre)
 
         # External hats
         for hat in list(filter(lambda x: x != name, sorted(profile_data.keys()))):
             if name == nhat and profile_data[hat].get('external', False):
                 data.append('')
-                data += list(map(lambda x: '  %s' %x, write_piece(profile_data, depth-1, name, nhat, write_flags)))
+                data += list(map(lambda x: '  %s' % x, write_piece(profile_data, depth - 1, name, nhat, write_flags)))
                 data.append('  }')
 
     return data
@@ -3305,21 +3309,23 @@
     string = ''
     include_metadata = False
     include_flags = True
-    data= []
+    data = []
 
-    if options:# and type(options) == dict:
+    if options:  # and type(options) == dict:
         if options.get('METADATA', False):
             include_metadata = True
         if options.get('NO_FLAGS', False):
             include_flags = False
 
     if include_metadata:
-        string = '# Last Modified: %s\n' %time.asctime()
+        string = '# Last Modified: %s\n' % time.asctime()
 
-        if (profile_data[name].get('repo', False) and profile_data[name]['repo']['url']
-            and profile_data[name]['repo']['user'] and profile_data[name]['repo']['id']):
+        if (profile_data[name].get('repo', False) and
+                profile_data[name]['repo']['url'] and
+                profile_data[name]['repo']['user'] and
+                profile_data[name]['repo']['id']):
             repo = profile_data[name]['repo']
-            string += '# REPOSITORY: %s %s %s\n' %(repo['url'], repo['user'], repo['id'])
+            string += '# REPOSITORY: %s %s %s\n' % (repo['url'], repo['user'], repo['id'])
         elif profile_data[name]['repo']['neversubmit']:
             string += '# REPOSITORY: NEVERSUBMIT\n'
 
@@ -3351,7 +3357,7 @@
 
     string += '\n'.join(data)
 
-    return string+'\n'
+    return string + '\n'
 
 def serialize_profile_from_old_profile(profile_data, name, options):
     data = []
@@ -3363,28 +3369,29 @@
     write_filelist = deepcopy(filelist[prof_filename])
     write_prof_data = deepcopy(profile_data)
 
-    if options:# and type(options) == dict:
+    if options:  # and type(options) == dict:
         if options.get('METADATA', False):
             include_metadata = True
         if options.get('NO_FLAGS', False):
             include_flags = False
 
     if include_metadata:
-        string = '# Last Modified: %s\n' %time.asctime()
+        string = '# Last Modified: %s\n' % time.asctime()
 
-        if (profile_data[name].get('repo', False) and profile_data[name]['repo']['url']
-            and profile_data[name]['repo']['user'] and profile_data[name]['repo']['id']):
+        if (profile_data[name].get('repo', False) and
+                profile_data[name]['repo']['url'] and
+                profile_data[name]['repo']['user'] and
+                profile_data[name]['repo']['id']):
             repo = profile_data[name]['repo']
-            string += '# REPOSITORY: %s %s %s\n' %(repo['url'], repo['user'], repo['id'])
+            string += '# REPOSITORY: %s %s %s\n' % (repo['url'], repo['user'], repo['id'])
         elif profile_data[name]['repo']['neversubmit']:
             string += '# REPOSITORY: NEVERSUBMIT\n'
 
-
     if not os.path.isfile(prof_filename):
         raise AppArmorException(_("Can't find existing profile to modify"))
-    
+
     profiles_list = filelist[prof_filename].keys()
-    
+
     with open_file_read(prof_filename) as f_in:
         profile = None
         hat = None
@@ -3399,8 +3406,7 @@
                          'change_profile': write_change_profile,
                          }
         prof_correct = True
-        segments = {
-                    'alias': False,
+        segments = {'alias': False,
                     'lvar': False,
                     'include': False,
                     'rlimit': False,
@@ -3410,7 +3416,7 @@
                     'path': False,
                     'change_profile': False,
                     'include_local_started': False,
-        }
+                    }
         #data.append('reading prof')
         for line in f_in:
             correct = True
@@ -3446,7 +3452,7 @@
                 if not write_prof_data[hat]['name'] == profile:
                     correct = False
 
-                if not write_filelist['profiles'][profile][hat] == True:
+                if not write_filelist['profiles'][profile][hat] is True:
                     correct = False
 
                 if not write_prof_data[hat]['flags'] == flags:
@@ -3462,7 +3468,7 @@
                 else:
                     if write_prof_data[hat]['name'] == profile:
                         depth = len(line) - len(line.lstrip())
-                        data += write_header(write_prof_data[name], int(depth/2), name, False, include_flags)
+                        data += write_header(write_prof_data[name], int(depth / 2), name, False, include_flags)
 
             elif RE_PROFILE_END.search(line):
                 # DUMP REMAINDER OF PROFILE
@@ -3471,11 +3477,12 @@
                     if True in segments.values():
                         for segs in list(filter(lambda x: segments[x], segments.keys())):
 
-                            data += write_methods[segs](write_prof_data[name], int(depth/2))
+                            data += write_methods[segs](write_prof_data[name], int(depth / 2))
                             segments[segs] = False
-                            if write_prof_data[name]['allow'].get(segs, False): write_prof_data[name]['allow'].pop(segs)
-                            if write_prof_data[name]['deny'].get(segs, False): write_prof_data[name]['deny'].pop(segs)
-
+                            if write_prof_data[name]['allow'].get(segs, False):
+                                write_prof_data[name]['allow'].pop(segs)
+                            if write_prof_data[name]['deny'].get(segs, False):
+                                write_prof_data[name]['deny'].pop(segs)
 
                     data += write_alias(write_prof_data[name], depth)
                     data += write_list_vars(write_prof_data[name], depth)
@@ -3494,25 +3501,25 @@
 
                 if not in_contained_hat:
                     # Embedded hats
-                    depth = int((len(line) - len(line.lstrip()))/2)
-                    pre2 = '  ' * (depth+1)
+                    depth = int((len(line) - len(line.lstrip())) / 2)
+                    pre2 = '  ' * (depth + 1)
                     for hat in list(filter(lambda x: x != name, sorted(profile_data.keys()))):
                         if not profile_data[hat]['external'] and not profile_data[hat]['declared']:
                             data.append('')
                             if profile_data[hat]['profile']:
-                                data += list(map(str, write_header(profile_data[hat], depth+1, hat, True, include_flags)))
+                                data += list(map(str, write_header(profile_data[hat], depth + 1, hat, True, include_flags)))
                             else:
-                                data += list(map(str, write_header(profile_data[hat], depth+1, '^'+hat, True, include_flags)))
-
-                            data += list(map(str, write_rules(profile_data[hat], depth+2)))
-
-                            data.append('%s}' %pre2)
+                                data += list(map(str, write_header(profile_data[hat], depth + 1, '^' + hat, True, include_flags)))
+
+                            data += list(map(str, write_rules(profile_data[hat], depth + 2)))
+
+                            data.append('%s}' % pre2)
 
                     # External hats
                     for hat in list(filter(lambda x: x != name, sorted(profile_data.keys()))):
                         if profile_data[hat].get('external', False):
                             data.append('')
-                            data += list(map(lambda x: '  %s' %x, write_piece(profile_data, depth-1, name, name, include_flags)))
+                            data += list(map(lambda x: '  %s' % x, write_piece(profile_data, depth - 1, name, name, include_flags)))
                             data.append('  }')
 
                 if in_contained_hat:
@@ -3522,7 +3529,6 @@
                 else:
                     profile = None
 
-
             elif RE_PROFILE_CAP.search(line):
                 matches = RE_PROFILE_CAP.search(line).groups()
                 audit = False
@@ -3544,10 +3550,12 @@
                     if not segments['capability'] and True in segments.values():
                         for segs in list(filter(lambda x: segments[x], segments.keys())):
                             depth = len(line) - len(line.lstrip())
-                            data += write_methods[segs](write_prof_data[name], int(depth/2))
+                            data += write_methods[segs](write_prof_data[name], int(depth / 2))
                             segments[segs] = False
-                            if write_prof_data[name]['allow'].get(segs, False): write_prof_data[name]['allow'].pop(segs)
-                            if write_prof_data[name]['deny'].get(segs, False): write_prof_data[name]['deny'].pop(segs)
+                            if write_prof_data[name]['allow'].get(segs, False):
+                                write_prof_data[name]['allow'].pop(segs)
+                            if write_prof_data[name]['deny'].get(segs, False):
+                                write_prof_data[name]['deny'].pop(segs)
                     segments['capability'] = True
                     write_prof_data[hat][allow]['capability'].pop(capability)
                     data.append(line)
@@ -3572,21 +3580,23 @@
                 value = strip_quotes(matches[7])
                 if not write_prof_data[hat][allow]['link'][link]['to'] == value:
                     correct = False
-                if not write_prof_data[hat][allow]['link'][link]['mode'] & AA_MAY_LINK:
-                    correct = False
-                if subset and not write_prof_data[hat][allow]['link'][link]['mode'] & AA_LINK_SUBSET:
-                    correct = False
-                if audit and not write_prof_data[hat][allow]['link'][link]['audit'] & AA_LINK_SUBSET:
+                if not write_prof_data[hat][allow]['link'][link]['mode'] & apparmor.aamode.AA_MAY_LINK:
+                    correct = False
+                if subset and not write_prof_data[hat][allow]['link'][link]['mode'] & apparmor.aamode.AA_LINK_SUBSET:
+                    correct = False
+                if audit and not write_prof_data[hat][allow]['link'][link]['audit'] & apparmor.aamode.AA_LINK_SUBSET:
                     correct = False
 
                 if correct:
                     if not segments['link'] and True in segments.values():
                         for segs in list(filter(lambda x: segments[x], segments.keys())):
                             depth = len(line) - len(line.lstrip())
-                            data += write_methods[segs](write_prof_data[name], int(depth/2))
+                            data += write_methods[segs](write_prof_data[name], int(depth / 2))
                             segments[segs] = False
-                            if write_prof_data[name]['allow'].get(segs, False): write_prof_data[name]['allow'].pop(segs)
-                            if write_prof_data[name]['deny'].get(segs, False): write_prof_data[name]['deny'].pop(segs)
+                            if write_prof_data[name]['allow'].get(segs, False):
+                                write_prof_data[name]['allow'].pop(segs)
+                            if write_prof_data[name]['deny'].get(segs, False):
+                                write_prof_data[name]['deny'].pop(segs)
                     segments['link'] = True
                     write_prof_data[hat][allow]['link'].pop(link)
                     data.append(line)
@@ -3598,17 +3608,19 @@
                 matches = RE_PROFILE_CHANGE_PROFILE.search(line).groups()
                 cp = strip_quotes(matches[0])
 
-                if not write_prof_data[hat]['changes_profile'][cp] == True:
+                if not write_prof_data[hat]['changes_profile'][cp] is True:
                     correct = False
 
                 if correct:
                     if not segments['change_profile'] and True in segments.values():
                         for segs in list(filter(lambda x: segments[x], segments.keys())):
                             depth = len(line) - len(line.lstrip())
-                            data += write_methods[segs](write_prof_data[name], int(depth/2))
+                            data += write_methods[segs](write_prof_data[name], int(depth / 2))
                             segments[segs] = False
-                            if write_prof_data[name]['allow'].get(segs, False): write_prof_data[name]['allow'].pop(segs)
-                            if write_prof_data[name]['deny'].get(segs, False): write_prof_data[name]['deny'].pop(segs)
+                            if write_prof_data[name]['allow'].get(segs, False):
+                                write_prof_data[name]['allow'].pop(segs)
+                            if write_prof_data[name]['deny'].get(segs, False):
+                                write_prof_data[name]['deny'].pop(segs)
                     segments['change_profile'] = True
                     write_prof_data[hat]['change_profile'].pop(cp)
                     data.append(line)
@@ -3633,10 +3645,12 @@
                     if not segments['alias'] and True in segments.values():
                         for segs in list(filter(lambda x: segments[x], segments.keys())):
                             depth = len(line) - len(line.lstrip())
-                            data += write_methods[segs](write_prof_data[name], int(depth/2))
+                            data += write_methods[segs](write_prof_data[name], int(depth / 2))
                             segments[segs] = False
-                            if write_prof_data[name]['allow'].get(segs, False): write_prof_data[name]['allow'].pop(segs)
-                            if write_prof_data[name]['deny'].get(segs, False): write_prof_data[name]['deny'].pop(segs)
+                            if write_prof_data[name]['allow'].get(segs, False):
+                                write_prof_data[name]['allow'].pop(segs)
+                            if write_prof_data[name]['deny'].get(segs, False):
+                                write_prof_data[name]['deny'].pop(segs)
                     segments['alias'] = True
                     if profile:
                         write_prof_data[hat]['alias'].pop(from_name)
@@ -3660,10 +3674,12 @@
                     if not segments['rlimit'] and True in segments.values():
                         for segs in list(filter(lambda x: segments[x], segments.keys())):
                             depth = len(line) - len(line.lstrip())
-                            data += write_methods[segs](write_prof_data[name], int(depth/2))
+                            data += write_methods[segs](write_prof_data[name], int(depth / 2))
                             segments[segs] = False
-                            if write_prof_data[name]['allow'].get(segs, False): write_prof_data[name]['allow'].pop(segs)
-                            if write_prof_data[name]['deny'].get(segs, False): write_prof_data[name]['deny'].pop(segs)
+                            if write_prof_data[name]['allow'].get(segs, False):
+                                write_prof_data[name]['allow'].pop(segs)
+                            if write_prof_data[name]['deny'].get(segs, False):
+                                write_prof_data[name]['deny'].pop(segs)
                     segments['rlimit'] = True
                     write_prof_data[hat]['rlimit'].pop(from_name)
                     data.append(line)
@@ -3683,10 +3699,12 @@
                     if not segments['lvar'] and True in segments.values():
                         for segs in list(filter(lambda x: segments[x], segments.keys())):
                             depth = len(line) - len(line.lstrip())
-                            data += write_methods[segs](write_prof_data[name], int(depth/2))
+                            data += write_methods[segs](write_prof_data[name], int(depth / 2))
                             segments[segs] = False
-                            if write_prof_data[name]['allow'].get(segs, False): write_prof_data[name]['allow'].pop(segs)
-                            if write_prof_data[name]['deny'].get(segs, False): write_prof_data[name]['deny'].pop(segs)
+                            if write_prof_data[name]['allow'].get(segs, False):
+                                write_prof_data[name]['allow'].pop(segs)
+                            if write_prof_data[name]['deny'].get(segs, False):
+                                write_prof_data[name]['deny'].pop(segs)
                     segments['lvar'] = True
                     write_prof_data[hat]['lvar'].pop(bool_var)
                     data.append(line)
@@ -3712,10 +3730,12 @@
                     if not segments['lvar'] and True in segments.values():
                         for segs in list(filter(lambda x: segments[x], segments.keys())):
                             depth = len(line) - len(line.lstrip())
-                            data += write_methods[segs](write_prof_data[name], int(depth/2))
+                            data += write_methods[segs](write_prof_data[name], int(depth / 2))
                             segments[segs] = False
-                            if write_prof_data[name]['allow'].get(segs, False): write_prof_data[name]['allow'].pop(segs)
-                            if write_prof_data[name]['deny'].get(segs, False): write_prof_data[name]['deny'].pop(segs)
+                            if write_prof_data[name]['allow'].get(segs, False):
+                                write_prof_data[name]['allow'].pop(segs)
+                            if write_prof_data[name]['deny'].get(segs, False):
+                                write_prof_data[name]['deny'].pop(segs)
                     segments['lvar'] = True
                     if profile:
                         write_prof_data[hat]['lvar'].pop(list_var)
@@ -3747,7 +3767,7 @@
 
                 tmpmode = set()
                 if user:
-                    tmpmode = str_to_mode('%s::' %mode)
+                    tmpmode = str_to_mode('%s::' % mode)
                 else:
                     tmpmode = str_to_mode(mode)
 
@@ -3764,10 +3784,12 @@
                     if not segments['path'] and True in segments.values():
                         for segs in list(filter(lambda x: segments[x], segments.keys())):
                             depth = len(line) - len(line.lstrip())
-                            data += write_methods[segs](write_prof_data[name], int(depth/2))
+                            data += write_methods[segs](write_prof_data[name], int(depth / 2))
                             segments[segs] = False
-                            if write_prof_data[name]['allow'].get(segs, False): write_prof_data[name]['allow'].pop(segs)
-                            if write_prof_data[name]['deny'].get(segs, False): write_prof_data[name]['deny'].pop(segs)
+                            if write_prof_data[name]['allow'].get(segs, False):
+                                write_prof_data[name]['allow'].pop(segs)
+                            if write_prof_data[name]['deny'].get(segs, False):
+                                write_prof_data[name]['deny'].pop(segs)
                     segments['path'] = True
                     write_prof_data[hat][allow]['path'].pop(path)
                     data.append(line)
@@ -3782,10 +3804,12 @@
                         if not segments['include'] and True in segments.values():
                             for segs in list(filter(lambda x: segments[x], segments.keys())):
                                 depth = len(line) - len(line.lstrip())
-                                data += write_methods[segs](write_prof_data[name], int(depth/2))
+                                data += write_methods[segs](write_prof_data[name], int(depth / 2))
                                 segments[segs] = False
-                                if write_prof_data[name]['allow'].get(segs, False): write_prof_data[name]['allow'].pop(segs)
-                                if write_prof_data[name]['deny'].get(segs, False): write_prof_data[name]['deny'].pop(segs)
+                                if write_prof_data[name]['allow'].get(segs, False):
+                                    write_prof_data[name]['allow'].pop(segs)
+                                if write_prof_data[name]['deny'].get(segs, False):
+                                    write_prof_data[name]['deny'].pop(segs)
                             segments['include'] = True
                         write_prof_data[hat]['include'].pop(include_name)
                         data.append(line)
@@ -3833,16 +3857,18 @@
                     if not segments['netdomain'] and True in segments.values():
                         for segs in list(filter(lambda x: segments[x], segments.keys())):
                             depth = len(line) - len(line.lstrip())
-                            data += write_methods[segs](write_prof_data[name], int(depth/2))
+                            data += write_methods[segs](write_prof_data[name], int(depth / 2))
                             segments[segs] = False
-                            if write_prof_data[name]['allow'].get(segs, False): write_prof_data[name]['allow'].pop(segs)
-                            if write_prof_data[name]['deny'].get(segs, False): write_prof_data[name]['deny'].pop(segs)
+                            if write_prof_data[name]['allow'].get(segs, False):
+                                write_prof_data[name]['allow'].pop(segs)
+                            if write_prof_data[name]['deny'].get(segs, False):
+                                write_prof_data[name]['deny'].pop(segs)
                     segments['netdomain'] = True
 
             elif RE_PROFILE_CHANGE_HAT.search(line):
                 matches = RE_PROFILE_CHANGE_HAT.search(line).groups()
                 hat = matches[0]
-                hat =  strip_quotes(hat)
+                hat = strip_quotes(hat)
                 if not write_prof_data[hat]['declared']:
                     correct = False
                 if correct:
@@ -3858,7 +3884,7 @@
                 flags = matches[3]
                 if not write_prof_data[hat]['flags'] == flags:
                     correct = False
-                if not write_prof_data[hat]['declared'] == False:
+                if not write_prof_data[hat]['declared'] is False:
                     correct = False
                 if not write_filelist['profile'][profile][hat]:
                     correct = False
@@ -3883,10 +3909,10 @@
 
     string += '\n'.join(data)
 
-    return string+'\n'
+    return string + '\n'
 
 def write_profile_ui_feedback(profile):
-    UI_Info(_('Writing updated profile for %s.') %profile)
+    aaui.UI_Info(_('Writing updated profile for %s.') % profile)
     write_profile(profile)
 
 def write_profile(profile):
@@ -3896,7 +3922,7 @@
     else:
         prof_filename = get_profile_filename(profile)
 
-    newprof = tempfile.NamedTemporaryFile('w', suffix='~' ,delete=False, dir=profile_dir)
+    newprof = tempfile.NamedTemporaryFile('w', suffix='~', delete=False, dir=profile_dir)
     if os.path.exists(prof_filename):
         shutil.copymode(prof_filename, newprof.name)
     else:
@@ -3917,7 +3943,7 @@
     original_aa[profile] = deepcopy(aa[profile])
 
 def matchliteral(aa_regexp, literal):
-    p_regexp = '^'+convert_regexp(aa_regexp)+'$'
+    p_regexp = '^' + convert_regexp(aa_regexp) + '$'
     match = False
     try:
         match = re.search(p_regexp, literal)
@@ -3932,19 +3958,19 @@
         m = []
 
         cm, am, m = rematchfrag(profile, 'deny', exec_target)
-        if cm & AA_MAY_EXEC:
+        if cm & apparmor.aamode.AA_MAY_EXEC:
             return -1
 
         cm, am, m = match_prof_incs_to_path(profile, 'deny', exec_target)
-        if cm & AA_MAY_EXEC:
+        if cm & apparmor.aamode.AA_MAY_EXEC:
             return -1
 
         cm, am, m = rematchfrag(profile, 'allow', exec_target)
-        if cm & AA_MAY_EXEC:
+        if cm & apparmor.aamode.AA_MAY_EXEC:
             return 1
 
         cm, am, m = match_prof_incs_to_path(profile, 'allow', exec_target)
-        if cm & AA_MAY_EXEC:
+        if cm & apparmor.aamode.AA_MAY_EXEC:
             return 1
 
     return 0
@@ -3986,11 +4012,11 @@
     net_family_sock = False
     if netrules['rule'].get('all', False):
         all_net = True
-    if netrules['rule'].get(family, False) == True:
+    if netrules['rule'].get(family, False) is True:
         all_net_family = True
     if (netrules['rule'].get(family, False) and
-        type(netrules['rule'][family]) == dict and
-        netrules['rule'][family][sock_type]):
+            type(netrules['rule'][family]) == dict and
+            netrules['rule'][family][sock_type]):
         net_family_sock = True
 
     if all_net or all_net_family or net_family_sock:
@@ -4004,7 +4030,7 @@
 
     prof_filename = get_profile_filename(bin_path)
 
-    subprocess.call("cat '%s' | %s -I%s -r >/dev/null 2>&1" %(prof_filename, parser ,profile_dir), shell=True)
+    subprocess.call("cat '%s' | %s -I%s -r >/dev/null 2>&1" % (prof_filename, parser, profile_dir), shell=True)
 
 def reload(bin_path):
     bin_path = find_executable(bin_path)
@@ -4020,7 +4046,7 @@
         with open_file_read(filename) as f_in:
             data = f_in.readlines()
     else:
-        raise AppArmorException(_('File Not Found: %s') %filename)
+        raise AppArmorException(_('File Not Found: %s') % filename)
     return data
 
 def load_include(incname):
@@ -4029,7 +4055,7 @@
         return 0
     while load_includeslist:
         incfile = load_includeslist.pop(0)
-        if os.path.isfile(profile_dir+'/'+incfile):
+        if os.path.isfile(profile_dir + '/' + incfile):
             data = get_include_data(incfile)
             incdata = parse_profile_data(data, incfile, True)
             #print(incdata)
@@ -4040,8 +4066,8 @@
                 incdata[incname] = hasher()
             attach_profile_data(include, incdata)
         #If the include is a directory means include all subfiles
-        elif os.path.isdir(profile_dir+'/'+incfile):
-            load_includeslist += list(map(lambda x: incfile+'/'+x, os.listdir(profile_dir+'/'+incfile)))
+        elif os.path.isdir(profile_dir + '/' + incfile):
+            load_includeslist += list(map(lambda x: incfile + '/' + x, os.listdir(profile_dir + '/' + incfile)))
 
     return 0
 
@@ -4069,7 +4095,7 @@
     while includelist:
         incfile = str(includelist.pop(0))
         ret = load_include(incfile)
-        if not include.get(incfile,{}):
+        if not include.get(incfile, {}):
             continue
         cm, am, m = rematchfrag(include[incfile].get(incfile, {}), allow, path)
         #print(incfile, cm, am, m)
@@ -4111,7 +4137,7 @@
     includelist = [incname]
     while includelist:
         inc = includelist.pop(0)
-        cm, am , m = rematchfrag(include[inc][inc], 'allow', path)
+        cm, am, m = rematchfrag(include[inc][inc], 'allow', path)
         if cm:
             combinedmode |= cm
             combinedaudit |= am
@@ -4129,12 +4155,12 @@
 def check_qualifiers(program):
     if cfg['qualifiers'].get(program, False):
         if cfg['qualifiers'][program] != 'p':
-            fatal_error(_("%s is currently marked as a program that should not have its own\nprofile.  Usually, programs are marked this way if creating a profile for \nthem is likely to break the rest of the system.  If you know what you\'re\ndoing and are certain you want to create a profile for this program, edit\nthe corresponding entry in the [qualifiers] section in /etc/apparmor/logprof.conf.") %program)
+            fatal_error(_("%s is currently marked as a program that should not have its own\nprofile.  Usually, programs are marked this way if creating a profile for \nthem is likely to break the rest of the system.  If you know what you\'re\ndoing and are certain you want to create a profile for this program, edit\nthe corresponding entry in the [qualifiers] section in /etc/apparmor/logprof.conf.") % program)
     return False
 
 def get_subdirectories(current_dir):
     """Returns a list of all directories directly inside given directory"""
-    if sys.version_info < (3,0):
+    if sys.version_info < (3, 0):
         return os.walk(current_dir).next()[1]
     else:
         return os.walk(current_dir).__next__()[1]
@@ -4152,7 +4178,7 @@
                     continue
                 else:
                     fi = dirpath + '/' + fi
-                    fi = fi.replace(profile_dir+'/', '', 1)
+                    fi = fi.replace(profile_dir + '/', '', 1)
                     load_include(fi)
 
 def glob_common(path):
@@ -4178,7 +4204,7 @@
     if name1 == name2:
         return name1
     else:
-        return '%s^%s' %(name1, name2)
+        return '%s^%s' % (name1, name2)
 
 def split_name(name):
     names = name.split('^')
@@ -4187,7 +4213,7 @@
     else:
         return names[0], names[1]
 def commonprefix(new, old):
-    match=re.search(r'^([^\0]*)[^\0]*(\0\1[^\0]*)*$', '\0'.join([new, old]))
+    match = re.search(r'^([^\0]*)[^\0]*(\0\1[^\0]*)*$', '\0'.join([new, old]))
     if match:
         return match.groups()[0]
     return match
@@ -4234,7 +4260,7 @@
 
 profile_dir = conf.find_first_dir(cfg['settings']['profiledir']) or '/etc/apparmor.d'
 if not os.path.isdir(profile_dir):
-    raise AppArmorException('Can\'t find AppArmor profiles' )
+    raise AppArmorException('Can\'t find AppArmor profiles')
 
 extra_profile_dir = conf.find_first_dir(cfg['settings']['inactive_profiledir']) or '/etc/apparmor/profiles/extras/'
 
 
=== modified file 'apparmor/aamode.py'
--- apparmor/aamode.py	2013-12-29 09:42:30 +0000
+++ apparmor/aamode.py	2014-02-12 00:39:55 +0000
@@ -16,7 +16,7 @@
 def AA_OTHER(mode):
     other = set()
     for i in mode:
-        other.add('::%s'%i)
+        other.add('::%s' % i)
     return other
 
 def AA_OTHER_REMOVE(mode):
@@ -57,14 +57,14 @@
              'm': AA_EXEC_MMAP, 'M': AA_EXEC_MMAP,
              'i': AA_EXEC_INHERIT, 'I': AA_EXEC_INHERIT,
              'u': AA_EXEC_UNCONFINED | AA_EXEC_UNSAFE,  # Unconfined + Unsafe
-              'U': AA_EXEC_UNCONFINED,
-              'p': AA_EXEC_PROFILE | AA_EXEC_UNSAFE,    # Profile + unsafe
-              'P': AA_EXEC_PROFILE,
-              'c': AA_EXEC_CHILD | AA_EXEC_UNSAFE,  # Child + Unsafe
-              'C': AA_EXEC_CHILD,
-              'n': AA_EXEC_NT | AA_EXEC_UNSAFE,
-              'N': AA_EXEC_NT
-              }
+             'U': AA_EXEC_UNCONFINED,
+             'p': AA_EXEC_PROFILE | AA_EXEC_UNSAFE,    # Profile + unsafe
+             'P': AA_EXEC_PROFILE,
+             'c': AA_EXEC_CHILD | AA_EXEC_UNSAFE,  # Child + Unsafe
+             'C': AA_EXEC_CHILD,
+             'n': AA_EXEC_NT | AA_EXEC_UNSAFE,
+             'N': AA_EXEC_NT
+             }
 
 LOG_MODE_RE = re.compile('(r|w|l|m|k|a|x|ix|ux|px|cx|nx|pix|cix|Ix|Ux|Px|PUx|Cx|Nx|Pix|Cix)')
 MODE_MAP_RE = re.compile('(r|w|l|m|k|a|x|i|u|p|c|n|I|U|P|C|N)')
 
=== modified file 'apparmor/common.py'
--- apparmor/common.py	2014-02-01 01:34:08 +0000
+++ apparmor/common.py	2014-02-12 00:39:55 +0000
@@ -11,7 +11,6 @@
 from __future__ import print_function
 import codecs
 import collections
-import gettext
 import glob
 import logging
 import os
@@ -23,6 +22,7 @@
 
 DEBUGGING = False
 
+
 #
 # Utility classes
 #
@@ -110,7 +110,7 @@
         debug("%s (relative)" % (m))
         return False
 
-    if '"' in path: # We double quote elsewhere
+    if '"' in path:  # We double quote elsewhere
         return False
 
     try:
@@ -166,13 +166,6 @@
     # Creates a dictionary for any depth and returns empty dictionary otherwise
     return collections.defaultdict(hasher)
 
-def init_translations(domain='apparmor-utils'):
-    """Installs the translations for the given domain, defaults to apparmor-utils domain"""
-    #Setup Translation
-    gettext.translation(domain, fallback=True)
-    gettext.install(domain)
-
-
 def convert_regexp(regexp):
     regex_paren = re.compile('^(.*){([^}]*)}(.*)$')
     regexp = regexp.strip()
@@ -182,8 +175,8 @@
         match = regex_paren.search(new_reg).groups()
         prev = match[0]
         after = match[2]
-        p1 = match[1].replace(',','|')
-        new_reg = prev+'('+p1+')'+after
+        p1 = match[1].replace(',', '|')
+        new_reg = prev + '(' + p1 + ')' + after
 
     new_reg = new_reg.replace('?', '[^/\000]')
 
@@ -198,7 +191,7 @@
     if regexp[0] != '^':
         new_reg = '^' + new_reg
     if regexp[-1] != '$':
-        new_reg =  new_reg + '$'
+        new_reg = new_reg + '$'
     return new_reg
 
 def user_perm(prof_dir):
@@ -221,7 +214,7 @@
                 self.debugging = False
             if self.debugging not in range(0, 4):
                 sys.stdout.write('Environment Variable: LOGPROF_DEBUG contains invalid value: %s'
-                                 %os.getenv('LOGPROF_DEBUG'))
+                                 % os.getenv('LOGPROF_DEBUG'))
             if self.debugging == 0:  # debugging disabled, don't need to setup logging
                 return
             if self.debugging == 1:
@@ -230,22 +223,21 @@
                 self.debug_level = logging.INFO
             elif self.debugging == 3:
                 self.debug_level = logging.DEBUG
-            
+
             try:
                 logging.basicConfig(filename=self.logfile, level=self.debug_level,
                                     format='%(asctime)s - %(name)s - %(message)s\n')
             except OSError:
                 # Unable to open the default logfile, so create a temporary logfile and tell use about it
                 import tempfile
-                templog = tempfile.NamedTemporaryFile('w', prefix='apparmor', suffix='.log' ,delete=False)
-                sys.stdout.write("\nCould not open: %s\nLogging to: %s\n"%(self.logfile, templog.name))
-                
+                templog = tempfile.NamedTemporaryFile('w', prefix='apparmor', suffix='.log', delete=False)
+                sys.stdout.write("\nCould not open: %s\nLogging to: %s\n" % (self.logfile, templog.name))
+
                 logging.basicConfig(filename=templog.name, level=self.debug_level,
                                     format='%(asctime)s - %(name)s - %(message)s\n')
-            
+
             self.logger = logging.getLogger(module_name)
 
-
     def error(self, message):
         if self.debugging:
             self.logger.error(message)
 
=== modified file 'apparmor/config.py'
--- apparmor/config.py	2013-12-29 09:42:30 +0000
+++ apparmor/config.py	2014-02-12 00:39:55 +0000
@@ -20,6 +20,7 @@
 import tempfile
 if sys.version_info < (3, 0):
     import ConfigParser as configparser
+
     # Class to provide the object[section][option] behavior in Python2
     class configparser_py2(configparser.ConfigParser):
         def __getitem__(self, section):
@@ -34,7 +35,7 @@
     import configparser
 
 
-from apparmor.common import AppArmorException, open_file_read#, warn, msg,
+from apparmor.common import AppArmorException, open_file_read  # , warn, msg,
 
 
 # CFG = None
@@ -110,7 +111,6 @@
             # Replace the target config file with the temporary file
             os.rename(config_file.name, filepath)
 
-
     def find_first_file(self, file_list):
         """Returns name of first matching file None otherwise"""
         filename = None
@@ -164,7 +164,7 @@
                             option, value = result[0].split('=')
                             if '#' in line:
                                 comment = value.split('#', 1)[1]
-                                comment = '#'+comment
+                                comment = '#' + comment
                             else:
                                 comment = ''
                             # If option exists in the new config file
@@ -172,7 +172,7 @@
                                 # If value is different
                                 if value != config[''][option]:
                                     value_new = config[''][option]
-                                    if value_new != None:
+                                    if value_new is not None:
                                         # Update value
                                         if '"' in line:
                                             value_new = '"' + value_new + '"'
@@ -190,7 +190,7 @@
                             # If option exists in the new config file
                             if option in options:
                                 # If its no longer option type
-                                if config[''][option] != None:
+                                if config[''][option] is not None:
                                     value = config[''][option]
                                     line = option + '=' + value + '\n'
                                 f_out.write(line)
@@ -204,7 +204,7 @@
             for option in options:
                 value = config[''][option]
                 # option type entry
-                if value == None:
+                if value is None:
                     line = option + '\n'
                 # option=value type entry
                 else:
@@ -273,7 +273,7 @@
         if section in sections:
             sections.remove(section)
         for section in sections:
-            f_out.write('\n['+section+']\n')
+            f_out.write('\n[%s]\n' % section)
             options = config.options(section)
             for option in options:
                 line = '  ' + option + ' = ' + config[section][option] + '\n'
 
=== modified file 'apparmor/logparser.py'
--- apparmor/logparser.py	2013-09-28 15:13:06 +0000
+++ apparmor/logparser.py	2014-02-12 00:39:55 +0000
@@ -11,16 +11,22 @@
 #    GNU General Public License for more details.
 #
 # ----------------------------------------------------------------------
+import gettext
 import os
 import re
 import sys
 import time
 import LibAppArmor
-from apparmor.common import (AppArmorException, error, debug, msg,
-                             open_file_read, valid_path,
-                             hasher, open_file_write, convert_regexp, DebugLogger)
-
-from apparmor.aamode import *
+from apparmor.common import (AppArmorException, error, debug,
+                             open_file_read, valid_path, hasher,
+                             open_file_write, convert_regexp,
+                             DebugLogger)
+
+from apparmor.aamode import validate_log_mode, log_str_to_mode, hide_log_mode, AA_MAY_EXEC
+
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
 
 class ReadLog:
     RE_LOG_v2_6_syslog = re.compile('kernel:\s+(\[[\d\.\s]+\]\s+)?type=\d+\s+audit\([\d\.\:]+\):\s+apparmor=')
@@ -31,9 +37,8 @@
     PROFILE_MODE_NT_RE = re.compile('r|w|l|m|k|a|x|ix|ux|px|cx|pix|cix|Ux|Px|PUx|Cx|Pix|Cix')
     PROFILE_MODE_DENY_RE = re.compile('r|w|l|m|k|a|x')
     # Used by netdomain to identify the operation types
-    OPERATION_TYPES = {
-                       # New socket names
-                       'create': 'net',
+    # New socket names
+    OPERATION_TYPES = {'create': 'net',
                        'post_create': 'net',
                        'bind': 'net',
                        'connect': 'net',
@@ -47,6 +52,7 @@
                        'setsockopt': 'net',
                        'sock_shutdown': 'net'
                        }
+
     def __init__(self, pid, filename, existing_profiles, profile_dir, log):
         self.filename = filename
         self.profile_dir = profile_dir
@@ -96,7 +102,7 @@
         msg = msg.strip()
         self.debug_logger.info('parse_event: %s' % msg)
         #print(repr(msg))
-        if sys.version_info < (3,0):
+        if sys.version_info < (3, 0):
             # parse_record fails with u'foo' style strings hence typecasting to string
             msg = str(msg)
         event = LibAppArmor.parse_record(msg)
@@ -152,8 +158,7 @@
 
         if ev['aamode']:
             # Convert aamode values to their counter-parts
-            mode_convertor = {
-                              0: 'UNKNOWN',
+            mode_convertor = {0: 'UNKNOWN',
                               1: 'ERROR',
                               2: 'AUDITING',
                               3: 'PERMITTING',
@@ -254,30 +259,30 @@
         if e['operation'] == 'exec':
             if e.get('info', False) and e['info'] == 'mandatory profile missing':
                 self.add_to_tree(e['pid'], e['parent'], 'exec',
-                            [profile, hat, aamode, 'PERMITTING', e['denied_mask'], e['name'], e['name2']])
+                                 [profile, hat, aamode, 'PERMITTING', e['denied_mask'], e['name'], e['name2']])
             elif e.get('name2', False) and '\\null-/' in e['name2']:
                 self.add_to_tree(e['pid'], e['parent'], 'exec',
-                            [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
+                                 [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
             elif e.get('name', False):
                 self.add_to_tree(e['pid'], e['parent'], 'exec',
-                            [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
+                                 [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
             else:
                 self.debug_logger.debug('add_event_to_tree: dropped exec event in %s' % e['profile'])
 
         elif 'file_' in e['operation']:
             self.add_to_tree(e['pid'], e['parent'], 'path',
-                        [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
+                             [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
         elif e['operation'] in ['open', 'truncate', 'mkdir', 'mknod', 'rename_src',
                                 'rename_dest', 'unlink', 'rmdir', 'symlink_create', 'link']:
             #print(e['operation'], e['name'])
             self.add_to_tree(e['pid'], e['parent'], 'path',
-                        [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
+                             [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
         elif e['operation'] == 'capable':
             self.add_to_tree(e['pid'], e['parent'], 'capability',
-                        [profile, hat, prog, aamode, e['name'], ''])
+                             [profile, hat, prog, aamode, e['name'], ''])
         elif e['operation'] == 'setattr' or 'xattr' in e['operation']:
             self.add_to_tree(e['pid'], e['parent'], 'path',
-                        [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
+                             [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
         elif 'inode_' in e['operation']:
             is_domain_change = False
             if e['operation'] == 'inode_permission' and (e['denied_mask'] & AA_MAY_EXEC) and aamode == 'PERMITTING':
@@ -290,17 +295,17 @@
 
             if is_domain_change:
                 self.add_to_tree(e['pid'], e['parent'], 'exec',
-                            [profile, hat, prog, aamode, e['denied_mask'], e['name'], e['name2']])
+                                 [profile, hat, prog, aamode, e['denied_mask'], e['name'], e['name2']])
             else:
                 self.add_to_tree(e['pid'], e['parent'], 'path',
-                            [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
+                                 [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
 
         elif e['operation'] == 'sysctl':
             self.add_to_tree(e['pid'], e['parent'], 'path',
-                        [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
+                             [profile, hat, prog, aamode, e['denied_mask'], e['name'], ''])
 
         elif e['operation'] == 'clone':
-            parent , child = e['pid'], e['task']
+            parent, child = e['pid'], e['task']
             if not parent:
                 parent = 'null-complain-profile'
             if not hat:
@@ -321,10 +326,10 @@
 
         elif self.op_type(e['operation']) == 'net':
             self.add_to_tree(e['pid'], e['parent'], 'netdomain',
-                        [profile, hat, prog, aamode, e['family'], e['sock_type'], e['protocol']])
+                             [profile, hat, prog, aamode, e['family'], e['sock_type'], e['protocol']])
         elif e['operation'] == 'change_hat':
             self.add_to_tree(e['pid'], e['parent'], 'unknown_hat',
-                        [profile, hat, aamode, hat])
+                             [profile, hat, aamode, hat])
         else:
             self.debug_logger.debug('UNHANDLED: %s' % e)
 
@@ -351,7 +356,7 @@
             if self.logmark in line:
                 seenmark = True
 
-            self.debug_logger.debug('read_log: seenmark = %s' %seenmark)
+            self.debug_logger.debug('read_log: seenmark = %s' % seenmark)
             if not seenmark:
                 continue
 
@@ -382,7 +387,6 @@
             return True
         return False
 
-
     def get_profile_filename(self, profile):
         """Returns the full profile name"""
         if profile.startswith('/'):
@@ -392,4 +396,4 @@
             profile = "profile_" + profile
         profile = profile.replace('/', '.')
         full_profilename = self.profile_dir + '/' + profile
-        return full_profilename
 \ No newline at end of file
+        return full_profilename
 
=== modified file 'apparmor/severity.py'
--- apparmor/severity.py	2014-02-01 00:44:05 +0000
+++ apparmor/severity.py	2014-02-12 00:39:55 +0000
@@ -14,7 +14,7 @@
 from __future__ import with_statement
 import os
 import re
-from apparmor.common import AppArmorException, open_file_read, warn, convert_regexp #, msg, error, debug
+from apparmor.common import AppArmorException, open_file_read, warn, convert_regexp  # , msg, error, debug
 
 class Severity(object):
     def __init__(self, dbname=None, default_rank=10):
@@ -31,10 +31,10 @@
         if not dbname:
             return None
 
-        with open_file_read(dbname) as database:#open(dbname, 'r')
+        with open_file_read(dbname) as database:  # open(dbname, 'r')
             for lineno, line in enumerate(database, start=1):
-                line = line.strip() # or only rstrip and lstrip?
-                if line == '' or line.startswith('#') :
+                line = line.strip()  # or only rstrip and lstrip?
+                if line == '' or line.startswith('#'):
                     continue
                 if line.startswith('/'):
                     try:
@@ -43,7 +43,7 @@
                     except ValueError:
                         raise AppArmorException("Insufficient values for permissions in file: %s\n\t[Line %s]: %s" % (dbname, lineno, line))
                     else:
-                        if read not in range(0, 11) or write not in range(0,11) or execute not in range(0,11):
+                        if read not in range(0, 11) or write not in range(0, 11) or execute not in range(0, 11):
                             raise AppArmorException("Inappropriate values for permissions in file: %s\n\t[Line %s]: %s" % (dbname, lineno, line))
                         path = path.lstrip('/')
                         if '*' not in path:
@@ -67,7 +67,7 @@
                     except ValueError as e:
                         error_message = 'No severity value present in file: %s\n\t[Line %s]: %s' % (dbname, lineno, line)
                         #error(error_message)
-                        raise AppArmorException(error_message) # from None
+                        raise AppArmorException(error_message)  # from None
                     else:
                         if severity not in range(0, 11):
                             raise AppArmorException("Inappropriate severity value present in file: %s\n\t[Line %s]: %s" % (dbname, lineno, line))
@@ -83,7 +83,6 @@
         warn("unknown capability: %s" % resource)
         return self.severity['DEFAULT_RANK']
 
-
     def check_subtree(self, tree, mode, sev, segments):
         """Returns the max severity from the regex tree"""
         if len(segments) == 0:
@@ -91,21 +90,21 @@
         else:
             first = segments[0]
         rest = segments[1:]
-        path = '/'.join([first]+rest)
+        path = '/'.join([first] + rest)
         # Check if we have a matching directory tree to descend into
         if tree.get(first, False):
             sev = self.check_subtree(tree[first], mode, sev, rest)
         # If severity still not found, match against globs
-        if sev == None:
+        if sev is None:
             # Match against all globs at this directory level
             for chunk in tree.keys():
                 if '*' in chunk:
                     # Match rest of the path
-                    if re.search("^"+chunk, path):
+                    if re.search("^" + chunk, path):
                         # Find max rank
                         if "AA_RANK" in tree[chunk].keys():
                             for m in mode:
-                                if sev == None or tree[chunk]["AA_RANK"].get(m, -1) > sev:
+                                if sev is None or tree[chunk]["AA_RANK"].get(m, -1) > sev:
                                     sev = tree[chunk]["AA_RANK"].get(m, None)
         return sev
 
@@ -118,12 +117,12 @@
         if resource in self.severity['FILES'].keys():
             # Find max value among the given modes
             for m in mode:
-                if sev == None or self.severity['FILES'][resource].get(m, -1) > sev:
+                if sev is None or self.severity['FILES'][resource].get(m, -1) > sev:
                     sev = self.severity['FILES'][resource].get(m, None)
         else:
             # Search regex tree for matching glob
             sev = self.check_subtree(self.severity['REGEXPS'], mode, sev, pieces)
-        if sev == None:
+        if sev is None:
             # Return default rank if severity cannot be found
             return self.severity['DEFAULT_RANK']
         else:
@@ -146,13 +145,13 @@
         rank = None
         if '@' in resource:
             variable = regex_variable.search(resource).groups()[0]
-            variable = '@{'+variable+'}'
+            variable = '@{%s}' % variable
             #variables = regex_variable.findall(resource)
             for replacement in self.severity['VARIABLES'][variable]:
                 resource_replaced = self.variable_replace(variable, replacement, resource)
                 rank_new = self.handle_variable_rank(resource_replaced, mode)
                 #rank_new = self.handle_variable_rank(resource.replace('@{'+variable+'}', replacement), mode)
-                if rank == None or rank_new > rank:
+                if rank is None or rank_new > rank:
                     rank = rank_new
             return rank
         else:
@@ -163,13 +162,13 @@
         leading = False
         trailing = False
         # Check for leading or trailing / that may need to be collapsed
-        if resource.find("/"+variable) != -1 and resource.find("//"+variable) == -1:    # find that a single / exists before variable or not
+        if resource.find("/" + variable) != -1 and resource.find("//" + variable) == -1:  # find that a single / exists before variable or not
             leading = True
-        if resource.find(variable+"/") != -1 and resource.find(variable+"//") == -1:
+        if resource.find(variable + "/") != -1 and resource.find(variable + "//") == -1:
             trailing = True
-        if replacement[0] == '/' and replacement[:2] != '//' and leading:    # finds if the replacement has leading / or not
+        if replacement[0] == '/' and replacement[:2] != '//' and leading:  # finds if the replacement has leading / or not
             replacement = replacement[1:]
-        if replacement[-1] == '/' and replacement[-2:] !='//' and trailing:
+        if replacement[-1] == '/' and replacement[-2:] != '//' and trailing:
             replacement = replacement[:-1]
         return resource.replace(variable, replacement)
 
 
=== modified file 'apparmor/tools.py'
--- apparmor/tools.py	2014-02-01 01:34:08 +0000
+++ apparmor/tools.py	2014-02-12 00:39:55 +0000
@@ -11,12 +11,17 @@
 #    GNU General Public License for more details.
 #
 # ----------------------------------------------------------------------
+import gettext
 import os
 import sys
 
 import apparmor.aa as apparmor
 from apparmor.common import user_perm
 
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
+
 class aa_tools:
     def __init__(self, tool_name, args):
         self.name = tool_name
@@ -24,12 +29,12 @@
         self.profiling = args.program
         self.check_profile_dir()
         self.silent = None
-        
+
         if tool_name in ['audit', 'complain']:
             self.remove = args.remove
         elif tool_name == 'disable':
             self.revert = args.revert
-            self.disabledir = apparmor.profile_dir+'/disable'
+            self.disabledir = apparmor.profile_dir + '/disable'
             self.check_disable_dir()
         elif tool_name == 'autodep':
             self.force = args.force
@@ -41,14 +46,14 @@
         if self.profiledir:
             apparmor.profile_dir = apparmor.get_full_path(self.profiledir)
             if not os.path.isdir(apparmor.profile_dir):
-                raise apparmor.AppArmorException("%s is not a directory." %self.profiledir)
+                raise apparmor.AppArmorException("%s is not a directory." % self.profiledir)
 
         if not user_perm(apparmor.profile_dir):
-            raise apparmor.AppArmorException("Cannot write to profile directory: %s" %(apparmor.profile_dir))
+            raise apparmor.AppArmorException("Cannot write to profile directory: %s" % (apparmor.profile_dir))
 
     def check_disable_dir(self):
         if not os.path.isdir(self.disabledir):
-            raise apparmor.AppArmorException("Can't find AppArmor disable directory %s" %self.disabledir)
+            raise apparmor.AppArmorException("Can't find AppArmor disable directory %s" % self.disabledir)
 
     def act(self):
         for p in self.profiling:
@@ -72,12 +77,12 @@
                 if program and not program.startswith('/'):
                     program = apparmor.UI_GetString(_('The given program cannot be found, please try with the fully qualified path name of the program: '), '')
                 else:
-                    apparmor.UI_Info(_("%s does not exist, please double-check the path.")%p)
+                    apparmor.UI_Info(_("%s does not exist, please double-check the path.") % p)
                     sys.exit(1)
 
             if self.name == 'autodep' and program and os.path.exists(program):
                 self.use_autodep(program)
-                
+
             elif program and apparmor.profile_exists(program):
                 if self.name == 'cleanprof':
                     self.clean_profile(program, p)
@@ -86,21 +91,21 @@
                     filename = apparmor.get_profile_filename(program)
 
                     if not os.path.isfile(filename) or apparmor.is_skippable_file(filename):
-                        apparmor.UI_Info(_('Profile for %s not found, skipping')%p)
+                        apparmor.UI_Info(_('Profile for %s not found, skipping') % p)
 
                     elif self.name == 'disable':
                         if not self.revert:
-                            apparmor.UI_Info(_('Disabling %s.')%program)
+                            apparmor.UI_Info(_('Disabling %s.') % program)
                             self.disable_profile(filename)
                         else:
-                            apparmor.UI_Info(_('Enabling %s.')%program)
+                            apparmor.UI_Info(_('Enabling %s.') % program)
                             self.enable_profile(filename)
 
                     elif self.name == 'audit':
                         if not self.remove:
-                            apparmor.UI_Info(_('Setting %s to audit mode.')%program)
+                            apparmor.UI_Info(_('Setting %s to audit mode.') % program)
                         else:
-                            apparmor.UI_Info(_('Removing audit mode from %s.')%program)
+                            apparmor.UI_Info(_('Removing audit mode from %s.') % program)
                         apparmor.change_profile_flags(filename, program, 'audit', not self.remove)
 
                     elif self.name == 'complain':
@@ -111,9 +116,9 @@
                         #apparmor.set_profile_flags(filename, self.name)
                     else:
                         # One simply does not walk in here!
-                        raise apparmor.AppArmorException('Unknown tool: %s'%self.name)
+                        raise apparmor.AppArmorException('Unknown tool: %s' % self.name)
 
-                    cmd_info = apparmor.cmd([apparmor.parser, filename, '-I%s'%apparmor.profile_dir, '-R 2>&1', '1>/dev/null'])
+                    cmd_info = apparmor.cmd([apparmor.parser, filename, '-I%s' % apparmor.profile_dir, '-R 2>&1', '1>/dev/null'])
                     #cmd_info = apparmor.cmd(['cat', filename, '|', apparmor.parser, '-I%s'%apparmor.profile_dir, '-R 2>&1', '1>/dev/null'])
 
                     if cmd_info[0] != 0:
@@ -121,9 +126,9 @@
 
             else:
                 if '/' not in p:
-                    apparmor.UI_Info(_("Can't find %s in the system path list. If the name of the application\nis correct, please run 'which %s' as a user with correct PATH\nenvironment set up in order to find the fully-qualified path and\nuse the full path as parameter.")%(p, p))
+                    apparmor.UI_Info(_("Can't find %s in the system path list. If the name of the application\nis correct, please run 'which %s' as a user with correct PATH\nenvironment set up in order to find the fully-qualified path and\nuse the full path as parameter.") % (p, p))
                 else:
-                    apparmor.UI_Info(_("%s does not exist, please double-check the path.")%p)
+                    apparmor.UI_Info(_("%s does not exist, please double-check the path.") % p)
                     sys.exit(1)
 
     def clean_profile(self, program, p):
@@ -140,12 +145,12 @@
                 q = apparmor.hasher()
                 q['title'] = 'Changed Local Profiles'
                 q['headers'] = []
-                q['explanation'] = _('The local profile for %s in file %s was changed. Would you like to save it?') %(program, filename)
+                q['explanation'] = _('The local profile for %s in file %s was changed. Would you like to save it?') % (program, filename)
                 q['functions'] = ['CMD_SAVE_CHANGES', 'CMD_VIEW_CHANGES', 'CMD_ABORT']
                 q['default'] = 'CMD_VIEW_CHANGES'
                 q['options'] = []
                 q['selected'] = 0
-                p =None
+                p = None
                 ans = ''
                 arg = None
                 while ans != 'CMD_SAVE_CHANGES':
@@ -161,13 +166,13 @@
                 apparmor.write_profile_ui_feedback(program)
                 apparmor.reload_base(program)
         else:
-            raise apparmor.AppArmorException(_('The profile for %s does not exists. Nothing to clean.')%p)
+            raise apparmor.AppArmorException(_('The profile for %s does not exists. Nothing to clean.') % p)
 
     def use_autodep(self, program):
         apparmor.check_qualifiers(program)
 
         if os.path.exists(apparmor.get_profile_filename(program) and not self.force):
-            apparmor.UI_Info('Profile for %s already exists - skipping.'%program)
+            apparmor.UI_Info('Profile for %s already exists - skipping.' % program)
         else:
             apparmor.autodep(program)
             if self.aa_mountpoint:
@@ -177,4 +182,4 @@
         apparmor.delete_symlink('disable', filename)
 
     def disable_profile(self, filename):
-        apparmor.create_symlink('disable', filename)
 \ No newline at end of file
+        apparmor.create_symlink('disable', filename)
 
=== modified file 'apparmor/ui.py'
--- apparmor/ui.py	2014-02-01 00:44:05 +0000
+++ apparmor/ui.py	2014-02-12 00:39:55 +0000
@@ -11,12 +11,16 @@
 #    GNU General Public License for more details.
 #
 # ----------------------------------------------------------------------
+import gettext
 import sys
-import os
 import re
 from apparmor.yasti import yastLog, SendDataToYast, GetDataFromYast
 
-from apparmor.common import readkey, AppArmorException, DebugLogger, msg
+from apparmor.common import readkey, AppArmorException, DebugLogger
+
+# setup module translations
+from apparmor.translations import init_translation
+_ = init_translation()
 
 # Set up UI logger for separate messages from UI module
 debug_logger = DebugLogger('UI')
@@ -48,14 +52,13 @@
     if UI_mode == 'text':
         sys.stdout.write('\n' + text + '\n')
     else:
-        SendDataToYast({
-                        'type': 'dialog-error',
+        SendDataToYast({'type': 'dialog-error',
                         'message': text
                         })
         path, yarg = GetDataFromYast()
 
 def get_translated_hotkey(translated, cmsg=''):
-    msg = 'PromptUser: '+_('Invalid hotkey for')
+    msg = 'PromptUser: ' + _('Invalid hotkey for')
 
     # Originally (\S) was used but with translations it would not work :(
     if re.search('\((\S+)\)', translated, re.LOCALE):
@@ -64,10 +67,10 @@
         if cmsg:
             raise AppArmorException(cmsg)
         else:
-            raise AppArmorException('%s %s' %(msg, translated))
+            raise AppArmorException('%s %s' % (msg, translated))
 
 def UI_YesNo(text, default):
-    debug_logger.debug('UI_YesNo: %s: %s %s' %(UI_mode, text, default))
+    debug_logger.debug('UI_YesNo: %s: %s %s' % (UI_mode, text, default))
     default = default.lower()
     ans = None
     if UI_mode == 'text':
@@ -101,10 +104,9 @@
                 ans = default
 
     else:
-        SendDataToYast({
-                         'type': 'dialog-yesno',
-                         'question': text
-                         })
+        SendDataToYast({'type': 'dialog-yesno',
+                        'question': text
+                        })
         ypath, yarg = GetDataFromYast()
         ans = yarg['answer']
         if not ans:
@@ -142,7 +144,7 @@
                 elif ans == nokey:
                     ans = 'n'
                 elif ans == cancelkey:
-                    ans= 'c'
+                    ans = 'c'
                 elif ans == 'left':
                     if default == 'n':
                         default = 'y'
@@ -156,8 +158,7 @@
             else:
                 ans = default
     else:
-        SendDataToYast({
-                        'type': 'dialog-yesnocancel',
+        SendDataToYast({'type': 'dialog-yesnocancel',
                         'question': text
                         })
         ypath, yarg = GetDataFromYast()
@@ -173,8 +174,7 @@
         sys.stdout.write('\n' + text)
         string = sys.stdin.readline()
     else:
-        SendDataToYast({
-                        'type': 'dialog-getstring',
+        SendDataToYast({'type': 'dialog-getstring',
                         'label': text,
                         'default': default
                         })
@@ -201,8 +201,7 @@
     if UI_mode == 'text':
         UI_Info(message)
     else:
-        SendDataToYast({
-                        'type': 'dialog-busy-start',
+        SendDataToYast({'type': 'dialog-busy-start',
                         'message': message
                         })
         ypath, yarg = GetDataFromYast()
@@ -213,8 +212,7 @@
         SendDataToYast({'type': 'dialog-busy-stop'})
         ypath, yarg = GetDataFromYast()
 
-CMDS = {
-        'CMD_ALLOW': _('(A)llow'),
+CMDS = {'CMD_ALLOW': _('(A)llow'),
         'CMD_OTHER': _('(M)ore'),
         'CMD_AUDIT_NEW': _('Audi(t)'),
         'CMD_AUDIT_OFF': _('Audi(t) off'),
@@ -307,16 +305,14 @@
         sys.exit(0)
 
 def UI_ShortMessage(title, message):
-    SendDataToYast({
-                    'type': 'short-dialog-message',
+    SendDataToYast({'type': 'short-dialog-message',
                     'headline': title,
                     'message': message
                     })
     ypath, yarg = GetDataFromYast()
 
 def UI_LongMessage(title, message):
-    SendDataToYast({
-                    'type': 'long-dialog-message',
+    SendDataToYast({'type': 'long-dialog-message',
                     'headline': title,
                     'message': message
                     })
@@ -356,7 +352,7 @@
         keys[key] = cmd
 
         if default and default == cmd:
-            menutext = '[%s]' %menutext
+            menutext = '[%s]' % menutext
 
         menu_items.append(menutext)
 
@@ -392,14 +388,14 @@
 
         prompt = '\n'
         if title:
-            prompt += '= %s =\n\n' %title
+            prompt += '= %s =\n\n' % title
 
         if headers:
             header_copy = headers[:]
             while header_copy:
                 header = header_copy.pop(0)
                 value = header_copy.pop(0)
-                prompt += formatstr %(header+':', value)
+                prompt += formatstr % (header + ':', value)
             prompt += '\n'
 
         if explanation:
@@ -411,12 +407,12 @@
                     format_option = ' [%s - %s]'
                 else:
                     format_option = '  %s - %s '
-                prompt += format_option %(index+1, option)
+                prompt += format_option % (index + 1, option)
                 prompt += '\n'
 
         prompt += ' / '.join(menu_items)
 
-        sys.stdout.write(prompt+'\n')
+        sys.stdout.write(prompt + '\n')
 
         ans = getkey().lower()
 
@@ -427,7 +423,7 @@
                 ans = 'XXXINVALIDXXX'
 
             elif ans == 'down':
-                if options and selected < len(options)-1:
+                if options and selected < len(options) - 1:
                     selected += 1
                 ans = 'XXXINVALIDXXX'
 
@@ -446,7 +442,7 @@
                 ans = 'XXXINVALIDXXX'
 
         if keys.get(ans, False) == 'CMD_HELP':
-            sys.stdout.write('\n%s\n' %helptext)
+            sys.stdout.write('\n%s\n' % helptext)
             ans = 'again'
 
     if keys.get(ans, False):
 
=== removed file 'apparmor/writeprofile.py'
=== modified file 'apparmor/yasti.py'
--- apparmor/yasti.py	2013-09-28 15:13:06 +0000
+++ apparmor/yasti.py	2014-02-12 00:39:55 +0000
@@ -101,4 +101,3 @@
     else:
         ret += argref
     return ret
-