makecatalogs plugin-level support. additional changes for python 2 support.

Author: tboyko

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [1.1.3] - 2020-08-18
+
+### Added
+
+- Support for plugin-driven makecatalogs
+
+### Fixed
+
+- Switched to Python 2-compatible super() instantiation for URLGetter class
+
 ## [1.1.2] - 2020-08-13
 
 ### Fixed

README.md

@@ -54,6 +54,6 @@ SimpleMDM does not support the concept of Munki catalogs in the traditional sens
 1. Create a new Munki managed assignment group if one does not already exist.
 1. Assign the newly uploaded app to the assignment group.
 
-### Do not use makecatalogs
+### Using Makecatalogs
 
-SimpleMDM utilizes a proprietary backend for munki asset storage. Such being the case, catalog generation is handled automatically and does not need to be invoked with the `makecatalogs` utility or with `MakeCatalogs.munki`. Running either of these will result in an error.
+SimpleMDM utilizes a proprietary backend for munki asset storage. Such being the case, catalog generation is handled automatically and does not need to be invoked with the `makecatalogs` utility or with `MakeCatalogs.munki`. Munki version 5.1 (yet to be released as of 8/18/20) will automatically detect this and running m`makecatalogs` or `MakeCatalogs.munki` will result in no action being taken. If using an earlier version of Munki, running either of these utilities will result in an error.

SimpleMDMRepo.py

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 # SimpleMDMRepo.py
-# Version 1.1.2
+# Version 1.1.3
 
 from __future__ import absolute_import, print_function
 
@@ -14,8 +14,6 @@
 import re
 import sys
 
-import sys
-
 try:
     from urllib2 import quote
 except ImportError:
@@ -150,6 +148,9 @@ def put_from_local_file(self, resource_identifier, local_file_path):
     def delete(self, resource_identifier):
         raise ProcessorError("This action is not supported by SimpleMDM") 
 
+    def makecatalogs(self, options, output_fn=None):
+        return []
+
 # Borrowed/adapted from AutoPkg, to eliminate AutoPkg lib dependency
 
 def log_err(msg):
@@ -165,7 +166,7 @@ class ProcessorError(Exception):
 
     pass
 
-class Processor:
+class Processor(object):
     """Processor base class.
 
     Processors accept a property list as input, process its contents, and
@@ -295,7 +296,7 @@ class URLGetter(Processor):
     description = __doc__
 
     def __init__(self, env=None, infile=None, outfile=None):
-        super().__init__(env, infile, outfile)
+        super(URLGetter, self).__init__(env, infile, outfile)
         if not self.env:
             self.env = {}