Fix up some more pyflakes issues with the tools

utils/aa-genprof

@@ -155,8 +155,8 @@ while not done_profiling:
 
 for p in sorted(apparmor.helpers.keys()):
     if apparmor.helpers[p] == 'enforce':
-        enforce(p)
-        reload(p)
+        apparmor.enforce(p)
+        apparmor.reload(p)
 
 apparmor.UI_Info(_('\nReloaded AppArmor profiles in enforce mode.'))
 apparmor.UI_Info(_('\nPlease consider contributing your new profile!\nSee the following wiki page for more information:')+'\nhttp://wiki.apparmor.net/index.php/Profiles\n')

utils/aa-mergeprof

@@ -13,7 +13,7 @@
 #
 # ----------------------------------------------------------------------
 import argparse
-import sys
+import re
 
 import apparmor.aa
 import apparmor.aamode
@@ -492,7 +492,7 @@ class Merge(object):
                                     if match:
                                         inc = match 
                                         deleted = 0
-                                        deleted = apparmor.aa.delete_duplicates(aa[profile][hat], inc)
+                                        deleted = apparmor.aa.delete_duplicates(self.user.aa[profile][hat], inc)
                                         self.user.aa[profile][hat]['include'][inc] =  True
                                         apparmor.aa.changed[profile] =  True
                                         apparmor.aa.UI_Info(_('Adding %s to profile.') % path)