diff --git a/source/class_schedule/index.rst b/source/class_schedule/index.rst
index b2225b92..eba0d9de 100644
--- a/source/class_schedule/index.rst
+++ b/source/class_schedule/index.rst
@@ -19,16 +19,16 @@ First Quarter: Introduction to Python
.. toctree::
:maxdepth: 1
- session_1_01
- session_1_02
- session_1_03
- session_1_04
- session_1_05
- session_1_06
- session_1_07
- session_1_08
- session_1_09
- session_1_10
+ lesson_1_01
+ lesson_1_02
+ lesson_1_03
+ lesson_1_04
+ lesson_1_05
+ lesson_1_06
+ lesson_1_07
+ lesson_1_08
+ lesson_1_09
+ lesson_1_10
Second Quarter: Advanced Programming in Python
==============================================
@@ -36,13 +36,13 @@ Second Quarter: Advanced Programming in Python
.. toctree::
:maxdepth: 1
- session_2_01
- session_2_02
- session_2_03
- session_2_04
- session_2_05
- session_2_06
- session_2_07
- session_2_08
- session_2_09
- session_2_10
+ lesson_2_01
+ lesson_2_02
+ lesson_2_03
+ lesson_2_04
+ lesson_2_05
+ lesson_2_06
+ lesson_2_07
+ lesson_2_08
+ lesson_2_09
+ lesson_2_10
diff --git a/source/class_schedule/session_1_01.rst b/source/class_schedule/session_1_01.rst
index 85598b2e..62965322 100644
--- a/source/class_schedule/session_1_01.rst
+++ b/source/class_schedule/session_1_01.rst
@@ -1,7 +1,7 @@
-.. _session_1_01:
+.. _lesson_1_01:
########################################
-Session 1: Intro to the class and Python
+Lesson 1: Intro to the class and Python
########################################
**Intro to the class and Python**
@@ -58,5 +58,5 @@ Finish the Python Pushups exercises: :ref:`python_pushups`
Finish getting your environment set up.
-Do the prep for next class: :ref:`session_1_02`
+Do the prep for next class: :ref:`lesson_1_02`
diff --git a/source/class_schedule/session_1_02.rst b/source/class_schedule/session_1_02.rst
index fb19afad..167a9014 100644
--- a/source/class_schedule/session_1_02.rst
+++ b/source/class_schedule/session_1_02.rst
@@ -1,7 +1,7 @@
-.. _session_1_02:
+.. _lesson_1_02:
#####################################
-Session 2: Basic Python and Functions
+Lesson 2: Basic Python and Functions
#####################################
**Basic Python and Functions**
@@ -97,7 +97,7 @@ Post-class Activities
Finish the Exercises
-Look at the next session for reading, etc:
+Look at the next lesson for reading, etc:
-:ref:`session_1_03`
+:ref:`lesson_1_03`
diff --git a/source/class_schedule/session_1_03.rst b/source/class_schedule/session_1_03.rst
index 3b6d9bce..ad9d1755 100644
--- a/source/class_schedule/session_1_03.rst
+++ b/source/class_schedule/session_1_03.rst
@@ -1,7 +1,7 @@
-.. _session_1_03:
+.. _lesson_1_03:
######################################################
-Session 3: Booleans, Sequences, Iteration, and Strings
+Lesson 3: Booleans, Sequences, Iteration, and Strings
######################################################
**Booleans, Sequences, Iteration, and Strings**
@@ -78,6 +78,6 @@ Finish the mailroom project.
And the other exercises
-Look at the next session for reading, etc:
+Look at the next lesson for reading, etc:
-:ref:`session_1_04`
+:ref:`lesson_1_04`
diff --git a/source/class_schedule/session_1_04.rst b/source/class_schedule/session_1_04.rst
index 0f07b0e7..e724da9b 100644
--- a/source/class_schedule/session_1_04.rst
+++ b/source/class_schedule/session_1_04.rst
@@ -1,7 +1,7 @@
-.. _session_1_04:
+.. _lesson_1_04:
################################################
-Session 4: Dictionaries, Sets, and File Handling
+Lesson 4: Dictionaries, Sets, and File Handling
################################################
Dictionaries, Sets, and File Handling
@@ -30,7 +30,7 @@ http://www.diveintopython3.net/native-datatypes.html#dictionaries
In-class Activities
===================
- * Review last sessions labs:
+ * Review last lessons labs:
- slicing
- string formatting
@@ -59,6 +59,6 @@ Post-class Activities
Finish the exercises
-Look at the next session for reading, etc:
+Look at the next lesson for reading, etc:
-:ref:`session_1_05`
+:ref:`lesson_1_05`
diff --git a/source/class_schedule/session_1_05.rst b/source/class_schedule/session_1_05.rst
index c4171b8a..bce3fdfd 100644
--- a/source/class_schedule/session_1_05.rst
+++ b/source/class_schedule/session_1_05.rst
@@ -1,7 +1,7 @@
-.. _session_1_05:
+.. _lesson_1_05:
########################################
-Session 5: Exceptions and Comprehensions
+Lesson 5: Exceptions and Comprehensions
########################################
Exceptions and Comprehensions
@@ -50,9 +50,9 @@ Finish the exercises
- here's a good overview: https://pymotw.com/3/collections/
-Look at the next session for reading, etc:
+Look at the next lesson for reading, etc:
-:ref:`session_1_06`
+:ref:`lesson_1_06`
diff --git a/source/class_schedule/session_1_06.rst b/source/class_schedule/session_1_06.rst
index 5d6a037a..883cb09d 100644
--- a/source/class_schedule/session_1_06.rst
+++ b/source/class_schedule/session_1_06.rst
@@ -1,7 +1,7 @@
-.. _session_1_06:
+.. _lesson_1_06:
################################################
-Session 6: Testing and Advanced Argument Passing
+Lesson 6: Testing and Advanced Argument Passing
################################################
Unit Testing and Advanced Argument Passing
@@ -68,9 +68,9 @@ Post-class Activities
Finish the exercises
-Look at the next session for reading, etc:
+Look at the next lesson for reading, etc:
-:ref:`session_1_07`
+:ref:`lesson_1_07`
NOTE: there is not a lot of new stuff this week, but this will give all of you a chance to catch up if you don't have mailroom and trigrams fully working yet.
diff --git a/source/class_schedule/session_1_07.rst b/source/class_schedule/session_1_07.rst
index 70d5d249..c08eb68f 100644
--- a/source/class_schedule/session_1_07.rst
+++ b/source/class_schedule/session_1_07.rst
@@ -1,7 +1,7 @@
-.. _session_1_07:
+.. _lesson_1_07:
#####################################
-Session 7: Object Oriented Programing
+Lesson 7: Object Oriented Programing
#####################################
Object Oriented Programing: classes, instance and class attributes, subclassing and inheritance.
@@ -84,7 +84,7 @@ Post-class Activities
Finish the HTML render Exercise through step 3.
-Look at the next session for reading, etc:
+Look at the next lesson for reading, etc:
-:ref:`session_1_08`
+:ref:`lesson_1_08`
diff --git a/source/class_schedule/session_1_08.rst b/source/class_schedule/session_1_08.rst
index 0c8e3663..35d3679f 100644
--- a/source/class_schedule/session_1_08.rst
+++ b/source/class_schedule/session_1_08.rst
@@ -1,7 +1,7 @@
-.. _session_1_08:
+.. _lesson_1_08:
#######################################
-Session 8: Properties and Magic methods
+Lesson 8: Properties and Magic methods
#######################################
More OO: Properties and Magic methods.
@@ -54,6 +54,6 @@ Post-class Activities
Finish the exercises
-Look at the next session for reading, etc:
+Look at the next lesson for reading, etc:
-:ref:`session_1_09`
+:ref:`lesson_1_09`
diff --git a/source/class_schedule/session_1_09.rst b/source/class_schedule/session_1_09.rst
index 119211d7..14ec1678 100644
--- a/source/class_schedule/session_1_09.rst
+++ b/source/class_schedule/session_1_09.rst
@@ -1,7 +1,7 @@
-.. _session_1_09:
+.. _lesson_1_09:
#########################################################
-Session 9: Static and class methods: multiple inheritance
+Lesson 9: Static and class methods: multiple inheritance
#########################################################
@@ -55,9 +55,9 @@ Post-class Activities
Finish the exercises
-Look at the next session for reading, etc:
+Look at the next lesson for reading, etc:
-:ref:`session_1_10`
+:ref:`lesson_1_10`
diff --git a/source/class_schedule/session_1_10.rst b/source/class_schedule/session_1_10.rst
index c211af11..b4c50da5 100644
--- a/source/class_schedule/session_1_10.rst
+++ b/source/class_schedule/session_1_10.rst
@@ -1,7 +1,7 @@
-.. _session_1_10:
+.. _lesson_1_10:
###########################################################################
-Session 10: Intro to Functional Programming: lambda and Map, Filter, Reduce
+Lesson 10: Intro to Functional Programming: lambda and Map, Filter, Reduce
###########################################################################
Functional Programming
diff --git a/source/class_schedule/session_2_01.rst b/source/class_schedule/session_2_01.rst
index b6964f54..5c1dbd9f 100644
--- a/source/class_schedule/session_2_01.rst
+++ b/source/class_schedule/session_2_01.rst
@@ -1,7 +1,7 @@
-.. _session_2_01:
+.. _lesson_2_01:
##############################################
-Session 1: Iterators and Generators, Packaging
+Lesson 1: Iterators and Generators, Packaging
##############################################
diff --git a/source/class_schedule/session_2_02.rst b/source/class_schedule/session_2_02.rst
index 7603dd5e..2a833972 100644
--- a/source/class_schedule/session_2_02.rst
+++ b/source/class_schedule/session_2_02.rst
@@ -1,7 +1,7 @@
-.. _session_2_02:
+.. _lesson_2_02:
############################################
-Session 2: Closures, Currying and Decorators
+Lesson 2: Closures, Currying and Decorators
############################################
* Closures
diff --git a/source/class_schedule/session_2_03.rst b/source/class_schedule/session_2_03.rst
index c892142e..ce01e984 100644
--- a/source/class_schedule/session_2_03.rst
+++ b/source/class_schedule/session_2_03.rst
@@ -1,7 +1,7 @@
-.. _session_2_03:
+.. _lesson_2_03:
####################################################
-Session 3: Context Managers, Itertools and functools
+Lesson 3: Context Managers, Itertools and functools
####################################################
Reading
diff --git a/source/class_schedule/session_2_04.rst b/source/class_schedule/session_2_04.rst
index 13d5e3a0..22ed3a34 100644
--- a/source/class_schedule/session_2_04.rst
+++ b/source/class_schedule/session_2_04.rst
@@ -1,7 +1,7 @@
-.. _session_2_04:
+.. _lesson_2_04:
###########################
-Session 4: Advanced Testing
+Lesson 4: Advanced Testing
###########################
* Linting
diff --git a/source/class_schedule/session_2_05.rst b/source/class_schedule/session_2_05.rst
index 74de6923..9a93068f 100644
--- a/source/class_schedule/session_2_05.rst
+++ b/source/class_schedule/session_2_05.rst
@@ -1,7 +1,7 @@
-.. _session_2_05:
+.. _lesson_2_05:
################################
-Session 5: Logging and Debugging
+Lesson 5: Logging and Debugging
################################
* Logging module
diff --git a/source/class_schedule/session_2_06.rst b/source/class_schedule/session_2_06.rst
index 2e1ff992..1fdc4af2 100644
--- a/source/class_schedule/session_2_06.rst
+++ b/source/class_schedule/session_2_06.rst
@@ -1,7 +1,7 @@
-.. _session_2_06:
+.. _lesson_2_06:
##########################
-Session 6: Metaprogramming
+Lesson 6: Metaprogramming
##########################
* Metprogramming tools
diff --git a/source/class_schedule/session_2_07.rst b/source/class_schedule/session_2_07.rst
index a33eecd9..c71be6be 100644
--- a/source/class_schedule/session_2_07.rst
+++ b/source/class_schedule/session_2_07.rst
@@ -1,7 +1,7 @@
-.. _session_2_07:
+.. _lesson_2_07:
###############################
-Session 7: Relational Databases
+Lesson 7: Relational Databases
###############################
* SQL
diff --git a/source/class_schedule/session_2_08.rst b/source/class_schedule/session_2_08.rst
index 623402ec..8d95b790 100644
--- a/source/class_schedule/session_2_08.rst
+++ b/source/class_schedule/session_2_08.rst
@@ -1,7 +1,7 @@
-.. _session_2_08:
+.. _lesson_2_08:
#########################################################
-Session 8: Object/Document, Key/Value and Graph Databases
+Lesson 8: Object/Document, Key/Value and Graph Databases
#########################################################
* Persistence and Serialization: pickle, json, csv, ...
diff --git a/source/class_schedule/session_2_09.rst b/source/class_schedule/session_2_09.rst
index 91095a39..e4c2d63a 100644
--- a/source/class_schedule/session_2_09.rst
+++ b/source/class_schedule/session_2_09.rst
@@ -1,7 +1,7 @@
-.. _session_2_09:
+.. _lesson_2_09:
##########################################
-Session 9: Concurrency & Async Programming
+Lesson 9: Concurrency & Async Programming
##########################################
* Concurrency
diff --git a/source/class_schedule/session_2_10.rst b/source/class_schedule/session_2_10.rst
index e0d73b93..07ad2bfa 100644
--- a/source/class_schedule/session_2_10.rst
+++ b/source/class_schedule/session_2_10.rst
@@ -1,7 +1,7 @@
-.. _session_2_10:
+.. _lesson_2_10:
##########################################
-Session 10: Profiling & Performance
+Lesson 10: Profiling & Performance
##########################################
* Timing
diff --git a/source/examples/async/nba_stats_async.py b/source/examples/async/nba_stats_async.py
index 78aacf89..a1c31ceb 100644
--- a/source/examples/async/nba_stats_async.py
+++ b/source/examples/async/nba_stats_async.py
@@ -56,9 +56,9 @@
# params = {'leagueid': '00', 'season': '2016-17', 'isonlycurrentseason': '1'}
# url = base_url + endpoint
# print('Getting all players...')
-# async with aiohttp.ClientSession() as session:
-# print("got the session")
-# async with session.get(url, headers=HEADERS, params=params) as resp:
+# async with aiohttp.ClientSession() as lesson:
+# print("got the lesson")
+# async with lesson.get(url, headers=HEADERS, params=params) as resp:
# print("got the response")
# data = await resp.json()
# players.append([(item[0], item[2]) for item in data['resultSets'][0]['rowSet']])
@@ -91,9 +91,9 @@ async def get_player(player_id, player_name):
params = {'playerid': player_id}
url = base_url + endpoint
print("Getting player", player_name)
- async with aiohttp.ClientSession() as session:
- print("session created")
- async with session.get(url,
+ async with aiohttp.ClientSession() as lesson:
+ print("lesson created")
+ async with lesson.get(url,
skip_auto_headers=["User-Agent"],
headers=HEADERS,
params=params) as resp:
diff --git a/source/exercises/html_renderer.rst b/source/exercises/html_renderer.rst
index 8175b30b..f8786306 100644
--- a/source/exercises/html_renderer.rst
+++ b/source/exercises/html_renderer.rst
@@ -275,7 +275,7 @@ Create a ``OneLineTag`` subclass of ``Element``:
* It should override the render method, to render everything on one line -- for the simple tags, like::
- PythonClass - Session 6 example
+ PythonClass - Lesson 6 example
Create a ``Title`` subclass of ``OneLineTag`` class for the title.
diff --git a/source/exercises/html_renderer_tutorial.rst b/source/exercises/html_renderer_tutorial.rst
index c75f0c7e..6d35b4f2 100644
--- a/source/exercises/html_renderer_tutorial.rst
+++ b/source/exercises/html_renderer_tutorial.rst
@@ -22,7 +22,7 @@ You should now be in a terminal with the current working directory set to where
.. code-block:: bash
$ pytest
- ============================= test session starts ==============================
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.7.0, pytest-3.7.1, py-1.5.4, pluggy-0.7.1
rootdir: /Users/Chris/Junk/lesson07, inifile:
collected 3 items
@@ -196,7 +196,7 @@ First let's add the contents, adding a newline in between to keep it readable.
And run the tests::
$ pytest
- ============================= test session starts ==============================
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.7.0, pytest-3.7.1, py-1.5.4, pluggy-0.7.1
rootdir: /Users/Chris/Junk/lesson07, inifile:
collected 3 items
@@ -271,7 +271,7 @@ So the method looks something like this:
Now run the tests again::
$ pytest
- ============================= test session starts ==============================
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.7.0, pytest-3.7.1, py-1.5.4, pluggy-0.7.1
rootdir: /Users/Chris/Junk/lesson07, inifile:
collected 3 items
@@ -390,7 +390,7 @@ We have tested to see that we could initialize with one piece of content, and th
This is what I got with my code::
$ pytest
- ============================= test session starts ==============================
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.7.0, pytest-3.7.1, py-1.5.4, pluggy-0.7.1
rootdir: /Users/Chris/Junk/lesson07, inifile:
collected 4 items
@@ -514,7 +514,7 @@ The ```` tag is for the entire contents of an html page, and the ```` t
Before we do that -- let's do some test-driven development. Uncomment the next few tests in ``test_html_render.py``: ``test_html``, ``test_body``, and ``test_p``, and run the tests::
$ pytest
- ============================= test session starts ==============================
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.7.0, pytest-3.7.1, py-1.5.4, pluggy-0.7.1
rootdir: /Users/Chris/Junk/lesson07, inifile:
collected 7 items
@@ -576,7 +576,7 @@ The end result is that we now have a class that is exactly the same as the ``Ele
Let's run the tests and see if this worked::
$ pytest
- ============================= test session starts ==============================
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.7.0, pytest-3.7.1, py-1.5.4, pluggy-0.7.1
rootdir: /Users/Chris/Junk/lesson07, inifile:
collected 7 items
@@ -629,7 +629,7 @@ Let's take this bit by bit -- first with a test or two.
Uncomment ``test_subelement`` in the test file, and run the tests::
$ pytest
- ============================= test session starts ==============================
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.7.0, pytest-3.7.1, py-1.5.4, pluggy-0.7.1
rootdir: /Users/Chris/Junk/lesson07, inifile:
collected 8 items
@@ -715,7 +715,7 @@ So let's update our render by replacing that ``out_file.write()`` call with a ca
And let's see what happens when we run the tests::
$ pytest
- ============================= test session starts ==============================
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.7.0, pytest-3.7.1, py-1.5.4, pluggy-0.7.1
rootdir: /Users/Chris/Junk/lesson07, inifile:
collected 8 items
@@ -793,7 +793,7 @@ We tried to call the render() method of a piece of content, but got an ``Attribu
And run the tests again::
$ pytest
- ============================= test session starts ==============================
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.7.0, pytest-3.7.1, py-1.5.4, pluggy-0.7.1
rootdir: /Users/Chris/Junk/lesson07, inifile:
collected 8 items
@@ -837,7 +837,7 @@ OK, that should have been straightforward. Now this part:
* It should override the render method, to render everything on one line -- for the simple tags, like::
-
PythonClass - Session 6 example
+ PythonClass - Lesson 6 example
Some html elements don't tend to have a lot of content, such as the document title. So it makes sense to render them all on one line. This is going to require a new render method. Since there are multiple types of elements that should be rendered on one line, we want to create a base class for all one-line elements. It should subclass from ``Element``, and override the render method with a new one, which will be pretty much the same as the main ``Element`` method, but without the newlines.
@@ -903,7 +903,7 @@ You can run the tests now if you like -- it will fail due to there being no Titl
The ``pass`` means "do nothing." But it is required to satisfy Python. There needs to be *something* in the class definition. So in this case, we have a ``OneLineTag`` class that is exactly the same as the ``Element`` class, and a ``Title`` class that is the same except for the tag. Time to test again::
$ pytest
- ============================= test session starts ==============================
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.7.0, pytest-3.7.1, py-1.5.4, pluggy-0.7.1
rootdir: /Users/Chris/Junk/lesson07, inifile:
collected 10 items
@@ -973,7 +973,7 @@ So how do we get this test to pass? We need a new render method for ``OneLineTag
Notice that I left the newline in at the end of the closing tag -- we do want a newline there, so the next element won't get rendered on the same line. And the tests::
$ pytest
- ============================= test session starts ==============================
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.7.0, pytest-3.7.1, py-1.5.4, pluggy-0.7.1
rootdir: /Users/Chris/Junk/lesson07, inifile:
collected 10 items
diff --git a/source/exercises/sherlock.txt b/source/exercises/sherlock.txt
index 4dec2015..3fafb96d 100644
--- a/source/exercises/sherlock.txt
+++ b/source/exercises/sherlock.txt
@@ -3982,7 +3982,7 @@ the name of his murderer. So and so, of Ballarat."
"It is wonderful!" I exclaimed.
"It is obvious. And now, you see, I had narrowed the field down
-considerably. The possession of a grey garment was a third point
+considerably. The poslesson of a grey garment was a third point
which, granting the son's statement to be correct, was a
certainty. We have come now out of mere vagueness to the definite
conception of an Australian from Ballarat with a grey cloak."
@@ -4499,7 +4499,7 @@ so that the jury, having regard to his known eccentricity,
brought in a verdict of 'suicide.' But I, who knew how he winced
from the very thought of death, had much ado to persuade myself
that he had gone out of his way to meet it. The matter passed,
-however, and my father entered into possession of the estate, and
+however, and my father entered into poslesson of the estate, and
of some 14,000 pounds, which lay to his credit at the bank."
"One moment," Holmes interposed, "your statement is, I foresee,
@@ -4797,7 +4797,7 @@ which have baffled all those who have sought a solution by the
aid of their senses. To carry the art, however, to its highest
pitch, it is necessary that the reasoner should be able to
utilise all the facts which have come to his knowledge; and this
-in itself implies, as you will readily see, a possession of all
+in itself implies, as you will readily see, a poslesson of all
knowledge, which, even in these days of free education and
encyclopaedias, is a somewhat rare accomplishment. It is not so
impossible, however, that a man should possess all knowledge
@@ -6150,7 +6150,7 @@ low den in which I used to lodge in Swandam Lane, where I could
every morning emerge as a squalid beggar and in the evenings
transform myself into a well-dressed man about town. This fellow,
a Lascar, was well paid by me for his rooms, so that I knew that
-my secret was safe in his possession.
+my secret was safe in his poslesson.
"Well, very soon I found that I was saving considerable sums of
money. I do not mean that any beggar in the streets of London
@@ -6302,7 +6302,7 @@ seeing an official-looking person in uniform rushing towards him,
dropped his goose, took to his heels, and vanished amid the
labyrinth of small streets which lie at the back of Tottenham
Court Road. The roughs had also fled at the appearance of
-Peterson, so that he was left in possession of the field of
+Peterson, so that he was left in poslesson of the field of
battle, and also of the spoils of victory in the shape of this
battered hat and a most unimpeachable Christmas goose."
@@ -10362,7 +10362,7 @@ of a man in a pew, of the change in the bride's manner, of so
transparent a device for obtaining a note as the dropping of a
bouquet, of her resort to her confidential maid, and of her very
significant allusion to claim-jumping--which in miners' parlance
-means taking possession of that which another person has a prior
+means taking poslesson of that which another person has a prior
claim to--the whole situation became absolutely clear. She had
gone off with a man, and the man was either a lover or was a
previous husband--the chances being in favour of the latter."
@@ -10558,7 +10558,7 @@ should be taken.'
square, black morocco case which he had laid beside his chair.
'You have doubtless heard of the Beryl Coronet?'
-"'One of the most precious public possessions of the empire,'
+"'One of the most precious public poslessons of the empire,'
said I.
"'Precisely.' He opened the case, and there, imbedded in soft,
@@ -10601,7 +10601,7 @@ pound notes. When I was alone once more, however, with the
precious case lying upon the table in front of me, I could not
but think with some misgivings of the immense responsibility
which it entailed upon me. There could be no doubt that, as it
-was a national possession, a horrible scandal would ensue if any
+was a national poslesson, a horrible scandal would ensue if any
misfortune should occur to it. I already regretted having ever
consented to take charge of it. However, it was too late to alter
the matter now, so I locked it up in my private safe and turned
@@ -12742,7 +12742,7 @@ electronic work, you indicate that you have read, understand, agree to
and accept all the terms of this license and intellectual property
(trademark/copyright) agreement. If you do not agree to abide by all
the terms of this agreement, you must cease using and return or destroy
-all copies of Project Gutenberg-tm electronic works in your possession.
+all copies of Project Gutenberg-tm electronic works in your poslesson.
If you paid a fee for obtaining a copy of or access to a Project
Gutenberg-tm electronic work and you do not agree to be bound by the
terms of this agreement, you may obtain a refund from the person or
diff --git a/source/lesson_templates/outline.rst b/source/lesson_templates/outline.rst
index 991cee64..06311925 100644
--- a/source/lesson_templates/outline.rst
+++ b/source/lesson_templates/outline.rst
@@ -22,14 +22,14 @@ Development environment setup and configuration.
Py 1: Intro to Python
#####################
-Session 1-01
+Lesson 1-01
============
1. Python Overview: What is Python and what are its major features?
2. Python Language Primitives: data types, basic flow control.
3. Introduction to source control: Basic git.
-Session 1-02
+Lesson 1-02
============
Organizing your Programs
@@ -40,7 +40,7 @@ Organizing your Programs
4. Functions
5. Modules and Namespaces
-Session 1-03
+Lesson 1-03
============
Sequences, Slicing and Iteration
@@ -51,7 +51,7 @@ Sequences, Slicing and Iteration
4. String methods
5. String formatting
-Session 1-04
+Lesson 1-04
============
Collections and I/O
@@ -60,7 +60,7 @@ Collections and I/O
2. Sets
3. Files (probably a good place to introduce context managers from a client perspective, but not a server perspective if you know what I mean)
-Session 1-05
+Lesson 1-05
============
1. Exceptions
@@ -68,7 +68,7 @@ Session 1-05
3. Advanced Argument Passing
4. Functions as first class language constructs: passing functions to functions
-Session 1-06
+Lesson 1-06
============
Intro to Object Oriented Programming
@@ -79,7 +79,7 @@ Intro to Object Oriented Programming
4. Single Inheritance
5. Composition vs Sub-Classing
-Session 1-07
+Lesson 1-07
============
Object Oriented Programming Continued
@@ -87,7 +87,7 @@ Object Oriented Programming Continued
1. Properties
2. Introduction to special methods, i.e., the Dunders.
-Session 1-08
+Lesson 1-08
============
Advanced Object Oriented Programming
@@ -98,7 +98,7 @@ Advanced Object Oriented Programming
4. Protocols
5. Emulating standard types by overriding special methods
-Session 1-09
+Lesson 1-09
============
Intro to Functional Programming
@@ -111,7 +111,7 @@ Intro to Functional Programming
6. Statements vs Expressions for flow control
7. Map/filter/reduce
-Session 1-10
+Lesson 1-10
============
Functional Programming Continued
@@ -124,7 +124,7 @@ Functional Programming Continued
PY 2: Advanced Python
#####################
-Session 2-01
+Lesson 2-01
============
Advanced Functional Programming
@@ -133,7 +133,7 @@ Advanced Functional Programming
2. Itertools
3. Generators
-Session 2-02
+Lesson 2-02
============
Advanced Python Language Constructs (made easy-ish)
@@ -145,7 +145,7 @@ Advanced Python Language Constructs (made easy-ish)
AT THIS POINT WE’RE FINALLY DONE WITH THE CORE OF THE LANGUAGE AND WE’RE MOVING ON TO HOW TO WORK EFFECTIVELY IN PYTHON’S ECOSYSTEM. THIS IS STUFF THAT WOULD FORMERLY HAVE GONE INTO “SYSTEMS DEVELOPMENT WITH PYTHON” AKA PY300. THIS IS A MUCH BETTER LAYOUT THAN INSERTING THE FORMER PY200/WEBDEV CLASS INTO THIS CONCEPTUAL STREAM.
-Session 2-03
+Lesson 2-03
============
Debugging & Logging
@@ -155,7 +155,7 @@ Debugging & Logging
3. pdb/ipdb
4. PyCharm’s debugger
-Session 2-04
+Lesson 2-04
============
Advanced Testing
@@ -166,7 +166,7 @@ Advanced Testing
4. Mocks
5. Hypothesis
-Session 2-05
+Lesson 2-05
============
Relational Databases
@@ -178,7 +178,7 @@ Relational Databases
5. Sqlite
6. Postgresql
-Session 2-06
+Lesson 2-06
============
Object/Document, Key/Value and Graph Databases
@@ -189,7 +189,7 @@ Object/Document, Key/Value and Graph Databases
4. Redis
5. Neo4j
-Session 2-07
+Lesson 2-07
============
Profiling & Performance
@@ -199,7 +199,7 @@ Profiling & Performance
3. PyPy
4. Cython
-Session 2-08
+Lesson 2-08
============
Concurrency & Async Programming
@@ -210,7 +210,7 @@ Concurrency & Async Programming
4. Async
5. Celery
-Sessions 2-09 & 2-10
+Lessons 2-09 & 2-10
====================
Grabbag
diff --git a/source/modules/Git.rst b/source/modules/Git.rst
index a7a6bb26..3bd6a38a 100644
--- a/source/modules/Git.rst
+++ b/source/modules/Git.rst
@@ -74,7 +74,7 @@ Once you have chosen/installed an editor, configure git to use it:
**Notepad++ (Win):**
-``$ git config --global core.editor "'c:/program files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin"``
+``$ git config --global core.editor "'c:/program files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nolesson -noPlugin"``
**Atom:**
diff --git a/source/modules/Testing.rst b/source/modules/Testing.rst
index a6ce481d..961859b8 100644
--- a/source/modules/Testing.rst
+++ b/source/modules/Testing.rst
@@ -182,7 +182,7 @@ Pre-existing Tests
Let's take a look at some examples.
-in ``IntroPython-2017\Examples\Session06``
+in ``IntroPython-2017\Examples\Lesson06``
.. code-block:: bash
@@ -207,10 +207,10 @@ What is Happening Here?
You should have gotten results that look something like this::
- MacBook-Pro:Session06 Chris$ pytest test_random_unitest.py
- ============================= test session starts ==============================
+ MacBook-Pro:Lesson06 Chris$ pytest test_random_unitest.py
+ ============================= test lesson starts ==============================
platform darwin -- Python 3.6.2, pytest-3.2.3, py-1.4.34, pluggy-0.4.0
- rootdir: /Users/Chris/PythonStuff/UWPCE/IntroPython-2017/examples/Session06, inifile:
+ rootdir: /Users/Chris/PythonStuff/UWPCE/IntroPython-2017/examples/Lesson06, inifile:
collected 3 items
test_random_unitest.py ...
diff --git a/source/solutions/Lesson04/sherlock.txt b/source/solutions/Lesson04/sherlock.txt
index 4dec2015..3fafb96d 100644
--- a/source/solutions/Lesson04/sherlock.txt
+++ b/source/solutions/Lesson04/sherlock.txt
@@ -3982,7 +3982,7 @@ the name of his murderer. So and so, of Ballarat."
"It is wonderful!" I exclaimed.
"It is obvious. And now, you see, I had narrowed the field down
-considerably. The possession of a grey garment was a third point
+considerably. The poslesson of a grey garment was a third point
which, granting the son's statement to be correct, was a
certainty. We have come now out of mere vagueness to the definite
conception of an Australian from Ballarat with a grey cloak."
@@ -4499,7 +4499,7 @@ so that the jury, having regard to his known eccentricity,
brought in a verdict of 'suicide.' But I, who knew how he winced
from the very thought of death, had much ado to persuade myself
that he had gone out of his way to meet it. The matter passed,
-however, and my father entered into possession of the estate, and
+however, and my father entered into poslesson of the estate, and
of some 14,000 pounds, which lay to his credit at the bank."
"One moment," Holmes interposed, "your statement is, I foresee,
@@ -4797,7 +4797,7 @@ which have baffled all those who have sought a solution by the
aid of their senses. To carry the art, however, to its highest
pitch, it is necessary that the reasoner should be able to
utilise all the facts which have come to his knowledge; and this
-in itself implies, as you will readily see, a possession of all
+in itself implies, as you will readily see, a poslesson of all
knowledge, which, even in these days of free education and
encyclopaedias, is a somewhat rare accomplishment. It is not so
impossible, however, that a man should possess all knowledge
@@ -6150,7 +6150,7 @@ low den in which I used to lodge in Swandam Lane, where I could
every morning emerge as a squalid beggar and in the evenings
transform myself into a well-dressed man about town. This fellow,
a Lascar, was well paid by me for his rooms, so that I knew that
-my secret was safe in his possession.
+my secret was safe in his poslesson.
"Well, very soon I found that I was saving considerable sums of
money. I do not mean that any beggar in the streets of London
@@ -6302,7 +6302,7 @@ seeing an official-looking person in uniform rushing towards him,
dropped his goose, took to his heels, and vanished amid the
labyrinth of small streets which lie at the back of Tottenham
Court Road. The roughs had also fled at the appearance of
-Peterson, so that he was left in possession of the field of
+Peterson, so that he was left in poslesson of the field of
battle, and also of the spoils of victory in the shape of this
battered hat and a most unimpeachable Christmas goose."
@@ -10362,7 +10362,7 @@ of a man in a pew, of the change in the bride's manner, of so
transparent a device for obtaining a note as the dropping of a
bouquet, of her resort to her confidential maid, and of her very
significant allusion to claim-jumping--which in miners' parlance
-means taking possession of that which another person has a prior
+means taking poslesson of that which another person has a prior
claim to--the whole situation became absolutely clear. She had
gone off with a man, and the man was either a lover or was a
previous husband--the chances being in favour of the latter."
@@ -10558,7 +10558,7 @@ should be taken.'
square, black morocco case which he had laid beside his chair.
'You have doubtless heard of the Beryl Coronet?'
-"'One of the most precious public possessions of the empire,'
+"'One of the most precious public poslessons of the empire,'
said I.
"'Precisely.' He opened the case, and there, imbedded in soft,
@@ -10601,7 +10601,7 @@ pound notes. When I was alone once more, however, with the
precious case lying upon the table in front of me, I could not
but think with some misgivings of the immense responsibility
which it entailed upon me. There could be no doubt that, as it
-was a national possession, a horrible scandal would ensue if any
+was a national poslesson, a horrible scandal would ensue if any
misfortune should occur to it. I already regretted having ever
consented to take charge of it. However, it was too late to alter
the matter now, so I locked it up in my private safe and turned
@@ -12742,7 +12742,7 @@ electronic work, you indicate that you have read, understand, agree to
and accept all the terms of this license and intellectual property
(trademark/copyright) agreement. If you do not agree to abide by all
the terms of this agreement, you must cease using and return or destroy
-all copies of Project Gutenberg-tm electronic works in your possession.
+all copies of Project Gutenberg-tm electronic works in your poslesson.
If you paid a fee for obtaining a copy of or access to a Project
Gutenberg-tm electronic work and you do not agree to be bound by the
terms of this agreement, you may obtain a refund from the person or
diff --git a/source/solutions/mailroom/mailroom_basic/mailroom.py b/source/solutions/mailroom/mailroom_basic/mailroom.py
index 9fd134a0..6e34ae21 100755
--- a/source/solutions/mailroom/mailroom_basic/mailroom.py
+++ b/source/solutions/mailroom/mailroom_basic/mailroom.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
"""
-Mailroom Exercise -- as of Session 3 -- no dictionaries or Exceptions
+Mailroom Exercise -- as of Lesson 3 -- no dictionaries or Exceptions
"""
from textwrap import dedent # nifty utility!
diff --git a/source/supplemental/dev_environment/shell.rst b/source/supplemental/dev_environment/shell.rst
index 3dec9ad2..345751fc 100644
--- a/source/supplemental/dev_environment/shell.rst
+++ b/source/supplemental/dev_environment/shell.rst
@@ -230,7 +230,7 @@ need to know when working on a daily basis:
.. image:: /_static/virtualenv_prompt.png
:width: 600px
- :alt: A shell session showing the prompt with both virtualenv and git information
+ :alt: A shell lesson showing the prompt with both virtualenv and git information
Wrap-Up
=======
diff --git a/source/supplemental/dev_environment/sublime_as_ide.rst b/source/supplemental/dev_environment/sublime_as_ide.rst
index 65f0208e..207a71b7 100644
--- a/source/supplemental/dev_environment/sublime_as_ide.rst
+++ b/source/supplemental/dev_environment/sublime_as_ide.rst
@@ -169,7 +169,7 @@ Debugging Support
You'll probably want to wait on this until you start using a debugger, but it's a nifty feature when you get there.
-The final requirement for a reasonable IDE experience is to be able to follow a debugging session in the file where the code exists.
+The final requirement for a reasonable IDE experience is to be able to follow a debugging lesson in the file where the code exists.
There is no plugin for Sublime Text that supports this. But there is a Python package you can install.