Merge lp:~rvb/maas/fixjsenum into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Add a copy of map_enum in jsenum so that the packaging (which uses jsenum) doesn't have the need to install all the dependencies required by importing from the provisioningserver code.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/maasserver/utils/jsenums.py'
--- src/maasserver/utils/jsenums.py	2014-07-17 12:32:32 +0000
+++ src/maasserver/utils/jsenums.py	2014-07-22 07:10:57 +0000
@@ -34,8 +34,6 @@
 import sys
 from textwrap import dedent
 
-from provisioningserver.utils import map_enum
-
 # Header.  Will be written on top of the output.
 header = dedent("""\
 /*
@@ -80,6 +78,24 @@
     return get_enum_classes(namespace)
 
 
+# This method is duplicated from provisioningserver/utils/__init__.py
+# because jsenums is used by the packaging to build the JS file and
+# we don't want to force the packaging to require all the dependencies
+# that using provisioningserver/utils/__init__.py would imply.
+def map_enum(enum_class):
+    """Map out an enumeration class as a "NAME: value" dict."""
+    # Filter out anything that starts with '_', which covers private and
+    # special methods.  We can make this smarter later if we start using
+    # a smarter enumeration base class etc.  Or if we switch to a proper
+    # enum mechanism, this function will act as a marker for pieces of
+    # code that should be updated.
+    return {
+        key: value
+        for key, value in vars(enum_class).items()
+        if not key.startswith('_')
+    }
+
+
 def serialize_enum(enum):
     """Represent a MAAS enum class in JavaScript."""
     definitions = json.dumps(map_enum(enum), indent=4, sort_keys=True)