Merge pull request #13 from aviiciii:update

Update from Mickey

Author: aviiciii

pset1/extensions.py

@@ -1,20 +1,14 @@
-filename=input ('File: ').lower().strip()
+types = {
+    "gif": "image/gif",
+    "jpg": "image/jpeg",
+    "jpeg": "image/jpeg",
+    "png": "image/png",
+    "pdf": "application/pdf",
+    "txt": "text/plain",
+    "zip": "application/zip",
+    "mp4": "video/mp4",
+    "csv": "text/csv",
+}
 
-dot=filename.rfind('.')
-
-filetype=filename[dot:]
-
-if filetype == '.jpg' or filetype == '.jpeg':
-    print('image/jpeg')
-elif filetype == '.gif':
-    print('image/gif')
-elif filetype == '.png':
-    print('image/png')
-elif filetype == '.pdf':
-    print('application/pdf')
-elif filetype == '.txt':
-    print('text/plain')
-elif filetype == '.zip':
-    print('application/zip')
-else :
-    print('application/octet-stream')
+s = input("File name: ").strip().lower().split(".")[-1]
+print(types.get(s, "application/octet-stream"))

pset3/outdated.py

@@ -38,7 +38,8 @@
             break
     except:
         pass
-elif date_type == 1:
+
+if date_type == 1:
     month_no = str(month.index(date[0])+1)
     print(date[2].zfill(4), month_no.zfill(2), date[1].zfill(2), sep='-')
 

pset5/bank/test_bank.py

@@ -14,6 +14,7 @@ def test_h():
 def test_noH():
     assert value('whats up, buddy') == 100
     assert value('what the he!@') == 100
+    assert value('what the eff') == 100
 
 def test_capital():
     assert value('HELLO') == 0

pset5/fuel/test_fuel.py

@@ -5,6 +5,7 @@ def test_input():
     assert convert('1/2') == 50
     assert convert('1/1') == 100
     assert convert('0/10') == 0
+    assert convert('1/4') == 25
 
 def test_errors():
     with pytest.raises(ZeroDivisionError):

pset5/twttr/test_twttr.py

@@ -4,6 +4,7 @@ def test_nonAlpha():
     assert shorten('$twenty-five') == '$twnty-fv'
     assert shorten('25 dollars') == '25 dllrs'
     assert shorten('$25.00') == '$25.00'
+    assert shorten('twenty dollars') == 'twnty dllrs'
 
 def test_consonants():
     assert shorten('tstst') == 'tstst'