From e9af19d856d05a9dc05a876d9c5504e261ac0096 Mon Sep 17 00:00:00 2001 From: Vladislav Spector Date: Sat, 13 May 2023 12:51:02 +0300 Subject: [PATCH 1/2] Fixed the code in vladisla2000_sol branch --- StateCap.py | 26 ++++++++++---------------- strings.py | 21 ++++----------------- 2 files changed, 14 insertions(+), 33 deletions(-) diff --git a/StateCap.py b/StateCap.py index 73fcf7f..dc6c1e2 100644 --- a/StateCap.py +++ b/StateCap.py @@ -70,32 +70,29 @@ def capital_of_Idaho(): - # Your code here - pass + return STATES_CAPITALS['Idaho'] def all_states(): - # Your code here - pass + return list(STATES_CAPITALS.keys()) def all_capitals(): - # Your code here - pass + return list(STATES_CAPITALS.values()) def states_capitals_string(): - # Your code here - pass - - + return ', '.join(f'{state} -> {capital}' for state, capital in sorted(STATES_CAPITALS.items())) def get_state(capital): - pass - + states = [state for state, cap in STATES_CAPITALS.items() if cap == capital] + if not states: + raise KeyError("No state found for the given capital.") + if len(states) > 1: + raise ValueError("Multiple states have the same capital.") + return states[0] def test_state_to_capital(): assert 'Cheyenne' == STATES_CAPITALS['Wyoming'] - def test_state_to_capital_unknown(): with pytest.raises(KeyError): STATES_CAPITALS[''] @@ -104,15 +101,12 @@ def test_state_to_capital_unknown(): def test_capital_to_state(): assert 'Wyoming' == get_state('Cheyenne') - def test_capital_to_state_unknown(): with pytest.raises(KeyError): get_state('') - def main(): return pytest.main(__file__) - if __name__ == '__main__': sys.exit(main()) diff --git a/strings.py b/strings.py index 7915338..08e4015 100644 --- a/strings.py +++ b/strings.py @@ -1,26 +1,13 @@ -"""With this string: -'monty pythons flying circus' -Create a function that returns a sorted string with no duplicate characters -(keep any whitespace): -Example: ' cfghilmnoprstuy' -Create a function that returns the words in reverse order: -Example: ['circus', 'flying', 'pythons', 'monty'] -Create a function that returns a list of 4 character strings: -Example: ['mont', 'y py', 'thon', 's fl', 'ying', ' cir', 'cus'] -### git comment -""" -import pytest - def no_duplicates(a_string): - pass + return ''.join(sorted(set(a_string))) def reversed_words(a_string): - pass + return a_string.split()[::-1] def four_char_strings(a_string): - pass + return [a_string[i:i+4] for i in range(0, len(a_string), 4)] def test_no_duplicates(): @@ -44,4 +31,4 @@ def main(): if __name__ == '__main__': main() - + From 88680c4fc212b54c129e606d7d783eeb66437d0c Mon Sep 17 00:00:00 2001 From: Vladislav Spector Date: Sat, 13 May 2023 16:19:31 +0300 Subject: [PATCH 2/2] Fixed the code in vladisla2000_sol branch --- StateCap.py | 6 +++++- .../StateCap.cpython-310-pytest-6.2.5.pyc | Bin 0 -> 5113 bytes __pycache__/strings.cpython-310-pytest-6.2.5.pyc | Bin 0 -> 2292 bytes strings.py | 4 +++- 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 __pycache__/StateCap.cpython-310-pytest-6.2.5.pyc create mode 100644 __pycache__/strings.cpython-310-pytest-6.2.5.pyc diff --git a/StateCap.py b/StateCap.py index dc6c1e2..fcb627f 100644 --- a/StateCap.py +++ b/StateCap.py @@ -105,8 +105,12 @@ def test_capital_to_state_unknown(): with pytest.raises(KeyError): get_state('') +#def main(): +# return pytest.main(__file__) + def main(): - return pytest.main(__file__) + return pytest.main([__file__]) + if __name__ == '__main__': sys.exit(main()) diff --git a/__pycache__/StateCap.cpython-310-pytest-6.2.5.pyc b/__pycache__/StateCap.cpython-310-pytest-6.2.5.pyc new file mode 100644 index 0000000000000000000000000000000000000000..cc42cca5a8d5eb7366c483e017e7913df454e945 GIT binary patch literal 5113 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 Lo8zl&{^5TB*Z8{k literal 0 HcmV?d00001 diff --git a/__pycache__/strings.cpython-310-pytest-6.2.5.pyc b/__pycache__/strings.cpython-310-pytest-6.2.5.pyc new file mode 100644 index 0000000000000000000000000000000000000000..ffae37e6712054a3c75ebc1d08478834d946d56b GIT binary patch literal 2292 zcmb_dy>A;g6eoGS(^QS1&9ShQ1P4#g(T_Zp4)XI8)Gvwgodsa4XrVQ|wMZ11xfH5|B9lm}KrUQ~K0&?I z4Isae1{GAW=e{Pw(ezjFjo=5)H_*fN?s=D@C8)q0ZodwsN&4hbc>vq`v=8CFN?x!9 z@*Des!Df1d)>%CRX4uM_p~;y3R`v2`nkZe*TkY*BJQQ!ZPI^m?yd%TdgmJog>&CCB*&8v?GibI6BepQuGxcQqMOxeT0# zTtKYR{g#^1Wf-7A>d>{ zp*aI45J2UflWVO!)7@ITtM~Fu)f#CRKwYaRvffd>E46x~xtFA^EN@GtJKYgIVOv`x z+FM&%Zg+17s{GR_Q`@Q`w-%^n?AHSoln1q~Vs;}?7U71f5jPHqAz4Rq8_C8=HBu^; z+MaPQP&j!nm?$=tAAokT(qSacObBsKLm9Uv;v$lW7c7jxx_lV^na|I zx7J;#an`GM@!rihjf1g$2W*AI;;YFaypGM{Wu!asE_y{)f~^s}kA4_7k~9v(G0$2b zV||s|K=4Je6?KZ*F>b-FVHivs|8)Y}*qMc}IDDl@I7q`489$SWhV(s~GNscwX??SW y7vVcvpusu~bI3-{T6lIX)`7QcYW&SsE;?zvjn9WdjNT+Z^SS+9AAeq^{MEl6s~a)^ literal 0 HcmV?d00001 diff --git a/strings.py b/strings.py index 08e4015..88fd9c5 100644 --- a/strings.py +++ b/strings.py @@ -1,3 +1,5 @@ +import pytest + def no_duplicates(a_string): return ''.join(sorted(set(a_string))) @@ -26,7 +28,7 @@ def test_four_char_strings(): def main(): - return pytest.main(__file__) + return pytest.main([__file__]) if __name__ == '__main__':