pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4828 commits 20 branches 22 tags 141 MiB
Commit graph

15 commits

Author SHA1 Message Date
Gina Häußge
abfcc6e5aa Fix deletion of unrendered timelapses 
If the filename contained a [] pair, the file would not match the glob
pattern used for selecting for deletion.

Backporting the glob.escape function from Python 3.4 and using it here
should fix that. We only use our own ported version if glob.escape
doesn't exist - that should reduce redundant code once we become Python
3 compatible.
 2017-10-10 12:41:47 +02:00
Gina Häußge
aca3dfae49 Merge branch 'maintenance' into devel 
# Conflicts:
#	CHANGELOG.md
 2016-09-23 14:35:31 +02:00
Gina Häußge
080a6e9ccd Extend atomic_write to allow setting & persisting file permissions 2016-09-23 14:26:33 +02:00
Gina Häußge
cba742a94f Fix some more left-overs of py2<->py3 PRs 
Related to #1411, #1414 and #1415
 2016-07-15 12:46:53 +02:00
Gina Häußge
47b7acdfbc Merge branch 'dev/python3A' of https://github.com/ByReaL/OctoPrint into pr/ByReaL/dev/python3A 
Conflicts:
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/printer/standard.py
 2016-07-15 12:28:19 +02:00
MirceaDan
c33a9f9aa2 from __future__ import absolute_import, division, print_function 
changed the behavior to import division and print to be consistent
across all app and similar with python 3.x
 2016-07-15 00:16:58 -07:00
MirceaDan
149cc8c7c5 python 3 changes exceptions, queue and asesrtEqual 
1) import Queue is now lower caps

2) exceptions
except KeyError as e:

3) assertEquals is deprecated but assertEqual does exactly same thing
 2016-07-14 23:53:39 -07:00
Gina Häußge
5fb1c2d7a0 Merge branch 'fix/useIsHiddenPath' into devel 2015-11-20 10:12:33 +01:00
Gina Häußge
454f16a7c3 Fixed a broken unit test (pro tip: test new tests before committing...) 2015-11-20 10:12:15 +01:00
Gina Häußge
73d8ff9991 Merge branch 'fix/useIsHiddenPath' into devel 
Conflicts:
	tests/util/test_file_helpers.py
 2015-11-20 10:07:46 +01:00
Gina Häußge
a731f748d9 Moved existing hidden file checks to utilize octoprint.util.is_hidden_path 2015-11-20 10:02:06 +01:00
Gina Häußge
1f90096a89 Merge branch 'fix/hiddenTemplatesListed' into devel 
Conflicts:
	src/octoprint/util/__init__.py
	tests/util/test_file_helpers.py
 2015-11-19 19:04:21 +01:00
Gina Häußge
83f66e133e Do not include hidden files in listed gcode scripts 2015-11-19 18:58:56 +01:00
Gina Häußge
ab97abf13e Some fixes and unit tests for octoprint.util.atomic_write, .bom_aware_open and .tempdir 
(cherry picked from commit 4fcb853)
 2015-11-19 15:15:35 +01:00
Gina Häußge
4fcb853ef2 Some fixes and unit tests for octoprint.util.atomic_write, .bom_aware_open and .tempdir 2015-11-03 18:11:54 +01:00