Skip to content

Fix issue #342 - #343

Merged
mdickinson merged 8 commits into
masterfrom
fix-issue-342
Jul 13, 2018
Merged

Fix issue #342#343
mdickinson merged 8 commits into
masterfrom
fix-issue-342

Conversation

@itziakos

@itziakositziakos commented Jan 13, 2017

Copy link
Copy Markdown
Member

This PR renames the trait attribute of _TraitsChangeCollector to fix#342. There is no change at the constructor signature but I add a deprecation warning that prompts users to stop using trait

@mdickinson

mdickinson commented Jan 26, 2017

Copy link
Copy Markdown
Member

Given that this is a private class, it's tempting not to bother with the DeprecationWarning.

OTOH, apparently this class is directly imported in traits_enaml and pyface. :-(

@mdickinson

Copy link
Copy Markdown
Member

We should probably make this class public at some point.

LGTM. I'm not a big fan of the name monitor_traits. What do you think of using trait_name instead?

@mdickinson

Copy link
Copy Markdown
Member

Another possibility, which I think I prefer to this one: don't deprecate use of the trait keyword at all. Rename the trait trait to _trait, and do the same dance in __init__ as before to accept trait as a keyword and assign the corresponding object to the _trait trait. This lets us use the existing more natural signature when creating a _TraitsChangeCollector object, and avoids the need to update other packages that are importing this object.

The downside is that now if you want to dig the trait out of the collector, you need to access it through _trait. But that doesn't seem like something that would be needed to me.

Comment threadtraits/testing/unittest_tools.py Outdated
import unittest2 as unittest
else:
import unittest
import unittest # noqa

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're messing with this anyway, can we drop the unittest2 import as 2.6 is no longer supported.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Comment threadtraits/testing/unittest_tools.py Outdated

def __init__(self, **traits):
value = traits.pop('trait', None)
if value is not None:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if 'trait' in traits: is better here with a traits['monitor_trait'] = traits.pop('trait') below.

Less confusing if initialized with trait=None (which will slip through undetected as an error).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@corranwebster

Copy link
Copy Markdown
Contributor

I agree about the name monitor_trait. I think trait_name is preferable to the option of using _trait.

@stefanoborini

Copy link
Copy Markdown
Contributor

@corranwebster can this be merged?

@corranwebstercorranwebster left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mdickinson
mdickinson merged commit 8ed38b4 into masterJul 13, 2018
@mdickinson
mdickinson deleted the fix-issue-342 branch July 13, 2018 10:54

@mdickinsonmdickinson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM2

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

traits.testing.unittest_tools._TraitsChangeCollector overrides the HasTraits.trait function

4 participants

@itziakos@mdickinson@corranwebster@stefanoborini
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix issue #342 by itziakos · Pull Request #343 · enthought/traits · GitHub
Skip to content

Fix issue #342 - #343

Merged
mdickinson merged 8 commits into
masterfrom
fix-issue-342
Jul 13, 2018
Merged

Fix issue #342#343
mdickinson merged 8 commits into
masterfrom
fix-issue-342

Conversation

@itziakos

@itziakositziakos commented Jan 13, 2017

Copy link
Copy Markdown
Member

This PR renames the trait attribute of _TraitsChangeCollector to fix#342. There is no change at the constructor signature but I add a deprecation warning that prompts users to stop using trait

@mdickinson

mdickinson commented Jan 26, 2017

Copy link
Copy Markdown
Member

Given that this is a private class, it's tempting not to bother with the DeprecationWarning.

OTOH, apparently this class is directly imported in traits_enaml and pyface. :-(

@mdickinson

Copy link
Copy Markdown
Member

We should probably make this class public at some point.

LGTM. I'm not a big fan of the name monitor_traits. What do you think of using trait_name instead?

@mdickinson

Copy link
Copy Markdown
Member

Another possibility, which I think I prefer to this one: don't deprecate use of the trait keyword at all. Rename the trait trait to _trait, and do the same dance in __init__ as before to accept trait as a keyword and assign the corresponding object to the _trait trait. This lets us use the existing more natural signature when creating a _TraitsChangeCollector object, and avoids the need to update other packages that are importing this object.

The downside is that now if you want to dig the trait out of the collector, you need to access it through _trait. But that doesn't seem like something that would be needed to me.

Comment threadtraits/testing/unittest_tools.py Outdated
import unittest2 as unittest
else:
import unittest
import unittest # noqa

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're messing with this anyway, can we drop the unittest2 import as 2.6 is no longer supported.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Comment threadtraits/testing/unittest_tools.py Outdated

def __init__(self, **traits):
value = traits.pop('trait', None)
if value is not None:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if 'trait' in traits: is better here with a traits['monitor_trait'] = traits.pop('trait') below.

Less confusing if initialized with trait=None (which will slip through undetected as an error).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@corranwebster

Copy link
Copy Markdown
Contributor

I agree about the name monitor_trait. I think trait_name is preferable to the option of using _trait.

@stefanoborini

Copy link
Copy Markdown
Contributor

@corranwebster can this be merged?

@corranwebstercorranwebster left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mdickinson
mdickinson merged commit 8ed38b4 into masterJul 13, 2018
@mdickinson
mdickinson deleted the fix-issue-342 branch July 13, 2018 10:54

@mdickinsonmdickinson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM2

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

traits.testing.unittest_tools._TraitsChangeCollector overrides the HasTraits.trait function

4 participants

@itziakos@mdickinson@corranwebster@stefanoborini
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix issue #342 by itziakos · Pull Request #343 · enthought/traits · GitHub
Skip to content

Fix issue #342 - #343

Merged
mdickinson merged 8 commits into
masterfrom
fix-issue-342
Jul 13, 2018
Merged

Fix issue #342#343
mdickinson merged 8 commits into
masterfrom
fix-issue-342

Conversation

@itziakos

@itziakositziakos commented Jan 13, 2017

Copy link
Copy Markdown
Member

This PR renames the trait attribute of _TraitsChangeCollector to fix#342. There is no change at the constructor signature but I add a deprecation warning that prompts users to stop using trait

@mdickinson

mdickinson commented Jan 26, 2017

Copy link
Copy Markdown
Member

Given that this is a private class, it's tempting not to bother with the DeprecationWarning.

OTOH, apparently this class is directly imported in traits_enaml and pyface. :-(

@mdickinson

Copy link
Copy Markdown
Member

We should probably make this class public at some point.

LGTM. I'm not a big fan of the name monitor_traits. What do you think of using trait_name instead?

@mdickinson

Copy link
Copy Markdown
Member

Another possibility, which I think I prefer to this one: don't deprecate use of the trait keyword at all. Rename the trait trait to _trait, and do the same dance in __init__ as before to accept trait as a keyword and assign the corresponding object to the _trait trait. This lets us use the existing more natural signature when creating a _TraitsChangeCollector object, and avoids the need to update other packages that are importing this object.

The downside is that now if you want to dig the trait out of the collector, you need to access it through _trait. But that doesn't seem like something that would be needed to me.

Comment threadtraits/testing/unittest_tools.py Outdated
import unittest2 as unittest
else:
import unittest
import unittest # noqa

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're messing with this anyway, can we drop the unittest2 import as 2.6 is no longer supported.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Comment threadtraits/testing/unittest_tools.py Outdated

def __init__(self, **traits):
value = traits.pop('trait', None)
if value is not None:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if 'trait' in traits: is better here with a traits['monitor_trait'] = traits.pop('trait') below.

Less confusing if initialized with trait=None (which will slip through undetected as an error).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@corranwebster

Copy link
Copy Markdown
Contributor

I agree about the name monitor_trait. I think trait_name is preferable to the option of using _trait.

@stefanoborini

Copy link
Copy Markdown
Contributor

@corranwebster can this be merged?

@corranwebstercorranwebster left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mdickinson
mdickinson merged commit 8ed38b4 into masterJul 13, 2018
@mdickinson
mdickinson deleted the fix-issue-342 branch July 13, 2018 10:54

@mdickinsonmdickinson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM2

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

traits.testing.unittest_tools._TraitsChangeCollector overrides the HasTraits.trait function

4 participants

@itziakos@mdickinson@corranwebster@stefanoborini
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix issue #342 by itziakos · Pull Request #343 · enthought/traits · GitHub
Skip to content

Fix issue #342 - #343

Merged
mdickinson merged 8 commits into
masterfrom
fix-issue-342
Jul 13, 2018
Merged

Fix issue #342#343
mdickinson merged 8 commits into
masterfrom
fix-issue-342

Conversation

@itziakos

@itziakositziakos commented Jan 13, 2017

Copy link
Copy Markdown
Member

This PR renames the trait attribute of _TraitsChangeCollector to fix#342. There is no change at the constructor signature but I add a deprecation warning that prompts users to stop using trait

@mdickinson

mdickinson commented Jan 26, 2017

Copy link
Copy Markdown
Member

Given that this is a private class, it's tempting not to bother with the DeprecationWarning.

OTOH, apparently this class is directly imported in traits_enaml and pyface. :-(

@mdickinson

Copy link
Copy Markdown
Member

We should probably make this class public at some point.

LGTM. I'm not a big fan of the name monitor_traits. What do you think of using trait_name instead?

@mdickinson

Copy link
Copy Markdown
Member

Another possibility, which I think I prefer to this one: don't deprecate use of the trait keyword at all. Rename the trait trait to _trait, and do the same dance in __init__ as before to accept trait as a keyword and assign the corresponding object to the _trait trait. This lets us use the existing more natural signature when creating a _TraitsChangeCollector object, and avoids the need to update other packages that are importing this object.

The downside is that now if you want to dig the trait out of the collector, you need to access it through _trait. But that doesn't seem like something that would be needed to me.

Comment threadtraits/testing/unittest_tools.py Outdated
import unittest2 as unittest
else:
import unittest
import unittest # noqa

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're messing with this anyway, can we drop the unittest2 import as 2.6 is no longer supported.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Comment threadtraits/testing/unittest_tools.py Outdated

def __init__(self, **traits):
value = traits.pop('trait', None)
if value is not None:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if 'trait' in traits: is better here with a traits['monitor_trait'] = traits.pop('trait') below.

Less confusing if initialized with trait=None (which will slip through undetected as an error).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@corranwebster

Copy link
Copy Markdown
Contributor

I agree about the name monitor_trait. I think trait_name is preferable to the option of using _trait.

@stefanoborini

Copy link
Copy Markdown
Contributor

@corranwebster can this be merged?

@corranwebstercorranwebster left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mdickinson
mdickinson merged commit 8ed38b4 into masterJul 13, 2018
@mdickinson
mdickinson deleted the fix-issue-342 branch July 13, 2018 10:54

@mdickinsonmdickinson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM2

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

traits.testing.unittest_tools._TraitsChangeCollector overrides the HasTraits.trait function

4 participants

@itziakos@mdickinson@corranwebster@stefanoborini
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Fix issue #342 by itziakos · Pull Request #343 · enthought/traits · GitHub
Skip to content

Fix issue #342 - #343

Merged
mdickinson merged 8 commits into
masterfrom
fix-issue-342
Jul 13, 2018
Merged

Fix issue #342#343
mdickinson merged 8 commits into
masterfrom
fix-issue-342

Conversation

@itziakos

@itziakositziakos commented Jan 13, 2017

Copy link
Copy Markdown
Member

This PR renames the trait attribute of _TraitsChangeCollector to fix#342. There is no change at the constructor signature but I add a deprecation warning that prompts users to stop using trait

@mdickinson

mdickinson commented Jan 26, 2017

Copy link
Copy Markdown
Member

Given that this is a private class, it's tempting not to bother with the DeprecationWarning.

OTOH, apparently this class is directly imported in traits_enaml and pyface. :-(

@mdickinson

Copy link
Copy Markdown
Member

We should probably make this class public at some point.

LGTM. I'm not a big fan of the name monitor_traits. What do you think of using trait_name instead?

@mdickinson

Copy link
Copy Markdown
Member

Another possibility, which I think I prefer to this one: don't deprecate use of the trait keyword at all. Rename the trait trait to _trait, and do the same dance in __init__ as before to accept trait as a keyword and assign the corresponding object to the _trait trait. This lets us use the existing more natural signature when creating a _TraitsChangeCollector object, and avoids the need to update other packages that are importing this object.

The downside is that now if you want to dig the trait out of the collector, you need to access it through _trait. But that doesn't seem like something that would be needed to me.

Comment threadtraits/testing/unittest_tools.py Outdated
import unittest2 as unittest
else:
import unittest
import unittest # noqa

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're messing with this anyway, can we drop the unittest2 import as 2.6 is no longer supported.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Comment threadtraits/testing/unittest_tools.py Outdated

def __init__(self, **traits):
value = traits.pop('trait', None)
if value is not None:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if 'trait' in traits: is better here with a traits['monitor_trait'] = traits.pop('trait') below.

Less confusing if initialized with trait=None (which will slip through undetected as an error).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@corranwebster

Copy link
Copy Markdown
Contributor

I agree about the name monitor_trait. I think trait_name is preferable to the option of using _trait.

@stefanoborini

Copy link
Copy Markdown
Contributor

@corranwebster can this be merged?

@corranwebstercorranwebster left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mdickinson
mdickinson merged commit 8ed38b4 into masterJul 13, 2018
@mdickinson
mdickinson deleted the fix-issue-342 branch July 13, 2018 10:54

@mdickinsonmdickinson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM2

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

traits.testing.unittest_tools._TraitsChangeCollector overrides the HasTraits.trait function

4 participants

@itziakos@mdickinson@corranwebster@stefanoborini
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix issue #342 by itziakos · Pull Request #343 · enthought/traits · GitHub
Skip to content

Fix issue #342 - #343

Merged
mdickinson merged 8 commits into
masterfrom
fix-issue-342
Jul 13, 2018
Merged

Fix issue #342#343
mdickinson merged 8 commits into
masterfrom
fix-issue-342

Conversation

@itziakos

@itziakositziakos commented Jan 13, 2017

Copy link
Copy Markdown
Member

This PR renames the trait attribute of _TraitsChangeCollector to fix#342. There is no change at the constructor signature but I add a deprecation warning that prompts users to stop using trait

@mdickinson

mdickinson commented Jan 26, 2017

Copy link
Copy Markdown
Member

Given that this is a private class, it's tempting not to bother with the DeprecationWarning.

OTOH, apparently this class is directly imported in traits_enaml and pyface. :-(

@mdickinson

Copy link
Copy Markdown
Member

We should probably make this class public at some point.

LGTM. I'm not a big fan of the name monitor_traits. What do you think of using trait_name instead?

@mdickinson

Copy link
Copy Markdown
Member

Another possibility, which I think I prefer to this one: don't deprecate use of the trait keyword at all. Rename the trait trait to _trait, and do the same dance in __init__ as before to accept trait as a keyword and assign the corresponding object to the _trait trait. This lets us use the existing more natural signature when creating a _TraitsChangeCollector object, and avoids the need to update other packages that are importing this object.

The downside is that now if you want to dig the trait out of the collector, you need to access it through _trait. But that doesn't seem like something that would be needed to me.

Comment threadtraits/testing/unittest_tools.py Outdated
import unittest2 as unittest
else:
import unittest
import unittest # noqa

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're messing with this anyway, can we drop the unittest2 import as 2.6 is no longer supported.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Comment threadtraits/testing/unittest_tools.py Outdated

def __init__(self, **traits):
value = traits.pop('trait', None)
if value is not None:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if 'trait' in traits: is better here with a traits['monitor_trait'] = traits.pop('trait') below.

Less confusing if initialized with trait=None (which will slip through undetected as an error).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@corranwebster

Copy link
Copy Markdown
Contributor

I agree about the name monitor_trait. I think trait_name is preferable to the option of using _trait.

@stefanoborini

Copy link
Copy Markdown
Contributor

@corranwebster can this be merged?

@corranwebstercorranwebster left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mdickinson
mdickinson merged commit 8ed38b4 into masterJul 13, 2018
@mdickinson
mdickinson deleted the fix-issue-342 branch July 13, 2018 10:54

@mdickinsonmdickinson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM2

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

traits.testing.unittest_tools._TraitsChangeCollector overrides the HasTraits.trait function

4 participants

@itziakos@mdickinson@corranwebster@stefanoborini
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Fix issue #342 by itziakos · Pull Request #343 · enthought/traits · GitHub
Skip to content

Fix issue #342 - #343

Merged
mdickinson merged 8 commits into
masterfrom
fix-issue-342
Jul 13, 2018
Merged

Fix issue #342#343
mdickinson merged 8 commits into
masterfrom
fix-issue-342

Conversation

@itziakos

@itziakositziakos commented Jan 13, 2017

Copy link
Copy Markdown
Member

This PR renames the trait attribute of _TraitsChangeCollector to fix#342. There is no change at the constructor signature but I add a deprecation warning that prompts users to stop using trait

@mdickinson

mdickinson commented Jan 26, 2017

Copy link
Copy Markdown
Member

Given that this is a private class, it's tempting not to bother with the DeprecationWarning.

OTOH, apparently this class is directly imported in traits_enaml and pyface. :-(

@mdickinson

Copy link
Copy Markdown
Member

We should probably make this class public at some point.

LGTM. I'm not a big fan of the name monitor_traits. What do you think of using trait_name instead?

@mdickinson

Copy link
Copy Markdown
Member

Another possibility, which I think I prefer to this one: don't deprecate use of the trait keyword at all. Rename the trait trait to _trait, and do the same dance in __init__ as before to accept trait as a keyword and assign the corresponding object to the _trait trait. This lets us use the existing more natural signature when creating a _TraitsChangeCollector object, and avoids the need to update other packages that are importing this object.

The downside is that now if you want to dig the trait out of the collector, you need to access it through _trait. But that doesn't seem like something that would be needed to me.

Comment threadtraits/testing/unittest_tools.py Outdated
import unittest2 as unittest
else:
import unittest
import unittest # noqa

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're messing with this anyway, can we drop the unittest2 import as 2.6 is no longer supported.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Comment threadtraits/testing/unittest_tools.py Outdated

def __init__(self, **traits):
value = traits.pop('trait', None)
if value is not None:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if 'trait' in traits: is better here with a traits['monitor_trait'] = traits.pop('trait') below.

Less confusing if initialized with trait=None (which will slip through undetected as an error).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@corranwebster

Copy link
Copy Markdown
Contributor

I agree about the name monitor_trait. I think trait_name is preferable to the option of using _trait.

@stefanoborini

Copy link
Copy Markdown
Contributor

@corranwebster can this be merged?

@corranwebstercorranwebster left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mdickinson
mdickinson merged commit 8ed38b4 into masterJul 13, 2018
@mdickinson
mdickinson deleted the fix-issue-342 branch July 13, 2018 10:54

@mdickinsonmdickinson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM2

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

traits.testing.unittest_tools._TraitsChangeCollector overrides the HasTraits.trait function

4 participants

@itziakos@mdickinson@corranwebster@stefanoborini
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Fix issue #342 by itziakos · Pull Request #343 · enthought/traits · GitHub
Skip to content

Fix issue #342 - #343

Merged
mdickinson merged 8 commits into
masterfrom
fix-issue-342
Jul 13, 2018
Merged

Fix issue #342#343
mdickinson merged 8 commits into
masterfrom
fix-issue-342

Conversation

@itziakos

@itziakositziakos commented Jan 13, 2017

Copy link
Copy Markdown
Member

This PR renames the trait attribute of _TraitsChangeCollector to fix#342. There is no change at the constructor signature but I add a deprecation warning that prompts users to stop using trait

@mdickinson

mdickinson commented Jan 26, 2017

Copy link
Copy Markdown
Member

Given that this is a private class, it's tempting not to bother with the DeprecationWarning.

OTOH, apparently this class is directly imported in traits_enaml and pyface. :-(

@mdickinson

Copy link
Copy Markdown
Member

We should probably make this class public at some point.

LGTM. I'm not a big fan of the name monitor_traits. What do you think of using trait_name instead?

@mdickinson

Copy link
Copy Markdown
Member

Another possibility, which I think I prefer to this one: don't deprecate use of the trait keyword at all. Rename the trait trait to _trait, and do the same dance in __init__ as before to accept trait as a keyword and assign the corresponding object to the _trait trait. This lets us use the existing more natural signature when creating a _TraitsChangeCollector object, and avoids the need to update other packages that are importing this object.

The downside is that now if you want to dig the trait out of the collector, you need to access it through _trait. But that doesn't seem like something that would be needed to me.

Comment threadtraits/testing/unittest_tools.py Outdated
import unittest2 as unittest
else:
import unittest
import unittest # noqa

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're messing with this anyway, can we drop the unittest2 import as 2.6 is no longer supported.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Comment threadtraits/testing/unittest_tools.py Outdated

def __init__(self, **traits):
value = traits.pop('trait', None)
if value is not None:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if 'trait' in traits: is better here with a traits['monitor_trait'] = traits.pop('trait') below.

Less confusing if initialized with trait=None (which will slip through undetected as an error).

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@corranwebster

Copy link
Copy Markdown
Contributor

I agree about the name monitor_trait. I think trait_name is preferable to the option of using _trait.

@stefanoborini

Copy link
Copy Markdown
Contributor

@corranwebster can this be merged?

@corranwebstercorranwebster left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mdickinson
mdickinson merged commit 8ed38b4 into masterJul 13, 2018
@mdickinson
mdickinson deleted the fix-issue-342 branch July 13, 2018 10:54

@mdickinsonmdickinson left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM2

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

traits.testing.unittest_tools._TraitsChangeCollector overrides the HasTraits.trait function

4 participants

@itziakos@mdickinson@corranwebster@stefanoborini