Merge pull request #54 from PdxCodeGuild/jonpan-lab02-unit-converter

resubmitting lab02

Author: brucestull

code/jonpan/lab02.py

@@ -21,22 +21,23 @@
 #    'yard': 0.9144,
 #    'inch': 0.0254,
 # }
+
 # selectedunit = conversion[units]
 # result = selectedunit * int(distance)
 
-# print(f"\n{distance} ft is {result} m")
-
 ## VERSION 4 BELOW
 
 distance = input("\nWhat is the distance? ") 
-input_units = input("\nWhat are the input units? Your choices are feet, miles, meters, or km. ")
-output_units = input("\nWhat are the output units? Your choices are feet, miles, meters, or km. ")
+input_units = input("\nWhat are the input units? Your choices are feet, miles, meters, km, yard, or inch. ")
+output_units = input("\nWhat are the output units? Your choices are feet, miles, meters, km, yard, or inch. ")
 
 conversion = {
     'feet': 0.3048,
     'miles': 1609.34,
     'meters': 1,
     'km': 1000,
+    'yard': 0.9144,
+    'inch': 0.0254,
 }
 
 inputresults = conversion[input_units]