Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1b0efbf

Browse files
fix conflicts
2 parents 1816bc1 + 737dd11 commit 1b0efbf

File tree

2 files changed

+53
-12
lines changed

2 files changed

+53
-12
lines changed

‎README.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ So far we have only worked with data -- strings, numbers, and booleans. In this
2727
"art vandelay"
2828
```
2929

30+
31+
32+
33+
'art vandelay'
34+
35+
36+
3037
Now months later, if we see that string in some code, we may be confused as to what it's about. And when we add more data, this only becomes more difficult. Think of the what we saw in our **Data Types Lab**: `"art.vandelay@vandelay.co"`, `"Ceo"`, `"7285553334"`, `"vandelay.com"`. There's a lot to keep track of.
3138

3239
So let's use a variables to indicate what each of these strings mean.
@@ -66,6 +73,18 @@ Note that if you introduce a new variable, (declare it), but do not also assign
6673
name
6774
```
6875

76+
77+
----------------------------------------------------------
78+
79+
NameError Traceback (most recent call last)
80+
81+
<ipython-input-6-9bc0cb2ed6de> in <module>()
82+
----> 1 name
83+
84+
85+
NameError: name 'name' is not defined
86+
87+
6988
So that error tells us that `name` is not defined. We just fix this by declaring `name` and assigning the variable in the same line.
7089

7190

@@ -79,6 +98,7 @@ So this is assigning and reading a variable. And when we want to see some infor
7998

8099
```python
81100
email
101+
82102
```
83103

84104
### Reassigning variables

‎index.ipynb‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,20 @@
6060
},
6161
{
6262
"cell_type": "code",
63-
"execution_count": null,
64-
"metadata": {},
65-
"outputs": [],
63+
"execution_count": 2,
64+
"metadata": {},
65+
"outputs": [
66+
{
67+
"data": {
68+
"text/plain": [
69+
"'art vandelay'"
70+
]
71+
},
72+
"execution_count": 2,
73+
"metadata": {},
74+
"output_type": "execute_result"
75+
}
76+
],
6677
"source": [
6778
"\"art vandelay\""
6879
]
@@ -78,7 +89,7 @@
7889
},
7990
{
8091
"cell_type": "code",
81-
"execution_count": 9,
92+
"execution_count": 3,
8293
"metadata": {
8394
"collapsed": true
8495
},
@@ -147,9 +158,21 @@
147158
},
148159
{
149160
"cell_type": "code",
150-
"execution_count": null,
151-
"metadata": {},
152-
"outputs": [],
161+
"execution_count": 6,
162+
"metadata": {},
163+
"outputs": [
164+
{
165+
"ename": "NameError",
166+
"evalue": "name 'name' is not defined",
167+
"output_type": "error",
168+
"traceback": [
169+
"\u001b[0;31m----------------------------------------------------------\u001b[0m",
170+
"\u001b[0;31mNameError\u001b[0m Traceback (most recent call last)",
171+
"\u001b[0;32m<ipython-input-6-9bc0cb2ed6de>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0mname\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
172+
"\u001b[0;31mNameError\u001b[0m: name 'name' is not defined"
173+
]
174+
}
175+
],
153176
"source": [
154177
"name"
155178
]
@@ -184,7 +207,7 @@
184207
"metadata": {},
185208
"outputs": [],
186209
"source": [
187-
"email"
210+
"email\n"
188211
]
189212
},
190213
{
@@ -343,7 +366,7 @@
343366
},
344367
{
345368
"cell_type": "code",
346-
"execution_count": 42,
369+
"execution_count": 18,
347370
"metadata": {
348371
"collapsed": true
349372
},
@@ -371,9 +394,7 @@
371394
{
372395
"cell_type": "code",
373396
"execution_count": null,
374-
"metadata": {
375-
"scrolled": true
376-
},
397+
"metadata": {},
377398
"outputs": [],
378399
"source": [
379400
"name"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /