For better review: py3 branch -> master branch #851
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
ThomasWaldmann
changed the title
because order is unstable when using 2.
(not if it is None)
load_package_modules: rather use importlib than the deprecated imp lib. also: only load a flat list of modules, do not recurse into subdirs as we did before this change (but this was never needed/intended). _loadPluginModule: rather use importlib than the deprecated imp lib.
seems like st_ino is not 0 any more on win32. but as none of our non-test code calls fuid(), let's get rid of it.
…vs. \n reloading sample data will create \r\n line endings for text data in /wiki/data/default/data
Member
Author
|
did another
now down to 101 from 121. will wait for travis and do some local tests, then merge into master. |
Member
Author
|
Tests fine, did a quick practical test, merged. \o/ |
Member
Author
|
@RogerHaase let's continue in master from now on... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
master: py27 compatible code
py3: py35/36/37 compatible code (needs more testing before we merge into master)
Please only do py3 related fixes in the py3 branch, no other development.