Compat: Do not use "wraps" from Compat on the Server.

src/lib/Bcfg2/Server/Core.py

@@ -18,9 +18,10 @@
 import Bcfg2.DBSettings
 import Bcfg2.Server.Statistics
 import Bcfg2.Server.FileMonitor
+from functools import wraps
 from itertools import chain
 from Bcfg2.Server.Cache import Cache
-from Bcfg2.Compat import xmlrpclib, wraps  # pylint: disable=W0622
+from Bcfg2.Compat import xmlrpclib
 from Bcfg2.Server.Plugin.exceptions import *  # pylint: disable=W0401,W0614
 from Bcfg2.Server.Plugin.interfaces import *  # pylint: disable=W0401,W0614
 from Bcfg2.Server.Statistics import track_statistics

src/lib/Bcfg2/Server/MultiprocessingCore.py

@@ -18,8 +18,9 @@
 import Bcfg2.Options
 import Bcfg2.Server.Cache
 import Bcfg2.Server.Plugin
+from functools import wraps
 from itertools import cycle
-from Bcfg2.Compat import Queue, Empty, wraps
+from Bcfg2.Compat import Queue, Empty
 from Bcfg2.Server.Core import Core, exposed
 from Bcfg2.Server.BuiltinCore import BuiltinCore
 from multiprocessing.connection import Listener, Client

src/lib/Bcfg2/Server/Plugin/helpers.py

@@ -9,11 +9,13 @@
 import genshi
 import operator
 import lxml.etree
+from functools import wraps
+
 import Bcfg2.Server
 import Bcfg2.Options
 import Bcfg2.Server.FileMonitor
 from Bcfg2.Logger import Debuggable
-from Bcfg2.Compat import CmpMixin, MutableMapping, wraps
+from Bcfg2.Compat import CmpMixin, MutableMapping
 from Bcfg2.Server.Plugin.base import Plugin
 from Bcfg2.Server.Plugin.interfaces import Generator, TemplateDataProvider
 from Bcfg2.Server.Plugin.exceptions import SpecificityError, \

src/lib/Bcfg2/Server/Plugins/Metadata.py

@@ -11,14 +11,14 @@
 import logging
 import lxml.etree
 from collections import MutableMapping
+from functools import wraps
 
 import Bcfg2.Server
 import Bcfg2.Options
 import Bcfg2.Server.Plugin
 import Bcfg2.Server.FileMonitor
 from Bcfg2.Utils import locked
 from Bcfg2.Server.Cache import Cache
-from Bcfg2.Compat import wraps
 from Bcfg2.version import Bcfg2VersionInfo
 
 try:

src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py

@@ -10,7 +10,7 @@
 import logging
 import Bcfg2.Options
 import Bcfg2.Logger
-from Bcfg2.Compat import wraps
+from functools import wraps
 from lockfile import FileLock, LockTimeout
 try:
     import json

src/lib/Bcfg2/Server/Statistics.py

@@ -3,7 +3,7 @@
 :func:`Bcfg2.Server.Core.BaseCore.get_statistics`."""
 
 import time
-from Bcfg2.Compat import wraps
+from functools import wraps
 
 
 class Statistic(object):