swap scale for period, simplify isinstance checks, update version number

Author: Ted

src/mplfinance/_arg_validators.py

@@ -110,23 +110,21 @@ def _mav_validator(mav_value):
     '''
     if isinstance(mav_value,int) and mav_value > 1:
         return True
-    elif not isinstance(mav_value,tuple) and not isinstance(mav_value,list) and not isinstance(mav_value,dict):
+    elif not isinstance(mav_value,(tuple,list,dict)):
         return False
 
     if isinstance(mav_value,dict):
-        if 'scale' not in mav_value or not (isinstance(mav_value['scale'],tuple) or\
-                isinstance(mav_value['scale'],int) or isinstance(mav_value['scale'], list)):
+        if 'period' not in mav_value or not isinstance(mav_value['period'],(tuple,list,dict)):
             return False
         if 'shift' in mav_value:
-            if not (isinstance(mav_value['shift'],tuple) or isinstance(mav_value['shift'],int) or\
-                    isinstance(mav_value['shift'], list)):
+            if not isinstance(mav_value['shift'],(tuple,list,dict)):
                 return False
-            if isinstance(mav_value['scale'], int) and isinstance(mav_value['shift'], int):
+            if isinstance(mav_value['period'], int) and isinstance(mav_value['shift'], int):
                 return True
-            elif isinstance(mav_value['scale'], int) or isinstance(mav_value['shift'], int):
+            elif isinstance(mav_value['period'], int) or isinstance(mav_value['shift'], int):
                 return False
-            if len(mav_value['scale']) == len(mav_value['shift']):
-                for num in mav_value['scale']:
+            if len(mav_value['period']) == len(mav_value['shift']):
+                for num in mav_value['period']:
                     if not isinstance(num, int) and num > 1:
                         return False
                 for num in mav_value['shift']:

src/mplfinance/plotting.py

@@ -981,7 +981,7 @@ def _plot_mav(ax,config,xdates,prices,apmav=None,apwidth=None):
         shift = None
         if isinstance(mavgs,dict):
             shift = mavgs['shift']
-            mavgs = mavgs['scale']
+            mavgs = mavgs['period']
         if isinstance(mavgs,int):
             mavgs = mavgs,      # convert to tuple
         if len(mavgs) > 7:

tests/test_addplot.py

@@ -362,7 +362,7 @@ def test_addplot12(bolldata):
     tname = os.path.join(tdir,fname)
     rname = os.path.join(refd,fname)
 
-    mpf.plot(df,type='candle',volume=True,savefig=tname,mav={'scale':(20,40,60), 'shift': [5,10,20]})
+    mpf.plot(df,type='candle',volume=True,savefig=tname,mav={'period':(20,40,60), 'shift': [5,10,20]})
 
     tsize = os.path.getsize(tname)
     print(glob.glob(tname),'[',tsize,'bytes',']')