Attachment 10487 Details for Bug 51996 – Result after running 2-to-3

[patch] Result after running 2-to-3

univention-appcenter-control.patch (text/plain), 1.11 KB, created by Nico Gulden on 2020-09-11 11:46:24 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Nico Gulden

Created: 2020-09-11 11:46:24 CEST

Size: 1.11 KB

patch

obsolete

>--- univention-appcenter-control	(original)
>+++ univention-appcenter-control	(refactored)
>@@ -121,9 +121,7 @@
> 		return new_cls
> 
> 
>-class UniventionAppAction(object):
>-	__metaclass__ = UniventionAppActionMeta
>-
>+class UniventionAppAction(object, metaclass=UniventionAppActionMeta):
> 	parent_logger = get_base_logger().getChild('actions')
> 
> 	def __init__(self):
>@@ -186,7 +184,7 @@
> 				default = getattr(_namespace, action.dest)
> 			args[action.dest] = default
> 		args.update(kwargs)
>-		for key, value in args.iteritems():
>+		for key, value in args.items():
> 			setattr(namespace, key, value)
> 		return namespace
> 
>@@ -266,7 +264,7 @@
> 			return args.username
> 		if not args.noninteractive:
> 			try:
>-				username = raw_input('Username: ')
>+				username = input('Username: ')
> 				if not username:
> 					raise EOFError()
> 			except (EOFError, KeyboardInterrupt):
>@@ -356,7 +354,7 @@
> 			server = 'https://%s' % server
> 		uri = '%s/univention/%s' % (server, path)
> 		args = []
>-		for key, value in kwargs.iteritems():
>+		for key, value in kwargs.items():
> 			if value is None:
> 				continue
> 			if not isinstance(value, (tuple, list)):

Actions: View | Diff

Attachments on bug 51996: 10487 | 10947 | 10948 | 10949