Updated per code review feedback

requirements.txt

@@ -1,6 +1,6 @@
 applicationinsights==0.10.0
 azure==2.0.0rc1
-jmespath==0.9.0
+jmespath
 mock==1.3.0
 pylint==1.5.4
 six==1.10.0

src/azure/cli/_argparse.py

@@ -4,7 +4,7 @@
 from ._locale import L, get_file as locale_get_file
 from ._logging import logger
 from ._output import OutputProducer
-from azure.cli.extensions import EVENT_DISPATCHER
+from azure.cli.extensions import event_dispatcher
 
 # Named arguments are prefixed with one of these strings
 ARG_PREFIXES = sorted(('-', '--', '/'), key=len, reverse=True)
@@ -255,11 +255,11 @@ def not_global(a):
                 }
 
             # Let any event handlers that want to modify/munge the parameters do so...
-            EVENT_DISPATCHER.raise_event(EVENT_DISPATCHER.PARSING_PARAMETERS, event_data)
+            event_dispatcher.raise_event(event_dispatcher.PARSING_PARAMETERS, event_data)
 
             # Let any event handlers that want to know that we are about to execute do their
             # thing...
-            EVENT_DISPATCHER.raise_event(EVENT_DISPATCHER.EXECUTING_COMMAND, event_data)
+            event_dispatcher.raise_event(event_dispatcher.EXECUTING_COMMAND, event_data)
 
             return ArgumentParserResult(event_data['handler'](parsed, others), output_format)
         except IncorrectUsageError as ex:

src/azure/cli/_output.py

@@ -7,7 +7,7 @@
 from enum import Enum
 from six import StringIO
 
-from azure.cli.extensions import EVENT_DISPATCHER
+from azure.cli.extensions import event_dispatcher
 
 class OutputFormatException(Exception):
     pass
@@ -62,8 +62,8 @@ def __init__(self, formatter=format_list, file=sys.stdout): #pylint: disable=red
     def out(self, obj):
         obj = OutputProducer.todict(obj)
         event_data = {'result': obj}
-        EVENT_DISPATCHER.raise_event(EVENT_DISPATCHER.TRANSFORM_RESULT, event_data)
-        EVENT_DISPATCHER.raise_event(EVENT_DISPATCHER.FILTER_RESULT, event_data)
+        event_dispatcher.raise_event(event_dispatcher.TRANSFORM_RESULT, event_data)
+        event_dispatcher.raise_event(event_dispatcher.FILTER_RESULT, event_data)
         print(self.formatter(event_data['result']), file=self.file)
 
     @staticmethod

src/azure/cli/extensions/__init__.py

@@ -1,8 +1,9 @@
 from ._event_dispatcher import EventDispatcher
 from .query import register as register_query
 from .transform import register as register_transform
+from .experimental import register as register_experimental
 
-EVENT_DISPATCHER = EventDispatcher()
+event_dispatcher = EventDispatcher()
 
-register_query(EVENT_DISPATCHER)
-register_transform(EVENT_DISPATCHER)
+register_query(event_dispatcher)
+register_transform(event_dispatcher)

src/azure/cli/extensions/query.py

@@ -5,12 +5,12 @@ def handle_query_parameter(_, event_data):
             query_index = args.index('--query')
             query_value = args[query_index + 1]
             del args[query_index:query_index + 1]
+        except ValueError:
+            pass
+        else:
             def filter_output(_, event_data):
                 import jmespath
                 event_data['result'] = jmespath.search(query_value, event_data['result'])
+
             event_dispatcher.register(event_dispatcher.FILTER_RESULT, filter_output)
-        except IndexError:
-            pass
-        except ValueError:
-            pass
     event_dispatcher.register(event_dispatcher.REGISTER_GLOBAL_PARAMETERS, handle_query_parameter)

src/azure/cli/main.py

@@ -5,7 +5,7 @@
 from ._logging import configure_logging, logger
 from ._session import Session
 from ._output import OutputProducer
-from azure.cli.extensions import EVENT_DISPATCHER
+from azure.cli.extensions import event_dispatcher
 
 # CONFIG provides external configuration options
 CONFIG = Session()
@@ -24,7 +24,7 @@ def main(args, file=sys.stdout): #pylint: disable=redefined-builtin
                                 'locale',
                                 CONFIG.get('locale', 'en-US')))
 
-    EVENT_DISPATCHER.raise_event(EVENT_DISPATCHER.REGISTER_GLOBAL_PARAMETERS,
+    event_dispatcher.raise_event(event_dispatcher.REGISTER_GLOBAL_PARAMETERS,
                                  event_data={'args': args})
     parser = ArgumentParser("az")
 

src/setup.py

@@ -65,6 +65,7 @@
 DEPENDENCIES = [
     'azure-mgmt==0.20.2',
     'azure-storage==0.20.3',
+    'jmespath==0.9.0',
 ]
 
 with open('README.rst', 'r', encoding='utf-8') as f:
@@ -84,6 +85,7 @@
     packages=[
         'azure.cli',
         'azure.cli.commands',
+        'azure.cli.extensions',
     ],
     install_requires=DEPENDENCIES,
 )