Skip to content

Commit 4bfc9cd

Browse files
Merge branch 'feature/add_step_5.1' into feature/add_step_5.2
2 parents 5f40c68 + 93e759b commit 4bfc9cd

23 files changed

Lines changed: 30 additions & 4 deletions
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# First real version of the pycasa ETS pyface application!
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

stage5.1_first_application/pycasa/model/file_browser.py renamed to stage5.1_fuller_application/pycasa/model/file_browser.py

File renamed without changes.

stage5.1_first_application/pycasa/model/image_file.py renamed to stage5.1_fuller_application/pycasa/model/image_file.py

File renamed without changes.

stage5.1_first_application/pycasa/model/image_folder.py renamed to stage5.1_fuller_application/pycasa/model/image_folder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def to_dataframe(self):
4141
file_data = {"filename": filename, "Num. faces": np.nan}
4242
try:
4343
file_data.update(img_file.metadata)
44-
except Exception as e:
44+
except Exception:
4545
pass
4646
data.append(file_data)
4747

stage5.1_first_application/pycasa/model/tests/__init__.py renamed to stage5.1_fuller_application/pycasa/model/tests/__init__.py

File renamed without changes.

0 commit comments

Comments
 (0)