Merge branch 'master' of https://github.com/Richienb/ROS-Code into HEAD

Author: Richienb

api/rospyapi.py

@@ -2,4 +2,4 @@
 
 
 def compilefile(filepath):
-    system("run-file.py " + str(filepath))
+    system("run-file.py " + str(filepath), shell=False)

ci/commitpush.sh

@@ -14,7 +14,7 @@ then
     then
 
         # Tell the user how many files were provided to stage
-        echo "$(expr $# - 1) files were provided to stage."
+        echo "$(($#-1)) files were provided to stage."
 
         # For every argument after the first argument
         for i in "${@:2}"
@@ -59,7 +59,7 @@ then
     else
 
         # Inform the user on the status
-        echo "Using "$1" as the commit message."
+        echo "Using $1 as the commit message."
 
         # Check and commit
         git commit -m "$1"

ci/getversion.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 # Return the output
-echo $(sed -r -e 1d -e 's/.{17}//' -ep -eq .bumpversion.cfg)
+sed -r -e 1d -e 's/.{17}//' -ep -eq .bumpversion.cfg

min/ros/maths.py

@@ -259,7 +259,7 @@ def convertbase(number,base=10):
  return('' if sign==1 else '-')+res[::-1]
 def isnum(value):
  try:
-  return bool(isinstance(value,int)or isinstance(value,float))
+  return bool(isinstance(value,(float,int)))
  except BaseException:
   return False
 def quadrant(xcoord,ycoord):
@@ -307,5 +307,5 @@ def hcf(num1,num2):
   if((num1%i==0)and(num2%i==0)):
    return i
 def pythrule(first,second):
- return(a*b)/2
+ return(first*second)/2
 # Created by pyminifier (https://github.com/liftoff/pyminifier)

min/ros/secure.py

@@ -1,3 +1,6 @@
+"""
+Secure functions.
+"""
 def randstring(length=1):
  charstouse=string.ascii_letters+string.digits+string.punctuation
  newpass=''

min/ros/string.py

@@ -16,4 +16,13 @@ def randomstr(valuelist):
   return random.choice(valuelist)
  except IndexError:
   raise RuntimeError('An Error Has Occured: List Not Specified (0018)')
+def case(text,format='sentence'):
+ if format=='uppercase':
+  return str(text.upper())
+ elif format=='lowercase':
+  return str(text.lower())
+ elif format=='sentence':
+  return str(text[0].upper())+str(text[1:])
+ elif format=='caterpillar':
+  return str(text.lower().replace(" ","_"))
 # Created by pyminifier (https://github.com/liftoff/pyminifier)

src/ros/maths.py

@@ -447,7 +447,7 @@ def isnum(value):
     """
 
     try:
-        return bool(isinstance(value, int) or isinstance(value, float))
+        return bool(isinstance(value, (float, int)))
     except BaseException:
         return False
 
@@ -568,4 +568,4 @@ def pythrule(first, second):
 
     """
 
-    return (a * b) / 2
+    return (first * second) / 2

src/ros/secure.py

@@ -4,6 +4,7 @@
 
 """
 
+
 def randstring(length=1):
     """