Imported Debian patch 4.7.2-3

ipaclient/remote_plugins/2_114/automember.py

@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
 if six.PY3:
     unicode = str
 
-__doc__ = _(r"""
+__doc__ = _("""
 Auto Membership Rule.
 
 Bring clarity to the membership of hosts and users by configuring inclusive

ipaclient/remote_plugins/2_114/group.py

@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
 if six.PY3:
     unicode = str
 
-__doc__ = _(r"""
+__doc__ = _("""
 Groups of users
 
 Manage groups of users. By default, new groups are POSIX groups. You

ipaclient/remote_plugins/2_114/hbactest.py

@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
 if six.PY3:
     unicode = str
 
-__doc__ = _(r"""
+__doc__ = _("""
 Simulate use of Host-based access controls
 
 HBAC rules control who can access what services on what hosts.

ipaclient/remote_plugins/2_114/trust.py

@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
 if six.PY3:
     unicode = str
 
-__doc__ = _(r"""
+__doc__ = _("""
 Cross-realm trusts
 
 Manage trust relationship between IPA and Active Directory domains.

ipaclient/remote_plugins/2_156/automember.py

@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
 if six.PY3:
     unicode = str
 
-__doc__ = _(r"""
+__doc__ = _("""
 Auto Membership Rule.
 
 Bring clarity to the membership of hosts and users by configuring inclusive

ipaclient/remote_plugins/2_156/group.py

@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
 if six.PY3:
     unicode = str
 
-__doc__ = _(r"""
+__doc__ = _("""
 Groups of users
 
 Manage groups of users. By default, new groups are POSIX groups. You

ipaclient/remote_plugins/2_156/hbactest.py

@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
 if six.PY3:
     unicode = str
 
-__doc__ = _(r"""
+__doc__ = _("""
 Simulate use of Host-based access controls
 
 HBAC rules control who can access what services on what hosts.

ipaclient/remote_plugins/2_156/trust.py

@@ -16,7 +16,7 @@ from ipapython.dnsutil import DNSName
 if six.PY3:
     unicode = str
 
-__doc__ = _(r"""
+__doc__ = _("""
 Cross-realm trusts
 
 Manage trust relationship between IPA and Active Directory domains.

ipaclient/remote_plugins/compat.py

@@ -2,8 +2,6 @@
 # Copyright (C) 2016  FreeIPA Contributors see COPYING for license
 #
 
-from __future__ import unicode_literals
-
 import importlib
 import os
 import re
@@ -44,19 +42,19 @@ def get_package(server_info, client):
     if not is_valid:
         if not client.isconnected():
             client.connect(verbose=False)
-        env = client.forward('env', 'api_version', version='2.0')
+        env = client.forward(u'env', u'api_version', version=u'2.0')
         try:
             server_version = env['result']['api_version']
         except KeyError:
-            ping = client.forward('ping', version='2.0')
+            ping = client.forward(u'ping', version=u'2.0')
             try:
-                match = re.search(r'API version (2\.[0-9]+)', ping['summary'])
+                match = re.search(u'API version (2\.[0-9]+)', ping['summary'])
             except KeyError:
                 match = None
             if match is not None:
                 server_version = match.group(1)
             else:
-                server_version = '2.0'
+                server_version = u'2.0'
         server_info['version'] = server_version
         server_info.update_validity()
 

ipaclient/remote_plugins/schema.py

@@ -95,7 +95,7 @@ class _SchemaObject(Object):
     pass
 
 
-class _SchemaPlugin:
+class _SchemaPlugin(object):
     bases = None
     schema_key = None
 
@@ -352,7 +352,7 @@ class NotAvailable(Exception):
     pass
 
 
-class Schema:
+class Schema(object):
     """
     Store and provide schema for commands and topics