fix: add Python 3 compatiblitly

Author: spaceone

asterisk4ucs-testasterisk/debian/changelog

@@ -1,3 +1,9 @@
+asterisk4ucs-testasterisk (2.0.1) unstable; urgency=medium
+
+  * Add UCS 5.0 support. Migrate to Python 3
+
+ -- Florian Best <best@univention.de>  Sun, 03 Apr 2022 20:56:35 +0200
+
 asterisk4ucs-testasterisk (1.0.1) unstable; urgency=low
 
   * Nichtinteraktive Installation repariert

asterisk4ucs-udm/42asterisk4ucs-udm.inst

@@ -30,4 +30,3 @@ umc_policy_append "default-umc-all" "udm-asterisk"
 joinscript_save_current_version
 
 exit 0
-

asterisk4ucs-udm/conffiles/etc/ldap/slapd.conf.d/80asterisk

@@ -1,7 +1,5 @@
 @%@UCRWARNING=# @%@
 @!@
-if baseConfig['server/role'] == "domaincontroller_master":
-        print "include /usr/share/univention-ldap/schema/asterisk4ucs.schema"
+if configRegistry['server/role'] == "domaincontroller_master":
+	print("include /usr/share/univention-ldap/schema/asterisk4ucs.schema")
 @!@
-
-

asterisk4ucs-udm/debian/changelog

@@ -1,3 +1,9 @@
+asterisk4ucs-udm (2.0.1) unstable; urgency=medium
+
+  * Add UCS 5.0 support. Migrate to Python 3
+
+ -- Florian Best <best@univention.de>  Sun, 03 Apr 2022 20:58:30 +0200
+
 asterisk4ucs-udm (1.0.0) unstable; urgency=low
 
   * Einige Bugfixes, Vorbereitung auf Release

asterisk4ucs-udm/devscripts/hardrestart

@@ -15,4 +15,4 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-kill -9 `ps aux | grep management-console | cut -d\  -f 7` ; /etc/init.d/univention-management-console-server start && /etc/init.d/univention-management-console-web-server start
+systemctl restart univention-management-console-server

asterisk4ucs-udm/modules/univention/admin/handlers/asterisk/__init__.py

@@ -110,10 +110,10 @@ def genSipconfEntry(co, lo, phone):
 
 
 def genSipconfFaxEntry(co, lo, phone):
-	res = "[%s]\n" % (phone["extension"])
+	res = "[%s]\n" % (phone["extension"],)
 	res += "type=friend\n"
 	res += "host=dynamic\n"
-	res += "secret=%s\n" % (phone["password"])
+	res += "secret=%s\n" % (phone["password"],)
 	return res
 
 
@@ -159,7 +159,7 @@ def genSipconf(co, lo, srv):
 def genVoicemailconfEntry(co, lo, box):
 	from univention.admin.handlers.users import user
 	boxUser = user.lookup(co, lo, filter_format("(ast4ucsUserMailbox=%s)", (box.dn,)))
-	if len(boxUser) == 0:
+	if not boxUser:
 		return ";; Mailbox %s has no user.\n" % box["id"]
 	if len(boxUser) > 1:
 		msg = ";; Mailbox %s has multiple users:\n" % box["id"]

asterisk4ucs-udm/modules/univention/admin/handlers/asterisk/agiscript.py

@@ -17,6 +17,8 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 """
 
+import base64
+
 import univention.admin.filter
 import univention.admin.handlers
 import univention.admin.syntax
@@ -76,10 +78,10 @@ class object(simpleLdap):
 	module = module
 
 	def getContent(self):
-		return self.get("content", "").decode("base64")
+		return base64.b64decode(self.get("content", "").encode('UTF-8')).decode("ascii")
 
 	def setContent(self, content):
-		self["content"] = content.encode("base64").replace("\n", "")
+		self["content"] = base64.b64encode(content.encode("utf-8")).decode('ascii')
 
 	def _ldap_addlist(self):
 		return [('ast4ucsSrvchildServer', self.superordinate.dn)]

asterisk4ucs-udm/modules/univention/admin/handlers/asterisk/mailbox.py

@@ -37,7 +37,6 @@
 childs = False
 superordinate = "asterisk/server"
 
-# Definiert das Layout der Eingabefelder in der Weboberfläche
 layout = [
 	Tab('Allgemein', 'Allgemeine Einstellungen', layout=[
 		["id"],
@@ -46,8 +45,6 @@
 	])
 ]
 
-# Definiert die verschiedenen UDM-Attribute
-# http://wiki.univention.de/index.php?title=Entwicklung_und_Integration_eigener_Module_in_Univention_Directory_Manager#property-descriptions
 property_descriptions = {
 	"commonName": univention.admin.property(
 		short_description="Name",
@@ -72,8 +69,6 @@
 	),
 }
 
-# Definiert die Zuordnung von UDM-Attributen zu LDAP-Attributen.
-# http://wiki.univention.de/index.php?title=Entwicklung_und_Integration_eigener_Module_in_Univention_Directory_Manager#mapping
 mapping = univention.admin.mapping.mapping()
 mapping.register("commonName", "cn", None, univention.admin.mapping.ListToString)
 mapping.register("id", "ast4ucsMailboxId", None, univention.admin.mapping.ListToString)

asterisk4ucs-udm/number2name.agi

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 """
@@ -21,13 +21,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 import sys
 import ldap
 import logging
-import psycopg2
-import psycopg2.extras  # noqa: F401
 
 LOG_FILENAME = '/tmp/ast4ucs-number2name.log'
 
 # read options from config file
-config = open("/etc/asterisk4ucs.ldapconfig").read().split("\n")
+config = open("/etc/asterisk4ucs.ldapconfig").read().splitlines()
 LDAP_IP = config[0]
 LDAP_SEARCH_BASE = config[1]
 ADMIN_DN = config[2]
@@ -44,7 +42,7 @@ logging.basicConfig(
 )
 
 # Read and ignore AGI environment (read until blank line)
-env = dict()
+env = {}
 while len(sys.argv) < 2:
 	line = sys.stdin.readline().strip()
 	if not line:
@@ -92,25 +90,24 @@ if not result:
 	sys.exit(0)
 
 result = result[0][1]
-unwrap = lambda x: x[0] if x else None  # noqa: E731
 
-orga = unwrap(result.get('o'))
-last = unwrap(result.get('ast4ucsContactLastname'))
-first = unwrap(result.get('ast4ucsContactFirstname'))
+orga = result.get('o', [b''])[0].decode('UTF-8')
+last = result.get('ast4ucsContactLastname', [b''])[0].decode('UTF-8')
+first = result.get('ast4ucsContactFirstname', [b''])[0].decode('UTF-8')
 
 if first and last:
 	name = "%s %s" % (first, last)
 elif last:
 	name = last
 else:
-	name = first  # could be string or None
+	name = first
 
 if orga and name:
 	cn = "%s (%s)" % (name, orga)
 elif orga:
 	cn = orga
 else:
-	cn = name  # could be string or None
+	cn = name
 
 if not cn:
 	logging.info("Kontakt hat weder Name noch Organisation, exit")
@@ -135,7 +132,7 @@ for rule in rules:
 
 # Namen an Asterisk senden
 logging.info("Setze Variable CALLERID auf " + cname)
-#cname = unicode(cname, 'utf-8').encode('iso-8859-1')
+#cname = cname.encode('iso-8859-1')
 sys.stdout.write('SET CALLERID "%s"\n' % (cname))
 sys.stdout.flush()
 

asterisk4ucs-udm/osgaImport.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 # coding=utf-8
 
 """