Merge e969126 into bcdd5aa

COPYRIGHT

@@ -1,5 +1,5 @@
 
- Copyright (c) 1999-2013, Juniper Networks Inc.
+ Copyright (c) 1999-2021, Juniper Networks Inc.
                2013, Jeremy Schulman
 
  All rights reserved.
@@ -18,10 +18,10 @@
    names of its contributors may be used to endorse or promote products
    derived from this software without specific prior written permission.
 
- THIS SOFTWARE IS PROVIDED BY <copyright holder> ''AS IS'' AND ANY
+ THIS SOFTWARE IS PROVIDED BY Juniper Networks Inc. ''AS IS'' AND ANY
  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+ DISCLAIMED. IN NO EVENT SHALL Juniper Networks Inc. BE LIABLE FOR ANY
  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

lib/jnpr/junos/factory/state_machine.py

@@ -1,4 +1,3 @@
-from collections import OrderedDict
 from functools import reduce
 import re
 import copy
@@ -8,6 +7,11 @@
 from transitions import Machine
 import pyparsing as pp
 
+try:
+    from collections.abc import OrderedDict
+except ImportError:
+    from collections import OrderedDict
+
 logger = logging.getLogger("jnpr.junos.factory.state_machine")