Skip to content

Commit 351d4f2

Browse files
authored
Merge pull request #101 from silx-kit/move_modifs
minor modifications for 06/22 training
2 parents 59f9ff8 + 4a8db01 commit 351d4f2

3 files changed

Lines changed: 11 additions & 18 deletions

File tree

oop/OOP.ipynb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,10 +647,15 @@
647647
"\n",
648648
"``` python\n",
649649
"def get_smth(self):\n",
650+
" \"\"\"getter\"\"\"\n",
650651
" return self._something\n",
652+
"\n",
651653
"def set_smth(self, smth):\n",
654+
" \"\"\"setter\"\"\"\n",
652655
" self._something = smth\n",
656+
" \n",
653657
"def del_smth(self):\n",
658+
" \"\"\"deleter\"\"\"\n",
654659
" self._something = None\n",
655660
"```\n",
656661
"\n",

oop/OOP_solutions.ipynb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@
194194
" self.oversampling = oversampling\n",
195195
" self.result = None\n",
196196
" super(LaueThread, self).__init__(name=\"LaueThread\", group=None)\n",
197+
" \n",
197198
" def run(self):\n",
198199
" self.result = laue_image(self.ncells, self.h, self.k, self.oversampling)"
199200
]

python/python/1_Definitions.ipynb

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,23 +1162,10 @@
11621162
"outputs": [],
11631163
"source": [
11641164
"# Integers in the range (-5, 256) are unique. Floats are not!\n",
1165-
"print(a is 5)\n",
1166-
"print(b is 5.0)\n",
1167-
"c = 257\n",
1168-
"print(c is 257)"
1169-
]
1170-
},
1171-
{
1172-
"cell_type": "code",
1173-
"execution_count": null,
1174-
"metadata": {
1175-
"slideshow": {
1176-
"slide_type": "subslide"
1177-
}
1178-
},
1179-
"outputs": [],
1180-
"source": [
1181-
"print(1 is None, None is None)"
1165+
"c, d = 5, 5.0\n",
1166+
"\n",
1167+
"print(a is c)\n",
1168+
"print(b is d)"
11821169
]
11831170
},
11841171
{
@@ -1316,7 +1303,7 @@
13161303
"list1 = [3, 2, 1]\n",
13171304
"print(\"list1 = \", list1)\n",
13181305
"list3 = list1[:] # Copy the content.\n",
1319-
"list3[1] = 10\n",
1306+
"list3[2] = 10\n",
13201307
"print(\"As expected: list3= \", list3)\n",
13211308
"print(\"And now: list1= \", list1)"
13221309
]

0 commit comments

Comments
 (0)