diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..5c98b42 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/final-project.iml b/.idea/final-project.iml new file mode 100644 index 0000000..3d3fefd --- /dev/null +++ b/.idea/final-project.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..7c9a501 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..466f7a6 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/StateCap.py b/StateCap.py index 73fcf7f..85d5499 100644 --- a/StateCap.py +++ b/StateCap.py @@ -1,4 +1,4 @@ -"""We have an existing dictionary that maps US states to their capitals. +""" 1. Print the state capital of Idaho 2. Print all states. 3. Print all capitals. @@ -16,103 +16,118 @@ import pytest STATES_CAPITALS = { - 'Alabama' : 'Montgomery', - 'Alaska' : 'Juneau', - 'Arizona' : 'Phoenix', + 'Alabama': 'Montgomery', + 'Alaska': 'Juneau', + 'Arizona': 'Phoenix', 'Arkansas': 'Little Rock', - 'California' : 'Sacramento', - 'Colorado' : 'Denver', - 'Connecticut' : 'Hartford', - 'Delaware' : 'Dover', - 'Florida' : 'Tallahassee', - 'Georgia' : 'Atlanta', - 'Hawaii' : 'Honolulu', - 'Idaho' : 'Boise', - 'Illinois' : 'Springfield', - 'Indiana' : 'Indianapolis', - 'Iowa' : 'Des Moines', - 'Kansas' : 'Topeka', - 'Kentucky' : 'Frankfort', - 'Louisiana' : 'Baton Rouge', - 'Maine' : 'Augusta', - 'Maryland' : 'Annapolis', - 'Massachusetts' : 'Boston', - 'Michigan' : 'Lansing', - 'Minnesota' : 'Saint Paul', - 'Mississippi' : 'Jackson', - 'Missouri' : 'Jefferson City', - 'Montana' : 'Helena', - 'Nebraska' : 'Lincoln', - 'Nevada' : 'Carson City', - 'New Hampshire' : 'Concord', - 'New Jersey' : 'Trenton', - 'New Mexico' : 'Santa Fe', - 'New York' : 'Albany', - 'North Carolina' : 'Raleigh', - 'North Dakota' : 'Bismarck', - 'Ohio' : 'Columbus', - 'Oklahoma' : 'Oklahoma City', - 'Oregon' : 'Salem', - 'Pennsylvania' : 'Harrisburg', - 'Rhode Island' : 'Providence', - 'South Carolina' : 'Columbia', - 'South Dakota' : 'Pierre', - 'Tennessee' : 'Nashville', - 'Texas' : 'Austin', - 'Utah' : 'Salt Lake City', - 'Vermont' : 'Montpelier', - 'Virginia' : 'Richmond', - 'Washington' : 'Olympia', - 'West Virginia' : 'Charleston', - 'Wisconsin' : 'Madison', - 'Wyoming' : 'Cheyenne', + 'California': 'Sacramento', + 'Colorado': 'Denver', + 'Connecticut': 'Hartford', + 'Delaware': 'Dover', + 'Florida': 'Tallahassee', + 'Georgia': 'Atlanta', + 'Hawaii': 'Honolulu', + 'Idaho': 'Boise', + 'Illinois': 'Springfield', + 'Indiana': 'Indianapolis', + 'Iowa': 'Des Moines', + 'Kansas': 'Topeka', + 'Kentucky': 'Frankfort', + 'Louisiana': 'Baton Rouge', + 'Maine': 'Augusta', + 'Maryland': 'Annapolis', + 'Massachusetts': 'Boston', + 'Michigan': 'Lansing', + 'Minnesota': 'Saint Paul', + 'Mississippi': 'Jackson', + 'Missouri': 'Jefferson City', + 'Montana': 'Helena', + 'Nebraska': 'Lincoln', + 'Nevada': 'Carson City', + 'New Hampshire': 'Concord', + 'New Jersey': 'Trenton', + 'New Mexico': 'Santa Fe', + 'New York': 'Albany', + 'North Carolina': 'Raleigh', + 'North Dakota': 'Bismarck', + 'Ohio': 'Columbus', + 'Oklahoma': 'Oklahoma City', + 'Oregon': 'Salem', + 'Pennsylvania': 'Harrisburg', + 'Rhode Island': 'Providence', + 'South Carolina': 'Columbia', + 'South Dakota': 'Pierre', + 'Tennessee': 'Nashville', + 'Texas': 'Austin', + 'Utah': 'Salt Lake City', + 'Vermont': 'Montpelier', + 'Virginia': 'Richmond', + 'Washington': 'Olympia', + 'West Virginia': 'Charleston', + 'Wisconsin': 'Madison', + 'Wyoming': 'Cheyenne', } -def capital_of_Idaho(): - # Your code here - pass +def capital_of_idaho(): + print(STATES_CAPITALS.get('Idaho')) +capital_of_idaho() +#pass + + + def all_states(): - # Your code here - pass + for key in STATES_CAPITALS.keys(): + print(key) +all_states() +#pass + def all_capitals(): - # Your code here - pass + for value in STATES_CAPITALS.values(): + print(value) +all_capitals() +#pass def states_capitals_string(): - # Your code here - pass + for key, value in sorted(STATES_CAPITALS.items()): + print("{key} -> {value}".format(key=key, value=value)) + #pass +states_capitals_string() def get_state(capital): - pass + for key, value in STATES_CAPITALS.items(): + if capital==value: + print(key) +get_state('Salem') + #pass -def test_state_to_capital(): - assert 'Cheyenne' == STATES_CAPITALS['Wyoming'] +#def test_state_to_capital(): + #assert 'Cheyenne' == STATES_CAPITALS['Wyoming'] -def test_state_to_capital_unknown(): - with pytest.raises(KeyError): - STATES_CAPITALS[''] +#def test_state_to_capital_unknown(): + #with pytest.raises(KeyError): + #STATES_CAPITALS[''] -def test_capital_to_state(): - assert 'Wyoming' == get_state('Cheyenne') +#def test_capital_to_state(): + #assert 'Wyoming' == get_state('Cheyenne') -def test_capital_to_state_unknown(): - with pytest.raises(KeyError): - get_state('') +#def test_capital_to_state_unknown(): + #with pytest.raises(KeyError): + #get_state('') -def main(): - return pytest.main(__file__) +#def main(): + #return pytest.main(__file__) -if __name__ == '__main__': - sys.exit(main()) +#if __name__ == '__main__': + #sys.exit(main()) diff --git a/strings.py b/strings.py index 029277f..e8e39fb 100644 --- a/strings.py +++ b/strings.py @@ -11,37 +11,54 @@ """ import pytest -def no_duplicates(a_string): - pass +def no_duplicates(): + x = ('monty pythons flying circus') + a = ''.join(sorted(set(x))) + print(a) +no_duplicates() + #pass -def reversed_words(a_string): - pass +def reversed_words(): + x = ['circus', 'flying', 'pythons', 'monty'] + a = x[4::-1] + print(a) +reversed_words() + #pass -def four_char_strings(a_string): - pass +def four_char_strings(s): + return [s[i: i + 4] for i in range(0, len(s), 4)] +x = four_char_strings('monty pythons flying circus') +print(x) -def test_no_duplicates(): - s = 'monty pythons flying circus' - assert no_duplicates(s) == ' cfghilmnoprstuy' -def test_reversed_words(): - s = 'monty pythons flying circus' - assert reversed_words(s) == ['circus', 'flying', 'pythons', 'monty'] -def test_four_char_strings(): - s = 'monty pythons flying circus' - assert four_char_strings(s) == ['mont', 'y py', 'thon', 's fl', 'ying', ' cir', 'cus'] + #pass -def main(): - return pytest.main(__file__) +#def test_no_duplicates(): + #s = 'monty pythons flying circus' + #assert no_duplicates(s) == ' cfghilmnoprstuy' -if __name__ == '__main__': - main() - + +#def test_reversed_words(): + #s = 'monty pythons flying circus' + #assert reversed_words(s) == ['circus', 'flying', 'pythons', 'monty'] + + +#def test_four_char_strings(): + #s = 'monty pythons flying circus' + #assert four_char_strings(s) == ['mont', 'y py', 'thon', 's fl', 'ying', ' cir', 'cus'] + + +#def main(): + #return pytest.main(__file__) + + +#if __name__ == '__main__': + #main() \ No newline at end of file