hash
stringlengths 40
40
| diff
stringlengths 131
26.7k
| message
stringlengths 7
694
| project
stringlengths 5
67
| split
stringclasses 1
value | diff_languages
stringlengths 2
24
|
|---|---|---|---|---|---|
934723f9fe0f0a44ad161a2f394307d51d5b0aa2 | diff --git a/scripts/setupProject.js b/scripts/setupProject.js
index <HASH>..<HASH> 100644
--- a/scripts/setupProject.js
+++ b/scripts/setupProject.js
@@ -12,7 +12,7 @@ const execa = require("execa");
// Build all packages in the "packages" workspace.
console.log(`🏗 Building packages...`);
try {
- await execa("yarn", ["webiny", "workspaces", "run", "build", "--env", "dev"], {
+ await execa("yarn", ["webiny", "workspaces", "run", "build", "--folder", "packages", "--env", "dev"], {
stdio: "inherit"
});
console.log(`✅️ Packages were built successfully!`); | fix: build only the packages folder during setup-project | Webiny_webiny-js | train | js |
91cf00414222ae837352f2e938c38d7f464cc7ce | diff --git a/packages/repository/repo-build-job/src/repo-build-job.js b/packages/repository/repo-build-job/src/repo-build-job.js
index <HASH>..<HASH> 100644
--- a/packages/repository/repo-build-job/src/repo-build-job.js
+++ b/packages/repository/repo-build-job/src/repo-build-job.js
@@ -21,7 +21,7 @@ module.exports = async ({pluginRepository}) => {
agent,
agentInstance,
binary: '@bildit/artifact-finder',
- commandArgs: ['artifact-finder', directory],
+ commandArgs: ['artifact-finder', '.'],
executeCommandOptions: {returnOutput: true},
}),
) | artifact-finder is now run using binaryRunner | giltayar_bilt | train | js |
aac63d40670923c992d5015608890629a0b4532a | diff --git a/code/solr/Solr.php b/code/solr/Solr.php
index <HASH>..<HASH> 100644
--- a/code/solr/Solr.php
+++ b/code/solr/Solr.php
@@ -259,7 +259,12 @@ class Solr_Reindex extends BuildTask {
echo "$offset..";
$cmd = "php $script dev/tasks/$self index=$index class=$class start=$offset variantstate=$statevar";
- if($verbose) echo "\n Running '$cmd'\n";
+
+ if($verbose) {
+ echo "\n Running '$cmd'\n";
+ $cmd .= " verbose=1";
+ }
+
$res = $verbose ? passthru($cmd) : `$cmd`;
if($verbose) echo " ".preg_replace('/\r\n|\n/', '$0 ', $res)."\n";
@@ -290,9 +295,9 @@ class Solr_Reindex extends BuildTask {
->where($filter)
->limit($this->stat('recordsPerRequest'), $start);
- if($verbose) echo "Adding ";
+ if($verbose) echo "Adding $class";
foreach ($items as $item) {
- if($verbose) echo $index->ID . ' ';
+ if($verbose) echo $item->ID . ' ';
$index->add($item); | Pass verbose through to nested call.
Correct ID output | silverstripe_silverstripe-fulltextsearch | train | php |
142d8eed3356e1de93b5d2ec489e02916f38827d | diff --git a/aiohttp_devtools/runserver/serve.py b/aiohttp_devtools/runserver/serve.py
index <HASH>..<HASH> 100644
--- a/aiohttp_devtools/runserver/serve.py
+++ b/aiohttp_devtools/runserver/serve.py
@@ -94,13 +94,14 @@ async def check_port_open(port, loop, delay=1):
@contextlib.contextmanager
-def set_tty(tty_path):
- if tty_path:
+def set_tty(tty_path): # pragma: no cover
+ try:
+ assert tty_path
with open(tty_path) as tty:
sys.stdin = tty
yield
- else:
- # currently on windows tty_path is None and there's nothing we can do here
+ except (AssertionError, OSError):
+ # either tty_path is None (windows) or opening it fails (eg. on pycharm)
yield | more lenient set_tty, (partially) fix #<I> (#<I>) | aio-libs_aiohttp-devtools | train | py |
8365bcdc271cc126926fbad8ea6d2e41d0835b1d | diff --git a/lib/social_snippet/resolvers/base_resolver.rb b/lib/social_snippet/resolvers/base_resolver.rb
index <HASH>..<HASH> 100644
--- a/lib/social_snippet/resolvers/base_resolver.rb
+++ b/lib/social_snippet/resolvers/base_resolver.rb
@@ -49,8 +49,8 @@ module SocialSnippet
def resolve_tag_repo_ref!(t)
if t.has_repo?
- repo = core.repo_manager.find_repository_by_tag(t)
- t.set_ref repo.latest_version(t.ref)
+ package = core.repo_manager.find_package_by_tag(t)
+ t.set_ref package.latest_version(t.ref)
end
end
@@ -83,17 +83,10 @@ module SocialSnippet
# Resolve tag's ref
def resolve_tag_repo_ref!(tag)
- repo = core.repo_manager.find_repository_by_tag(tag)
+ package = core.repo_manager.find_package_by_tag(tag)
- # not found
- return if repo.nil?
-
- if tag.has_ref? === false || tag.ref != repo.latest_version(tag.ref)
- if repo.has_versions?
- tag.set_ref repo.latest_version(tag.ref)
- else
- tag.set_ref repo.short_commit_id
- end
+ if tag.has_ref? === false || tag.ref != package.latest_version(tag.ref)
+ tag.set_ref package.rev_hash
end
end | base_resolver: use package class | social-snippet_social-snippet | train | rb |
ea62b88cb42072e137d99e3789bc57f8008fb25c | diff --git a/main.go b/main.go
index <HASH>..<HASH> 100644
--- a/main.go
+++ b/main.go
@@ -60,7 +60,8 @@ func main() {
select {
case err = <-process.Wait():
- logger.Fatal("Error starting mysqld", err)
+ logger.Error("Error starting mysqld", err)
+ os.Exit(1)
case <-process.Ready():
//continue
} | Use logger.Error not logger.Fatal
- We don't want a stacktrace when we fail for a known reason.
[#<I>] | cloudfoundry_mariadb_ctrl | train | go |
3df7573d3b258a8a1572bb2f0a8780a65aa0781f | diff --git a/foursquare/__init__.py b/foursquare/__init__.py
index <HASH>..<HASH> 100644
--- a/foursquare/__init__.py
+++ b/foursquare/__init__.py
@@ -130,7 +130,6 @@ class Foursquare(object):
url = u'{TOKEN_ENDPOINT}?{params}'.format(
TOKEN_ENDPOINT=TOKEN_ENDPOINT,
params=urllib.urlencode(data))
- log.debug(u'GET: {0}'.format(url))
# Get the response from the token uri and attempt to parse
response = _request_with_retry(url)
return response.get('access_token') | Remove debug statement containing access_token
The removed statement was logging the following message:
GET url: <URL> is dangerous | mLewisLogic_foursquare | train | py |
4058dc2ab04b2a0b4e47cae7327002a78ca7e292 | diff --git a/src/main/java/org/asteriskjava/fastagi/AgiException.java b/src/main/java/org/asteriskjava/fastagi/AgiException.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/asteriskjava/fastagi/AgiException.java
+++ b/src/main/java/org/asteriskjava/fastagi/AgiException.java
@@ -34,7 +34,7 @@ public class AgiException extends Exception
*
* @param message a message describing the AgiException.
*/
- protected AgiException(String message)
+ public AgiException(String message)
{
super(message);
}
@@ -45,7 +45,7 @@ public class AgiException extends Exception
* @param message a message describing the AgiException.
* @param cause the throwable that caused this exception.
*/
- protected AgiException(String message, Throwable cause)
+ public AgiException(String message, Throwable cause)
{
super(message, cause);
} | Made contructors public as suggested by Steve Prior | asterisk-java_asterisk-java | train | java |
2c5c0998d095c20e81e9bff59697923d389a225c | diff --git a/google/gax/__init__.py b/google/gax/__init__.py
index <HASH>..<HASH> 100644
--- a/google/gax/__init__.py
+++ b/google/gax/__init__.py
@@ -41,7 +41,7 @@ from google.gax.errors import GaxError
from google.gax.retry import retryable
-__version__ = '0.15.0'
+__version__ = '0.15.1'
_LOG = logging.getLogger(__name__) | Bump the version (#<I>) | googleapis_gax-python | train | py |
00f1dfdd57fd8478688f9d201e539e0bf3946be2 | diff --git a/src/effects.js b/src/effects.js
index <HASH>..<HASH> 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -62,8 +62,8 @@ jQuery.fn.extend({
for ( var i = 0, j = this.length; i < j; i++ ) {
var display = jQuery.css( this[i], "display" );
- if ( !jQuery.data( this[i], "olddisplay" ) && display !== "none" ) {
- jQuery.data( this[i], "olddisplay", display );
+ if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) {
+ jQuery.data( this[i], "olddisplay", display );
}
} | Reorders condition at L<I> for efficiency | jquery_jquery | train | js |
7ad9be897fd221002c41113f3b7806f5fbb281d6 | diff --git a/estnltk/text.py b/estnltk/text.py
index <HASH>..<HASH> 100644
--- a/estnltk/text.py
+++ b/estnltk/text.py
@@ -62,8 +62,10 @@ class Text:
memo[id(self)] = result
memo[id(text)] = text
result.meta = deepcopy(self.meta, memo)
- for layer_name in self.layers:
- layer = deepcopy(self[layer_name], memo)
+ # Layers must be created in the topological order
+ # TODO: test this in tests
+ for original_layer in self.list_layers():
+ layer = deepcopy(original_layer, memo)
memo[id(layer)] = layer
result.add_layer(layer)
return result
@@ -74,7 +76,9 @@ class Text:
state = {
'text': self.text,
'meta': self.meta,
- 'layers': [copy(self[layer]) for layer in self.layers]
+ # Layers must be created in the topological order
+ # TODO: test this in tests
+ 'layers': [copy(layer) for layer in self.list_layers()]
}
for layer in state['layers']:
layer.text_object = None
@@ -165,7 +169,8 @@ class Text:
# TODO: Currently, it returns a dict for backward compatibility
Make it to the list of strings instead
"""
- return {**self.__dict__, **self._shadowed_layers}
+ return self.__dict__.keys() | self._shadowed_layers.keys()
+ # return {**self.__dict__, **self._shadowed_layers}
@property
def attributes(self) -> DefaultDict[str, List[str]]: | Signature change. We need modifications in the Tagger.make_layer code | estnltk_estnltk | train | py |
697364673e71c105d589a67c207db0757a6b522e | diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/git-status-table.js b/bundles/org.eclipse.orion.client.git/web/orion/git/git-status-table.js
index <HASH>..<HASH> 100644
--- a/bundles/org.eclipse.orion.client.git/web/orion/git/git-status-table.js
+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/git-status-table.js
@@ -529,7 +529,10 @@ orion.GitLogTableRenderer = (function() {
},
modifyHeader: function(location){
- dojo.place(document.createTextNode("Recent commits on " + location), this._type + "_header", "only");
+ //We should make sure that the header DIV still exist because sometimes the whole remote mini log is emptied.
+ if(dojo.byId(this._type + "_header")){
+ dojo.place(document.createTextNode("Recent commits on " + location), this._type + "_header", "only");
+ }
},
renderAction:function(){ | Bug <I> - [client][status] Error after I commit on a local branch | eclipse_orion.client | train | js |
225f3a6bc2bf89cdae5949a408aaef22769ae0d0 | diff --git a/tests/test_interface.py b/tests/test_interface.py
index <HASH>..<HASH> 100644
--- a/tests/test_interface.py
+++ b/tests/test_interface.py
@@ -14,14 +14,14 @@ from pybar.run_manager import RunManager
from pybar.scans.test_register import RegisterTest
-def test_configure_pixel(self, same_mask_for_all_dc=False):
+def configure_pixel(self, same_mask_for_all_dc=False):
return
-def test_send_commands(self, commands, repeat=1, wait_for_finish=True, concatenate=True, byte_padding=False, clear_memory=False, use_timeout=True):
+def send_commands(self, commands, repeat=1, wait_for_finish=True, concatenate=True, byte_padding=False, clear_memory=False, use_timeout=True):
# no timeout for simulation
use_timeout = False
- # append some zeros since simulation is more slow
+ # append some zeros since simulation needs more time for calculation
commands.extend(self.register.get_commands("zeros", length=20))
if concatenate:
commands_iter = iter(commands) | MAINT: rename, comments | SiLab-Bonn_pyBAR | train | py |
88827a6b08440820e31f2105ecf91d6c96bc72fa | diff --git a/tests/custom_bootstrap.php b/tests/custom_bootstrap.php
index <HASH>..<HASH> 100644
--- a/tests/custom_bootstrap.php
+++ b/tests/custom_bootstrap.php
@@ -33,6 +33,5 @@ $application->run($input, new NullOutput());
$input = new ArrayInput([
'command' => 'doctrine:schema:create',
- '--no-interaction' => true,
]);
$application->run($input, new NullOutput()); | Update tests/custom_bootstrap.php | sonata-project_SonataMediaBundle | train | php |
45a85e58831ecbd2d8fce37f40dfef037ea99b04 | diff --git a/src/tags-all.js b/src/tags-all.js
index <HASH>..<HASH> 100644
--- a/src/tags-all.js
+++ b/src/tags-all.js
@@ -14,7 +14,7 @@ export function createFactory(viewSpecifier, viewName) {
var props = {}
var children = []
each(arguments, function processArg(val) {
- if (val === undefined) {
+ if (val === undefined || val === null || val === true || val === false) {
return
} else if (_isReactObj(val)) { | Better early-catching of un-rendered values | marcuswestin_tags.js | train | js |
fbf7af0c6a4d4416d90a347235c42bbd247c6b5c | diff --git a/sockjsroom/httpJsonHandler.py b/sockjsroom/httpJsonHandler.py
index <HASH>..<HASH> 100644
--- a/sockjsroom/httpJsonHandler.py
+++ b/sockjsroom/httpJsonHandler.py
@@ -33,7 +33,7 @@ class JsonDefaultHandler(tornado.web.RequestHandler):
def write(self, obj):
""" Print object on output """
- accept = self.requet.get("Accept")
+ accept = self.request.get("Accept")
if "json" in accept:
if JsonDefaultHandler.__parser is None:
JsonDefaultHandler.__parser = Parser() | Correct typo error making system not working. | Deisss_python-sockjsroom | train | py |
f7ec66ab8f0a72e7ef21d87cb78006664e1c6aa4 | diff --git a/lib/daimon/markdown/redcarpet/html_renderer.rb b/lib/daimon/markdown/redcarpet/html_renderer.rb
index <HASH>..<HASH> 100644
--- a/lib/daimon/markdown/redcarpet/html_renderer.rb
+++ b/lib/daimon/markdown/redcarpet/html_renderer.rb
@@ -21,13 +21,13 @@ module Daimon
document = ""
scanner = StringScanner.new(full_document)
loop do
+ break if scanner.eos?
if scanner.match?(/{{.+?}}/m)
document << @plugins.shift
scanner.pos += scanner.matched_size
else
document << scanner.getch
end
- break if scanner.eos?
end
document
end
diff --git a/test/test_html_renderer.rb b/test/test_html_renderer.rb
index <HASH>..<HASH> 100644
--- a/test/test_html_renderer.rb
+++ b/test/test_html_renderer.rb
@@ -5,6 +5,10 @@ class HTMLRendererTest < Test::Unit::TestCase
"header" => {
input: %Q(# hi),
expect: %Q(<h1>hi</h1>\n)
+ },
+ "empty text" => {
+ input: "",
+ expect: ""
}
)
def test_renderer(data) | Fix HTMLRenderer to work with empty text | bm-sms_daimon_markdown | train | rb,rb |
8ee9e357a90c348c2a9bcbfca59f8d54139d1c23 | diff --git a/cumulusci/cli/flow.py b/cumulusci/cli/flow.py
index <HASH>..<HASH> 100644
--- a/cumulusci/cli/flow.py
+++ b/cumulusci/cli/flow.py
@@ -21,7 +21,7 @@ def flow():
@flow.command(name="doc", help="Exports RST format documentation for all flows")
-@pass_runtime(require_project=False)
+@pass_runtime(require_keychain=True)
def flow_doc(runtime):
flow_info_path = Path(__file__, "..", "..", "..", "docs", "flows.yml").resolve()
with open(flow_info_path, "r", encoding="utf-8") as f: | require keychain when generating flow docs. | SFDO-Tooling_CumulusCI | train | py |
b31303a6ed8fe22eb3c4266c368dad4477f14da1 | diff --git a/admin/lang.php b/admin/lang.php
index <HASH>..<HASH> 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -191,7 +191,7 @@
foreach ($files as $filekey => $file) { // check all the help files.
if (!file_exists("$langdir/help/$file")) {
- echo "<p><font color=\"red\">".get_string("filemissing", "", "$langdir/help/$file")."</font></p>";
+ echo "<a href=\"$CFG->wwwroot/$CFG->admin/langdoc.php?sesskey=$USER->sesskey&currentfile=help/$file\">" .get_string("filemissing", "", "$currentlang/help/$file") . "</a>" . "<br />\n";
$somethingfound = true;
continue;
}
@@ -202,7 +202,7 @@
}
foreach ($files as $filekey => $file) { // check all the docs files.
if (!file_exists("$langdir/docs/$file")) {
- echo "<p><font color=\"red\">".get_string("filemissing", "", "$langdir/docs/$file")."</font></p>";
+ echo "<a href=\"$CFG->wwwroot/$CFG->admin/langdoc.php?sesskey=$USER->sesskey&currentfile=docs/$file\">" .get_string("filemissing", "", "$currentlang/docs/$file") . "</a>" . "<br />\n";
$somethingfound = true;
continue;
} | Implements MDL-<I>
Now we can go to a missing docs/help files directly via a link. Thanks to Mitsuhiro Yoshida for the patch. | moodle_moodle | train | php |
c22f4b5de10c7586e1e360abfe9fe03b6af04c18 | diff --git a/src/astring.js b/src/astring.js
index <HASH>..<HASH> 100644
--- a/src/astring.js
+++ b/src/astring.js
@@ -163,6 +163,7 @@ const PARENTHESIS_NEEDED = {
Super: 0,
ThisExpression: 0,
UnaryExpression: 0,
+ ArrayExpression: 0,
// Requires precedence check
BinaryExpression: 1,
LogicalExpression: 1 | Removed parenthesis around array expressions | davidbonnet_astring | train | js |
9739593bd8f7f5a165897972edec2477cbff126c | diff --git a/openquake/server/static/js/engine.js b/openquake/server/static/js/engine.js
index <HASH>..<HASH> 100644
--- a/openquake/server/static/js/engine.js
+++ b/openquake/server/static/js/engine.js
@@ -193,17 +193,24 @@
if(!err) {
err = "removed.";
}
+
var hide_or_back = (function(e) {
+ closeTimer();
this.conf_hide = $('#confirmDialog' + calc_id).hide();
this.back_conf_hide = $('.back_confirmDialog' + calc_id).hide();
- closeTimer();
+
+ diaerror.show(false, "Calculation removed", "Calculation:<br><b>(" + calc_id + ") " + calc_desc + "</b> " + err );
+ setTimer();
+
+ if(!err) {
+ view.calculations.remove([view.calculations.get(calc_id)]);
+ }
+
})();
- diaerror.show(false, "Calculation removed", "Calculation:<br><b>(" + calc_id + ") " + calc_desc + "</b> " + err );
- view.calculations.remove([view.calculations.get(calc_id)]);
+
}
);
- setTimer();
}, | inserted call calculation remove in if and added call setTimer after modal show | gem_oq-engine | train | js |
386bda1386e52c14b7f279f3f5ac76f6c378783e | diff --git a/alphatwirl/binning/RoundLog.py b/alphatwirl/binning/RoundLog.py
index <HASH>..<HASH> 100755
--- a/alphatwirl/binning/RoundLog.py
+++ b/alphatwirl/binning/RoundLog.py
@@ -81,21 +81,6 @@ class RoundLog(object):
def __call__(self, val):
- val = self._valid_underflow_overflow(val)
-
- if val in (None, 0, self.underflow_bin, self.overflow_bin):
- return val
-
- val = math.log10(val)
- val = self._round(val)
-
- if val is None:
- return None
-
- return 10**val
-
- def _valid_underflow_overflow(self, val):
-
if self.valid:
if not self.valid(val):
return None
@@ -122,7 +107,13 @@ class RoundLog(object):
if self.max_bin_log10_upedge <= math.log10(val):
return self.overflow_bin
- return val
+ val = math.log10(val)
+ val = self._round(val)
+
+ if val is None:
+ return None
+
+ return 10**val
def next(self, bin): | optimize RoundLog for speed, expand _valid_underflow_overflow() in __call__() | alphatwirl_alphatwirl | train | py |
2e697afe8119e6522df75ab7c6c650119b8bbc3d | diff --git a/lib/imageruby/abstract/auto_require.rb b/lib/imageruby/abstract/auto_require.rb
index <HASH>..<HASH> 100644
--- a/lib/imageruby/abstract/auto_require.rb
+++ b/lib/imageruby/abstract/auto_require.rb
@@ -21,9 +21,19 @@ along with imageruby. if not, see <http://www.gnu.org/licenses/>.
require "rubygems"
def auto_require(prefix)
- Gem.source_index.each do |entry|
- if entry[0] =~ prefix
- require entry[1].name
+ # in Ruby 2.0 it appears Gem.source_index was removed.
+ # The same functionality can be found using Gem::Specification
+ if defined?(Gem::Specification) && Gem::Specification.respond_to?(:each)
+ Gem::Specification.each do |entry|
+ if entry.name =~ prefix
+ require entry.name
+ end
+ end
+ else
+ Gem.source_index.each do |entry|
+ if entry[0] =~ prefix
+ require entry[1].name
+ end
end
end
end | Add auto_load support for Ruby <I>
Ruby <I> completely removed Gem.source_index which was used in auto_load
to automatically find imageruby-* gems and load them. This behavior can
now be made using Gem::Specification.each.
Prefer Gem::Specification.each if Gem::Specification is defined and has
an each method. (<I> defined Gem::Specification but without the each
method)
Fall back to Gem.source_index where available. | tario_imageruby | train | rb |
14f8ae9977df1451b783bce2e943c7d5bafe81bc | diff --git a/app/assets/javascripts/camaleon_cms/admin/_post.js b/app/assets/javascripts/camaleon_cms/admin/_post.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/camaleon_cms/admin/_post.js
+++ b/app/assets/javascripts/camaleon_cms/admin/_post.js
@@ -265,7 +265,7 @@ function init_post(obj) {
/*********** end *************/
}
setTimeout(form_later_actions, 1000);
- setTimeout(function(){ $form.data("hash", get_hash_form()); }, 4000);
+ setTimeout(function(){ $form.data("hash", get_hash_form()); }, 2000);
function get_hash_form() {
for (editor in tinymce.editors) { | modified the time for post editor of changed content verification | owen2345_camaleon-cms | train | js |
1f23adbfc6cdc93473a84f9d024ab7ee4c00497d | diff --git a/src/modes/simple_select.js b/src/modes/simple_select.js
index <HASH>..<HASH> 100644
--- a/src/modes/simple_select.js
+++ b/src/modes/simple_select.js
@@ -16,7 +16,7 @@ SimpleSelect.onSetup = function(opts) {
boxSelectElement: undefined,
boxSelecting: false,
canBoxSelect: false,
- dragMoveing: false,
+ dragMoving: false,
canDragMove: false,
initiallySelectedFeatureIds: opts.featureIds || []
}; | Fix typo on property name (#<I>) | mapbox_mapbox-gl-draw | train | js |
3b7608ea1649daacf252f2219b1e4d1133c5c2f3 | diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
setup(
name='django-rest-passwordreset',
- version='1.0.0',
+ version='1.1.0rc1',
packages=find_packages(),
include_package_data=True,
license='BSD License', | Releasing version <I>rc1 | anx-ckreuzberger_django-rest-passwordreset | train | py |
58df3fa435230c7f8d218f23580b6a45454c297d | diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index <HASH>..<HASH> 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -935,8 +935,6 @@ pluginMgr.getResRules = function(req, res, callback) {
getRulesMgr('resRules', req, res, function(pluginRulesMgr) {
if (!pluginRulesMgr && resScriptRules) {
pluginRulesMgr = parseRulesList(req, resScriptRules, true);
- req.curUrl = req.fullUrl;
- util.mergeRules(req, pluginRulesMgr.resolveRules(req), true);
}
req.resScriptRules = resScriptRules = null;
callback(pluginRulesMgr); | fix: repetitive injection res rules | avwo_whistle | train | js |
2f9e68cc88888983870acc8f18ac0fa0887a658d | diff --git a/spec/integration/basic/delete/rails_admin_basic_delete_spec.rb b/spec/integration/basic/delete/rails_admin_basic_delete_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/integration/basic/delete/rails_admin_basic_delete_spec.rb
+++ b/spec/integration/basic/delete/rails_admin_basic_delete_spec.rb
@@ -50,4 +50,18 @@ describe "RailsAdmin Basic Delete" do
should_not have_selector("a[href=\"/admin/comment/#{@comment.id}\"]")
end
end
+
+ describe "delete of an object which has an associated item without id" do
+ before(:each) do
+ @player = FactoryGirl.create :player
+ Player.any_instance.stub(:draft).and_return(Draft.new)
+ visit delete_path(:model_name => "player", :id => @player.id)
+ end
+
+ it "should show \"Delete model\"" do
+ should_not have_content("Routing Error")
+ should have_content("delete this player")
+ should have_link(@player.name, :href => "/admin/player/#{@player.id}")
+ end
+ end
end | Failing spec for #<I> | sferik_rails_admin | train | rb |
39d5be5c14297ce7801578bbe024211a3910da0f | diff --git a/lib/commands/plugin.js b/lib/commands/plugin.js
index <HASH>..<HASH> 100644
--- a/lib/commands/plugin.js
+++ b/lib/commands/plugin.js
@@ -1,6 +1,7 @@
var fs = require('fs');
var path = require('path');
+var _ = require('underscore');
var request = require('request');
var h = require('../helper');
@@ -66,11 +67,18 @@ function install(src) {
dststream.on('close', function() {
log.debug('copied to ' + dst);
- // install dependencies
+ // install dependencies for current platform
var plugin = require(path.relative(__dirname, dst));
- if (plugin.deps.length === 0) return;
-
- var cmd = 'npm install --save ' + plugin.deps.join(' ');
+ var deps = _.map(plugin.deps, function(x) {
+ var parts = x.split(':');
+ if (parts.length > 1 && parts[1] !== process.platform)
+ return '';
+ else
+ return parts[0];
+ }).join(' ').trim();
+ if (deps.length === 0) return;
+
+ var cmd = 'npm install --save ' + deps;
log.debug(cmd);
require('child_process').execSync(cmd, {
cwd: path.resolve(__dirname, '../..') | [Plugin] only install dependencies for current platform. | skygragon_leetcode-cli | train | js |
905b82d97b603c463b2ade300e8f07e0d172253b | diff --git a/src/org/nutz/dao/impl/NutDao.java b/src/org/nutz/dao/impl/NutDao.java
index <HASH>..<HASH> 100644
--- a/src/org/nutz/dao/impl/NutDao.java
+++ b/src/org/nutz/dao/impl/NutDao.java
@@ -1186,11 +1186,6 @@ public class NutDao extends DaoSupport implements Dao {
.setAfter(_pojo_fetchInt);
expert.formatQuery(pojo);
_exec(pojo);
- List<T> list = pojo.getList(classOfT);
- if (list != null && list.size() > 0)
- for (T t : list) {
- _fetchLinks(t, regex, false, true, true, null);
- }
return pojo.getInt(0);
} | fix: countByJoin没做对 | nutzam_nutz | train | java |
43bc625ee0b344a1665c81a181365222bd5324b6 | diff --git a/Form/Type/Filter/BooleanFilterType.php b/Form/Type/Filter/BooleanFilterType.php
index <HASH>..<HASH> 100644
--- a/Form/Type/Filter/BooleanFilterType.php
+++ b/Form/Type/Filter/BooleanFilterType.php
@@ -19,7 +19,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* @author Paweł Jędrzejewski <[email protected]>
*/
-class BooleanFilterType extends AbstractType
+final class BooleanFilterType extends AbstractType
{
/**
* {@inheritdoc}
diff --git a/Form/Type/Filter/StringFilterType.php b/Form/Type/Filter/StringFilterType.php
index <HASH>..<HASH> 100644
--- a/Form/Type/Filter/StringFilterType.php
+++ b/Form/Type/Filter/StringFilterType.php
@@ -21,7 +21,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
/**
* @author Paweł Jędrzejewski <[email protected]>
*/
-class StringFilterType extends AbstractType
+final class StringFilterType extends AbstractType
{
/**
* {@inheritdoc} | Make forms & related stuff final again | Sylius_SyliusGridBundle | train | php,php |
104e6b20501b23824fcbc3160fc354dc98645c5c | diff --git a/swarm/pss/notify/notify_test.go b/swarm/pss/notify/notify_test.go
index <HASH>..<HASH> 100644
--- a/swarm/pss/notify/notify_test.go
+++ b/swarm/pss/notify/notify_test.go
@@ -51,6 +51,7 @@ func TestStart(t *testing.T) {
ID: "0",
DefaultService: "bzz",
})
+ defer net.Shutdown()
leftNodeConf := adapters.RandomNodeConfig()
leftNodeConf.Services = []string{"bzz", "pss"}
leftNode, err := net.NewNodeWithConfig(leftNodeConf) | swarm/pss/notify: shutdown net in TestStart to fix OOM issue (#<I>) | ethereum_go-ethereum | train | go |
21883154ff504fb4737195be1c2248e28d48b777 | diff --git a/src/Gaufrette/Adapter/PhpseclibSftp.php b/src/Gaufrette/Adapter/PhpseclibSftp.php
index <HASH>..<HASH> 100644
--- a/src/Gaufrette/Adapter/PhpseclibSftp.php
+++ b/src/Gaufrette/Adapter/PhpseclibSftp.php
@@ -185,12 +185,12 @@ class PhpseclibSftp implements Adapter,
$this->initialized = true;
}
- protected function ensureDirectoryExists($directory, $create = false)
+ protected function ensureDirectoryExists($directory, $create)
{
$pwd = $this->sftp->pwd();
if ($this->sftp->chdir($directory)) {
$this->sftp->chdir($pwd);
- } elseif ($this->create) {
+ } elseif ($create) {
if (!$this->sftp->mkdir($directory, 0777, true)) {
throw new \RuntimeException(sprintf('The directory \'%s\' does not exist and could not be created (%s).', $this->directory, $this->sftp->getLastSFTPError()));
} | Creating new directories did not work.
When using write() or rename() no new directories have been created, if __construct(..., ..., false) was given.
Seemed to be typo, because all calls to ensureDirectoryExists give a value for $create. Because of this, the default value was removed. | KnpLabs_Gaufrette | train | php |
45da8270ff1db0bfe366fc85d56b6b4861cb05c0 | diff --git a/zipline/data/us_equity_pricing.py b/zipline/data/us_equity_pricing.py
index <HASH>..<HASH> 100644
--- a/zipline/data/us_equity_pricing.py
+++ b/zipline/data/us_equity_pricing.py
@@ -46,6 +46,7 @@ from pandas.tslib import iNaT
from six import (
iteritems,
viewkeys,
+ string_types,
)
from zipline.data.session_bars import SessionBarReader
@@ -856,7 +857,7 @@ class SQLiteAdjustmentWriter(object):
overwrite=False):
if isinstance(conn_or_path, sqlite3.Connection):
self.conn = conn_or_path
- elif isinstance(conn_or_path, str):
+ elif isinstance(conn_or_path, string_types):
if overwrite:
try:
remove(conn_or_path) | BUG: Fixes zipline ingest with non-default bundle on python 2 | quantopian_zipline | train | py |
5338bc7f4915224c9a7f7e30c0ee86ebc8388807 | diff --git a/src/js/components/Box.js b/src/js/components/Box.js
index <HASH>..<HASH> 100644
--- a/src/js/components/Box.js
+++ b/src/js/components/Box.js
@@ -12,12 +12,15 @@ import { announce } from '../utils/Announcer';
const CLASS_ROOT = CSSClassnames.BOX;
const BACKGROUND_COLOR_INDEX = CSSClassnames.BACKGROUND_COLOR_INDEX;
+const LIGHT_HINT_REGEXP = /^light/;
export default class Box extends Component {
- constructor () {
- super();
+ constructor (props) {
+ super(props);
this.state = {
+ darkBackground:
+ (props.colorIndex && ! LIGHT_HINT_REGEXP.test(props.colorIndex)),
mouseActive: false
};
} | Change Box to set an initial darkBackground state based solely on the colorIndex name. | grommet_grommet | train | js |
929087267cc700e5f9012edf7619de39f4e86dd5 | diff --git a/src/test/java/reactor/ipc/netty/tcp/TcpClientTests.java b/src/test/java/reactor/ipc/netty/tcp/TcpClientTests.java
index <HASH>..<HASH> 100644
--- a/src/test/java/reactor/ipc/netty/tcp/TcpClientTests.java
+++ b/src/test/java/reactor/ipc/netty/tcp/TcpClientTests.java
@@ -258,13 +258,13 @@ public class TcpClientTests {
}).then())
)
.wiretap()
- .connectNow(Duration.ofSeconds(3000));
+ .connectNow(Duration.ofSeconds(30));
System.out.println("Connected");
c.onDispose()
.log()
- .block(Duration.ofSeconds(3000));
+ .block(Duration.ofSeconds(30));
assertTrue("Expected messages not received. Received " + strings.size() + " messages: " + strings,
latch.await(15, TimeUnit.SECONDS)); | Correct the duration time used in the test | reactor_reactor-netty | train | java |
60e281a3827e180e9af6efdd6338780868d449c1 | diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -4,7 +4,7 @@ var responseBuilder = require('apier-responsebuilder');
// if true, no reject will be done but it will automatically respond
// with an INTERNAL_SERVER_ERROR
-exports.handleError = true;
+exports.handleErrors = true;
/**
* Create a new documents
@@ -168,7 +168,7 @@ exports.update = function(req, res, mongoose, customSchema, schemaName,
function callback(req, res, resolve, reject, error, result, action) {
if (error) {
reqlog.error('internal server error', error);
- if (exports.handleError) {
+ if (exports.handleErrors) {
responseBuilder.error(req, res, 'INTERNAL_SERVER_ERROR');
} else {
reject(error); | Renamed handleError option to handleErrors | Knorcedger_mongoose-schema-extender | train | js |
21e79fae3de1dfa8fb6821e16714e14af27bf6d1 | diff --git a/src/WPametu/UI/MetaBox.php b/src/WPametu/UI/MetaBox.php
index <HASH>..<HASH> 100644
--- a/src/WPametu/UI/MetaBox.php
+++ b/src/WPametu/UI/MetaBox.php
@@ -114,7 +114,7 @@ abstract class MetaBox extends Singleton
* @param string $post_type
* @param \WP_Post $post
*/
- public function override($post_type, \WP_Post $post){
+ public function override($post_type, $post){
if( $this->is_valid_post_type($post_type) ){
foreach( $this->fields as $name => $vars ){
switch( $name ){ | Fix override method on MetaBox because of type hint error | hametuha_wpametu | train | php |
b3d3282ae6730839a3dbd13870d712b62ffdf7c6 | diff --git a/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java b/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java
index <HASH>..<HASH> 100644
--- a/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java
+++ b/eureka-core/src/main/java/com/netflix/eureka/registry/AbstractInstanceRegistry.java
@@ -69,7 +69,6 @@ import static com.netflix.eureka.util.EurekaMonitors.*;
* </p>
*
* @author Karthik Ranganathan
- * @author Gang Li
*
*/
public abstract class AbstractInstanceRegistry implements InstanceRegistry { | Judge more elegant
Remove the author's label | Netflix_eureka | train | java |
3ec52ce4826b6100354351d8544704d8a413c72c | diff --git a/src/dt2js.js b/src/dt2js.js
index <HASH>..<HASH> 100644
--- a/src/dt2js.js
+++ b/src/dt2js.js
@@ -76,6 +76,7 @@ function fixFileTypeProperties (obj) {
return { mediaType: el }
})
}
+ delete obj['x-amf-fileTypes']
}
return obj
}
diff --git a/test/unit/dt2js_unit.test.js b/test/unit/dt2js_unit.test.js
index <HASH>..<HASH> 100644
--- a/test/unit/dt2js_unit.test.js
+++ b/test/unit/dt2js_unit.test.js
@@ -36,7 +36,6 @@ describe('dt2js.fixFileTypeProperties()', function () {
}
expect(fixFileTypeProperties(data)).to.deep.equal({
type: 'string',
- 'x-amf-fileTypes': [],
media: {
binaryEncoding: 'binary'
}
@@ -50,7 +49,6 @@ describe('dt2js.fixFileTypeProperties()', function () {
}
expect(fixFileTypeProperties(data)).to.deep.equal({
type: 'string',
- 'x-amf-fileTypes': ['image/png', 'image/jpg'],
media: {
binaryEncoding: 'binary',
anyOf: [ | Remove fileTypes property from produced json | raml-org_ramldt2jsonschema | train | js,js |
72d16a17715614d228a5604c169278bd8b611f57 | diff --git a/list.js b/list.js
index <HASH>..<HASH> 100644
--- a/list.js
+++ b/list.js
@@ -28,6 +28,7 @@ function empty() {
return new List()
}
exports.empty = empty
+make.define(List, function(tail, head) { return new List(head, tail) })
function list() {
var items = arguments, count = items.length, tail = empty()
@@ -36,15 +37,6 @@ function list() {
}
exports.list = list
-function cons(head, tail) {
- var list = new List()
- list.head = head
- list.tail = tail
- list.length = count(tail) + 1
- return list
-}
-exports.cons = cons
-
function filter(source, f) {
return f(first(source)) ? cons(first(source), filter(rest(source)), f) :
filter(rest(source), f)
diff --git a/sequence.js b/sequence.js
index <HASH>..<HASH> 100644
--- a/sequence.js
+++ b/sequence.js
@@ -14,11 +14,19 @@ exports.first = first
var rest = Method()
exports.rest = rest
+var make = Method()
+exports.make = make
+
var isEmpty = Method(function(sequence) {
return count(sequence) === 0
})
exports.isEmpty = isEmpty
+function cons(head, tail) {
+ return make(tail, head)
+}
+exports.cons = cons
+
function next(source) {
return rest(source)
} | Define `make` polymorphic method and implement `cons` using it. | Gozala_reducers | train | js,js |
e2064ef695032e75e963cf0a2f378b0563badafe | diff --git a/src/Helper/Constants.php b/src/Helper/Constants.php
index <HASH>..<HASH> 100644
--- a/src/Helper/Constants.php
+++ b/src/Helper/Constants.php
@@ -269,6 +269,8 @@ class Constants
public const USER_MANGA_LIST_CURRENTLY_PUBLISHING = 1;
public const USER_MANGA_LIST_FINISHED_PUBLISHING = 2;
public const USER_MANGA_LIST_NOT_YET_PUBLISHED = 3;
+ public const USER_MANGA_LIST_ON_HIATUS = 4;
+ public const USER_MANGA_LIST_DISCONTINUED = 5;
public const USER_LIST_SORT_DESCENDING = 1;
public const USER_LIST_SORT_ASCENDING = -1; | add new manga status: "on hiatus" & "discontinued" constants [ci skip] | jikan-me_jikan | train | php |
26c98781854f8e7a46d14ae4df3c9acee6a28660 | diff --git a/graphenebase/bip38.py b/graphenebase/bip38.py
index <HASH>..<HASH> 100644
--- a/graphenebase/bip38.py
+++ b/graphenebase/bip38.py
@@ -51,6 +51,11 @@ def encrypt(privkey, passphrase):
:rtype: Base58
"""
+ if isinstance(privkey, str):
+ privkey = PrivateKey(privkey)
+ else:
+ privkey = PrivateKey(repr(privkey))
+
privkeyhex = repr(privkey) # hex
addr = format(privkey.bitcoin.address, "BTC")
if sys.version > '3': | Allow to load encrypt with string too | xeroc_python-graphenelib | train | py |
38cdc65a9fa03bac65729de38586c01ec8aad8b1 | diff --git a/src/MultiRequest.php b/src/MultiRequest.php
index <HASH>..<HASH> 100644
--- a/src/MultiRequest.php
+++ b/src/MultiRequest.php
@@ -182,7 +182,7 @@ class MultiRequest{
$this->options->window_size = $url_count;
}
- foreach(range(0, $this->options->window_size) as $i){
+ foreach(range(1, $this->options->window_size) as $i){
$this->createHandle();
} | fixed an off-by-one error | chillerlan_php-curl | train | php |
fe3f123486cb63709552ff4dfa824a67ec05a999 | diff --git a/classes/WPCC/CLI.php b/classes/WPCC/CLI.php
index <HASH>..<HASH> 100644
--- a/classes/WPCC/CLI.php
+++ b/classes/WPCC/CLI.php
@@ -88,7 +88,9 @@ class CLI extends \WP_CLI_Command {
* ### OPTIONS
*
* <suite>
- * : The suite name to run.
+ * : The suite name to run. There are three types of suites available to
+ * use: unit, functional and acceptance, but currently only acceptance tests
+ * are supported.
*
* <test>
* : The test name to run.
@@ -98,9 +100,10 @@ class CLI extends \WP_CLI_Command {
*
* ### EXAMPLE
*
- * wp composer run
- * wp composer run my_test1
- * wp composer run my_suit1
+ * wp codeception run
+ * wp codeception run acceptance
+ * wp codeception run acceptance my_custom_test
+ * wp codeception run --steps
*
* @synopsis [<suite>] [<test>] [--steps]
* | Updated CLI run command description. | 10up_wp-codeception | train | php |
47532ae5b4b314bfb0aac34511cb6bc1570f67ca | diff --git a/lib/big_index/resource.rb b/lib/big_index/resource.rb
index <HASH>..<HASH> 100644
--- a/lib/big_index/resource.rb
+++ b/lib/big_index/resource.rb
@@ -193,6 +193,11 @@ module BigIndex
index_configuration[:fields].select{|field| field_list.include?(field.field_name)}
end
+ def index_field(field_name)
+ if index_configuration[:fields].include?(field_name)
+ index_configuration[:fields].select{|field| field.field_name == field_name}.first
+ end
+ end
##
#
@@ -338,10 +343,9 @@ module BigIndex
options[:fields] ||= index_views_hash[:default]
# quote the query if the field type is :string
- if options[:fields].select{|f| f.to_s == "#{finder_name}" }.first.field_type == :string
- query = "#{finder_name}:(\\"\#{user_query}\\")"
- else
- query = "#{finder_name}:(\#{user_query})"
+ if finder_field = index_field(finder_name)
+ (finder_field.field_type == :string) ?
+ query = "#{finder_name}:(\\"\#{user_query}\\")" : query = "#{finder_name}:(\#{user_query})"
end
if options[:source] == :index | Bigindex update
* Updated the dynamic finder functionality again. | openplaces_bigindex | train | rb |
4e6b7b79bd3295163595e283db73bcf7dfefa8a6 | diff --git a/lxd/device/nic_routed.go b/lxd/device/nic_routed.go
index <HASH>..<HASH> 100644
--- a/lxd/device/nic_routed.go
+++ b/lxd/device/nic_routed.go
@@ -270,7 +270,7 @@ func (d *nicRouted) Start() (*deviceConfig.RunConfig, error) {
saveData["last_state.created"] = fmt.Sprintf("%t", statusDev != "existing")
// If we created a VLAN interface, we need to setup the sysctls on that interface.
- if statusDev == "created" {
+ if shared.IsTrue(saveData["last_state.created"]) {
err := d.setupParentSysctls(d.effectiveParentName)
if err != nil {
return nil, err | lxd/device/nic/routed: Align with macvlan logic for setting up vlan interface | lxc_lxd | train | go |
72d198efcb82d37af3262d40ea88fa4cafaebf2c | diff --git a/linkcheck/checker/tests/httptest.py b/linkcheck/checker/tests/httptest.py
index <HASH>..<HASH> 100644
--- a/linkcheck/checker/tests/httptest.py
+++ b/linkcheck/checker/tests/httptest.py
@@ -87,13 +87,6 @@ class NoQueryHttpRequestHandler (StoppableHttpRequestHandler):
self.remove_path_query()
super(NoQueryHttpRequestHandler, self).do_HEAD()
- def end_headers (self):
- """
- Send short keep-alive header.
- """
- self.send_header("Keep-Alive", "5")
- super(NoQueryHttpRequestHandler, self).end_headers()
-
class HttpServerTest (linkcheck.checker.tests.LinkCheckTest):
""" | don't send keep-alive header, it breaks some tests
git-svn-id: <URL> | wummel_linkchecker | train | py |
08b34cc9b44775561c805276d7fa0dc6be231368 | diff --git a/src/main/java/com/ecyrd/speed4j/log/Slf4jLog.java b/src/main/java/com/ecyrd/speed4j/log/Slf4jLog.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/ecyrd/speed4j/log/Slf4jLog.java
+++ b/src/main/java/com/ecyrd/speed4j/log/Slf4jLog.java
@@ -37,7 +37,8 @@ public class Slf4jLog extends Log
*/
public void setSlf4jLogname(String logName)
{
- if( logName.isEmpty() )
+ // use length() == 0 instead of isEmpty() for Java 5 compatibility
+ if( logName.length() == 0 )
{
m_log = null;
} | Remove String.isEmpty() for Java 5 compatibility.
Without this change the setSlf4jLogname() call triggers a
NoSuchMethodException on Java 5 that propogates up through
SetterUtil.set() and yields an "An unknown setting...
Continuing nevertheless." error during initialization. | jalkanen_speed4j | train | java |
31cfc3b924b7d67cb7869ed566e39d15133770e7 | diff --git a/tests/Translation/TranslationTranslatorTest.php b/tests/Translation/TranslationTranslatorTest.php
index <HASH>..<HASH> 100755
--- a/tests/Translation/TranslationTranslatorTest.php
+++ b/tests/Translation/TranslationTranslatorTest.php
@@ -36,6 +36,7 @@ class TranslationTranslatorTest extends PHPUnit_Framework_TestCase {
{
$t = $this->getMock('Illuminate\Translation\Translator', null, array($this->getLoader(), 'en'));
$t->getLoader()->shouldReceive('load')->once()->with('en', 'bar', 'foo')->andReturn(array('foo' => 'foo', 'baz' => 'breeze :foo :foobar'));
+ $this->assertEquals('breeze bar taylor', $t->get('foo::bar.baz', array('foo' => 'bar', 'foobar' => 'taylor'), 'en'));
$this->assertEquals('breeze foo bar baz taylor', $t->get('foo::bar.baz', array('foo' => 'foo bar baz', 'foobar' => 'taylor'), 'en'));
$this->assertEquals('foo', $t->get('foo::bar.foo'));
} | Add test for translator replacements back. | laravel_framework | train | php |
ef7ef3aa73983b497000bd726bc720186f505c16 | diff --git a/js/uploader.js b/js/uploader.js
index <HASH>..<HASH> 100755
--- a/js/uploader.js
+++ b/js/uploader.js
@@ -100,10 +100,6 @@
uploadFile: function()
{
- if(this.options.onbeforeupload.call(this) === false) {
- return;
- }
-
try {
this._validate();
}
@@ -112,6 +108,9 @@
return;
}
+ if(this.options.onbeforeupload.call(this) === false) {
+ return;
+ }
// upload
if(this.options.transport) {
this['_' + this.options.transport + 'Upload'](); | beforeupload event avter validation | sokil_php-upload | train | js |
823c18bfc341229eb43d021e4ed04e74266cdb7d | diff --git a/lib/capybara/node/finders.rb b/lib/capybara/node/finders.rb
index <HASH>..<HASH> 100644
--- a/lib/capybara/node/finders.rb
+++ b/lib/capybara/node/finders.rb
@@ -147,16 +147,16 @@ module Capybara
private
def resolve_query(query, exact=nil)
- elements = synchronize do
- if query.selector.format==:css
+ synchronize do
+ elements = if query.selector.format==:css
base.find_css(query.css)
else
base.find_xpath(query.xpath(exact))
end.map do |node|
Capybara::Node::Element.new(session, node, self, query)
end
+ Capybara::Result.new(elements, query)
end
- Capybara::Result.new(elements, query)
end
end
end | Move result creation into synchronize block, closes #<I> | teamcapybara_capybara | train | rb |
d32e7c7e317f4d6719ffdc5de3aecff710952c56 | diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/projectCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/projectCommands.js
index <HASH>..<HASH> 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/projectCommands.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/projectCommands.js
@@ -292,6 +292,7 @@ define(['require', 'i18n!orion/navigate/nls/messages', 'orion/webui/littlelib',
tooltip: "Deploy to " + launchConfiguration.Name,
id: "orion.launchConfiguration.deploy." + launchConfiguration.ServiceId + launchConfiguration.Name,
imageClass: "core-sprite-deploy",
+ isDeployProject: true,
callback: function(data) {
var item = forceSingleItem(data.items); | Add isDeployProject to launchconf commands | eclipse_orion.client | train | js |
53fb44c7f2fe1307deb68b7e6596695281763356 | diff --git a/statscraper/base_scraper.py b/statscraper/base_scraper.py
index <HASH>..<HASH> 100644
--- a/statscraper/base_scraper.py
+++ b/statscraper/base_scraper.py
@@ -195,6 +195,10 @@ class Dataset(Item):
def fetch(self, query=None):
""" Ask the scraper to return data for the current dataset
"""
+ # First of all: Select this dataset
+ if self.scraper.current_item is not self:
+ self.scraper.select(self)
+ # Fetch can be called multiple times with different queries
hash_ = self._hash
if hash_ not in self._data:
self._data[hash_] = ResultSet()
@@ -292,10 +296,16 @@ class BaseScraper(object):
return self
def select(self, id_):
- """ Select an item by its id """
+ """ Select an item by id (str), or dataset """
try:
# Move cursor to new item, and reset the cached list of subitems
- self.current_item = filter(lambda x: x.id == id_, self.items).pop()
+ if isinstance(id_, basestring):
+ def f(x): return (x.id == id_)
+ elif isinstance(id_, Item):
+ def f(x): return (x is id_)
+ else:
+ raise StopIteration
+ self.current_item = filter(f, self.items).pop()
self._collection_path.append(self.current_item)
self._items.empty()
except StopIteration: | allow selecting dataset by reference; make sure dataset is selected when accessed | jplusplus_statscraper | train | py |
0e385af6734960be8db49110c5e699b5c46d46ab | diff --git a/spec/support/bosh_command_helper.rb b/spec/support/bosh_command_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/support/bosh_command_helper.rb
+++ b/spec/support/bosh_command_helper.rb
@@ -1,19 +1,17 @@
module Bosh::Spec
module CommandHelper
def run(cmd)
- Bundler.with_clean_env do
- lines = []
- IO.popen(cmd).each do |line|
- puts line.chomp
- lines << line.chomp
- end.close # force the process to close so that $? is set
+ lines = []
+ IO.popen(cmd).each do |line|
+ puts line.chomp
+ lines << line.chomp
+ end.close # force the process to close so that $? is set
- cmd_out = lines.join("\n")
- if $?.success?
- return cmd_out
- else
- raise "Failed: '#{cmd}' from #{Dir.pwd}, with exit status #{$?.to_i}\n\n #{cmd_out}"
- end
+ cmd_out = lines.join("\n")
+ if $?.success?
+ return cmd_out
+ else
+ raise "Failed: '#{cmd}' from #{Dir.pwd}, with exit status #{$?.to_i}\n\n #{cmd_out}"
end
end | ci external tests to use bosh_cli from bundled environment | cloudfoundry_bosh | train | rb |
2bded0b088e1cd4cb418dacfbd60814f0b87d22e | diff --git a/testing/test_pdb.py b/testing/test_pdb.py
index <HASH>..<HASH> 100644
--- a/testing/test_pdb.py
+++ b/testing/test_pdb.py
@@ -329,7 +329,7 @@ def check(func, expected, terminal_size=None):
print()
for pattern, string in zip_longest(expected, lines):
if pattern is not None and string is not None:
- if is_prompt(pattern):
+ if is_prompt(pattern) and is_prompt(string):
ok = True
else:
try: | tests: check: only skip re.match with prompts actually (#<I>)
Fixes 3bd0be8. | antocuni_pdb | train | py |
360d73d00d2141a9676a4a8ee195e0c4df02f613 | diff --git a/src/Redmine/Client/NativeCurlClient.php b/src/Redmine/Client/NativeCurlClient.php
index <HASH>..<HASH> 100644
--- a/src/Redmine/Client/NativeCurlClient.php
+++ b/src/Redmine/Client/NativeCurlClient.php
@@ -272,7 +272,7 @@ final class NativeCurlClient implements Client
case 'post':
$curlOptions[CURLOPT_POST] = 1;
if ($this->isUploadCallAndFilepath($path, $body)) {
- @trigger_error('Upload an attachment by filepath is deprecated, use file_get_contents() to upload the file content instead.', E_USER_DEPRECATED);
+ @trigger_error('Uploading an attachment by filepath is deprecated, use file_get_contents() to upload the file content instead.', E_USER_DEPRECATED);
$file = fopen($body, 'r');
$size = filesize($body); | Update src/Redmine/Client/NativeCurlClient.php | kbsali_php-redmine-api | train | php |
d453dbdb404d41200e8b657dbebaebc782950e8a | diff --git a/default_app/forkedProcess.js b/default_app/forkedProcess.js
index <HASH>..<HASH> 100644
--- a/default_app/forkedProcess.js
+++ b/default_app/forkedProcess.js
@@ -1,14 +1,31 @@
const os = require('os')
const path = require('path')
+const {spawn} = require('child_process')
+let submitURL = 'http://localhost:1127/post'
let productName = 'Child Product'
let companyName = 'Child Company'
let tmpPath = path.join(os.tmpdir(), productName + ' Crashes')
+if (process.platform === 'win32') {
+ const args = [
+ '--reporter-url=' + submitURL,
+ '--application-name=' + productName,
+ '--crashes-directory=' + tmpPath
+ ]
+ const env = {
+ ELECTRON_INTERNAL_CRASH_SERVICE: 1
+ }
+ spawn(process.execPath, args, {
+ env: env,
+ detached: true
+ })
+}
+
process.crashReporter.start({
productName: productName,
companyName: companyName,
- submitURL: 'http://localhost:1127/post',
+ submitURL: submitURL,
crashesDirectory: tmpPath,
extra: {
randomData1: 'The Holidays are here!', | Support crash reporting from child process in Windows | electron_electron | train | js |
3b284bf7432548ca22bb611aea22418628619beb | diff --git a/lib/meme_captain/draw.rb b/lib/meme_captain/draw.rb
index <HASH>..<HASH> 100644
--- a/lib/meme_captain/draw.rb
+++ b/lib/meme_captain/draw.rb
@@ -36,7 +36,10 @@ module MemeCaptain
# Return the number of pixels of padding to account for this object's
# stroke width.
def stroke_padding
- @stroke_width.to_i * 2
+ # Each side of the text needs stroke_width / 2 pixels of padding
+ # because half of the stroke goes inside the text and half goes
+ # outside. The / 2 and * 2 (each side) cancel.
+ @stroke_width.to_i
end
# Override and set instance variable because there is apparently no way to | Adding too much padding for stroke.
Only half of the stroke goes outside the text so the padding was
twice as large as it should have been. | mmb_meme_captain | train | rb |
e22516907b04a21fd2bd3d6ef9fbc17bd0e30f1c | diff --git a/examples/prebind.js b/examples/prebind.js
index <HASH>..<HASH> 100644
--- a/examples/prebind.js
+++ b/examples/prebind.js
@@ -1,15 +1,18 @@
+'use strict';
var XMPP = require('node-xmpp-client');
-var client = new XMPP({
+(new XMPP({
jid: '[email protected]',
password: 'secret',
boshURL: 'http://example.com/http-bind',
preferred: 'PLAIN',
wait: '60',
prebind:function(err,data){
- /*
- data.sid
- data.rid
- */
+ if(err) throw new Error(err);
+ else return data;
+ /*
+ data.sid
+ data.rid
+ */
}
-});
\ No newline at end of file
+}))();
\ No newline at end of file | Modifications for travis build | xmppjs_xmpp.js | train | js |
eecd75409ff2618e999d4acd722b07cbcf15e7bb | diff --git a/closure/goog/events/eventtype.js b/closure/goog/events/eventtype.js
index <HASH>..<HASH> 100644
--- a/closure/goog/events/eventtype.js
+++ b/closure/goog/events/eventtype.js
@@ -143,6 +143,7 @@ goog.events.EventType = {
PAUSE: 'pause',
PLAY: 'play',
PLAYING: 'playing',
+ PROGRESS: 'progress',
RATECHANGE: 'ratechange',
SEEKED: 'seeked',
SEEKING: 'seeking', | Added progress event type to media events.
RELNOTES[NEW]: Add "progress" string constant to EventType
-------------
Created by MOE: <URL> | google_closure-library | train | js |
5fa6d40e97f40fe4f474e669549b5afed10dcdc4 | diff --git a/core/core.js b/core/core.js
index <HASH>..<HASH> 100644
--- a/core/core.js
+++ b/core/core.js
@@ -696,9 +696,9 @@ exports.core.EventBinder.prototype.enable = function(value) {
var protoEvent = function(prefix, proto, name, callback) {
var sname = prefix + '__' + name
//if property was in base prototype, create shallow copy and put our handler there or we would add to base prototype's array
- var ownStorage = proto.hasOwnProperty(sname)
var storage = proto[sname]
- if (storage != undefined) {
+ if (storage !== undefined) {
+ var ownStorage = proto.hasOwnProperty(sname)
if (ownStorage)
storage.push(callback)
else { | removed useless hasOwnProperty, use !== undefined instead of != | pureqml_qmlcore | train | js |
d7fb1fb98ffe16f5e2ef9e71edf0f2ec050d678e | diff --git a/src/test/java/com/bladecoder/ink/runtime/test/RuntimeSpecTest.java b/src/test/java/com/bladecoder/ink/runtime/test/RuntimeSpecTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/com/bladecoder/ink/runtime/test/RuntimeSpecTest.java
+++ b/src/test/java/com/bladecoder/ink/runtime/test/RuntimeSpecTest.java
@@ -20,7 +20,7 @@ public class RuntimeSpecTest {
List<String> text = new ArrayList<String>();
String json = TestUtils.getJsonString("inkfiles/runtime/external-function.ink.json").replace('\uFEFF', ' ');
- Story story = new Story(json);
+ final Story story = new Story(json);
story.bindExternalFunction("externalFunction", new ExternalFunction() { | Added final to story to make It Java 7 compatible | bladecoder_blade-ink | train | java |
97bef8eb35434d89d457e74874b7205e7962b787 | diff --git a/lib/yaks/config.rb b/lib/yaks/config.rb
index <HASH>..<HASH> 100644
--- a/lib/yaks/config.rb
+++ b/lib/yaks/config.rb
@@ -37,7 +37,7 @@ module Yaks
# @param [Hash] env
# @return [Yaks::Format::CollectionJson, Yaks::Format::Hal, Yaks::Format::JsonApi]
def format_class(opts, env)
- accept = Rack::Accept::Charset.new(env['HTTP_ACCEPT'])
+ accept = Rack::Accept::MediaType.new(env['HTTP_ACCEPT'])
mime_type = accept.best_of(Format.mime_types.values)
return Format.by_mime_type(mime_type) if mime_type
Format.by_name(opts.fetch(:format) { @default_format }) | Use Rack::Accept::MediaType for mime type check
although `Rack::Accept::Charset` works, `Rack::Accept::MediaType` seems to be the "correct way" of testing against mime types. | plexus_yaks | train | rb |
15bbae0682254e71f69bf9179b4664b0223c385b | diff --git a/src/PatternLab/Watcher.php b/src/PatternLab/Watcher.php
index <HASH>..<HASH> 100644
--- a/src/PatternLab/Watcher.php
+++ b/src/PatternLab/Watcher.php
@@ -65,8 +65,6 @@ class Watcher extends Builder {
// set-up the Dispatcher
$dispatcherInstance = Dispatcher::getInstance();
$dispatcherInstance->dispatch("watcher.start");
- popen("php /Users/dmolsen/Sites/patternlab-project/dev/development-edition/vendor/pattern-lab/plugin-reload/src/PatternLab/Reload/AutoReloadServer.php", "r");
- print "hello world";
// automatically start the auto-refresh tool
// DEPRECATED | removing error message output that i missed | pattern-lab_patternlab-php-core | train | php |
f93015f295e667b6fe8ff7a9eb1910a9e1ade517 | diff --git a/guacamole/src/main/frontend/src/app/client/services/guacTranslate.js b/guacamole/src/main/frontend/src/app/client/services/guacTranslate.js
index <HASH>..<HASH> 100644
--- a/guacamole/src/main/frontend/src/app/client/services/guacTranslate.js
+++ b/guacamole/src/main/frontend/src/app/client/services/guacTranslate.js
@@ -47,7 +47,7 @@
* A promise which resolves with a TranslationResult containing the results from
* the translation attempt.
*/
- function translateWithFallback(translationId, defaultTranslationId) {
+ var translateWithFallback = function translateWithFallback(translationId, defaultTranslationId) {
const deferredTranslation = $q.defer();
// Attempt to translate the requested translation ID | GUACAMOLE-<I>: Match convention for function services. | glyptodon_guacamole-client | train | js |
ade93aaeb157dd21ab1e8428dab9b252918a915b | diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/gitCommitList.js b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/gitCommitList.js
index <HASH>..<HASH> 100644
--- a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/gitCommitList.js
+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/gitCommitList.js
@@ -601,6 +601,7 @@ define([
});
section.domNode.classList.add("gitFilterBox"); //$NON-NLS-0$
var filter = document.createElement("input"); //$NON-NLS-0$
+ filter.setAttribute("aria-labelledby", title + "commitFilterSectionTitle"); //$NON-NLS-1$ //$NON-NLS-0$
filter.className = "gitFilterInput"; //$NON-NLS-0$
filter.placeholder = messages["Filter " + query.key];
section.query = query; | Bug <I> - Git filter dropdown input elements need semantic label connections (#<I>) | eclipse_orion.client | train | js |
1ae1e3cf31cc8b3f79fd66c856791b6b9fb87857 | diff --git a/saltcloud/utils/__init__.py b/saltcloud/utils/__init__.py
index <HASH>..<HASH> 100644
--- a/saltcloud/utils/__init__.py
+++ b/saltcloud/utils/__init__.py
@@ -85,3 +85,12 @@ def get_option(option, opts, vm_):
if option in opts:
return opts[option]
+def minion_conf_string(opts, vm_):
+ '''
+ Return a string to be passed into the deployment script for the minion
+ configuration file
+ '''
+ minion = {}
+ minion.update(opts.get('minion', {}))
+ minion.update(vm_.get('minion', {}))
+ return yaml.safe_dump(minion) | Add function to return the configuration string for a minion
Based on information passed into the config file of a vm definition | saltstack_salt | train | py |
5680e2da693e3ab99d9a5ea30abc7b1b13d0b375 | diff --git a/src/components/picker/PickerItem.js b/src/components/picker/PickerItem.js
index <HASH>..<HASH> 100644
--- a/src/components/picker/PickerItem.js
+++ b/src/components/picker/PickerItem.js
@@ -139,9 +139,9 @@ class PickerItem extends BaseComponent {
// TODO: deprecate the check for object
onPress = () => {
- const {value, onPress} = this.props;
- // onPress(_.isObject(value) ? value : {value, label});
- onPress(value);
+ const {value, label, onPress} = this.props;
+ onPress(_.isObject(value) ? value : {value, label});
+ // onPress(value);
};
} | Fix issue with Picker API migration - multi mode support is broken in the new API | wix_react-native-ui-lib | train | js |
e028d90cf892210dd65b2c25bfb69f29b07e6732 | diff --git a/adafruit_ads1x15/adafruit_ads1x15.py b/adafruit_ads1x15/adafruit_ads1x15.py
index <HASH>..<HASH> 100644
--- a/adafruit_ads1x15/adafruit_ads1x15.py
+++ b/adafruit_ads1x15/adafruit_ads1x15.py
@@ -31,6 +31,7 @@ CircuitPython driver for ADS1015/1115 ADCs.
__version__ = "0.0.0-auto.0"
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ADS1x15.git"
+import time
from micropython import const
from adafruit_bus_device.i2c_device import I2CDevice
@@ -211,7 +212,7 @@ class ADS1x15(object):
self._write_register(ADS1X15_POINTER_CONFIG, config)
# Wait for conversion to complete
while not self._conversion_complete():
- pass
+ time.sleep(0.01)
# Return the result
return self.get_last_result() | change pass to time.sleep | adafruit_Adafruit_CircuitPython_ADS1x15 | train | py |
ed590de8dd654dd94400542d023e95ce8581d783 | diff --git a/src/Composer/Command/ConfigCommand.php b/src/Composer/Command/ConfigCommand.php
index <HASH>..<HASH> 100644
--- a/src/Composer/Command/ConfigCommand.php
+++ b/src/Composer/Command/ConfigCommand.php
@@ -76,7 +76,7 @@ You can add a repository to the global config.json file by passing in the
To edit the file in an external editor:
- <comment>%command.full_name% --edit</comment>
+ <comment>%command.full_name% --editor</comment>
To choose your editor you can set the "EDITOR" env variable.
@@ -87,7 +87,7 @@ To get a list of configuration values in the file:
You can always pass more than one option. As an example, if you want to edit the
global config.json file.
- <comment>%command.full_name% --edit --global</comment>
+ <comment>%command.full_name% --editor --global</comment>
EOT
)
; | typo
I see, that exist a typo error. | mothership-ec_composer | train | php |
c61d66e7591932fe9e466792801ebec386c00c6a | diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,4 @@
-import testSaga from './testSaga';
-import expectSaga from './expectSaga';
-
-export default testSaga;
-export { testSaga, expectSaga };
+export testSaga from './testSaga';
+export expectSaga from './expectSaga';
export * as matchers from './expectSaga/matchers';
export * as providers from './expectSaga/providers'; | Remove default export in favor of only named exports | jfairbank_redux-saga-test-plan | train | js |
2a255427935f30eb361c2116a9c83b55fbf76528 | diff --git a/holder.js b/holder.js
index <HASH>..<HASH> 100644
--- a/holder.js
+++ b/holder.js
@@ -1,4 +1,4 @@
-/*
+/*!
Holder - 2.3 - client side image placeholders
(c) 2012-2014 Ivan Malopinsky / http://imsky.co | Use "/*!" to ensure attribution comment is preserved
There is a convention among JS (and CSS) minifiers that comments which use the /*! ... */ format will be preserved.
This is primarily intended to be used for licensing and attribution information, like this file header comment. | imsky_holder | train | js |
77f534e782ac961fd94a2de19db842c1bbef0d2e | diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@ setup(name="sirmordred",
'sirmordred'
],
install_requires=[
- 'grimoire-elk>=0.31',
+ 'grimoire-elk>=0.32',
'kidash>=0.4.13',
'manuscripts>=0.2.16',
'sortinghat>=0.7',
diff --git a/sirmordred/_version.py b/sirmordred/_version.py
index <HASH>..<HASH> 100644
--- a/sirmordred/_version.py
+++ b/sirmordred/_version.py
@@ -1,2 +1,2 @@
# Versions compliant with PEP 440 https://www.python.org/dev/peps/pep-0440
-__version__ = "0.1.47"
+__version__ = "0.2.0" | [release] Update version number to <I> | chaoss_grimoirelab-sirmordred | train | py,py |
ebebcda4db6f87308430125e31a034a9609a0cc2 | diff --git a/src/main/java/water/fvec/Vec.java b/src/main/java/water/fvec/Vec.java
index <HASH>..<HASH> 100644
--- a/src/main/java/water/fvec/Vec.java
+++ b/src/main/java/water/fvec/Vec.java
@@ -611,6 +611,8 @@ public class Vec extends Iced {
}
}
+ @Override public void reduce(CollectDomain mrt) { Utils.or(this._dom, mrt._dom); }
+
/** Returns exact numeric domain of given vector computed by this task.
* The domain is always sorted. Hence:
* domain()[0] - minimal domain value | Update in CollectDomain.
The reduce method was missing (hence CD worked in local scenario,
failing in distributed one in the data was distributed in skewed way). | h2oai_h2o-2 | train | java |
03098df6ef35f4ecf3f42fdd3b895e9c891813b5 | diff --git a/user/filters/profilefield.php b/user/filters/profilefield.php
index <HASH>..<HASH> 100644
--- a/user/filters/profilefield.php
+++ b/user/filters/profilefield.php
@@ -74,14 +74,12 @@ class user_filter_profilefield extends user_filter_type {
*/
public function get_profile_fields() {
global $DB;
- if (!$fields = $DB->get_records('user_info_field', null, 'shortname', 'id,shortname')) {
+ if (!$fields = $DB->get_records_menu('user_info_field', null, 'name', 'id, name')) {
return null;
}
$res = array(0 => get_string('anyfield', 'filters'));
- foreach ($fields as $k => $v) {
- $res[$k] = $v->shortname;
- }
- return $res;
+
+ return $res + $fields;
}
/** | MDL-<I> user: show full profile field name in filter element. | moodle_moodle | train | php |
192e186119ce1bbead4e0233b2de2192076b86c5 | diff --git a/pkg/client/cache/store.go b/pkg/client/cache/store.go
index <HASH>..<HASH> 100644
--- a/pkg/client/cache/store.go
+++ b/pkg/client/cache/store.go
@@ -57,7 +57,10 @@ func MetaNamespaceKeyFunc(obj interface{}) (string, error) {
if err != nil {
return "", fmt.Errorf("object has no meta: %v", err)
}
- return meta.Namespace() + "/" + meta.Name(), nil
+ if len(meta.Namespace()) > 0 {
+ return meta.Namespace() + "/" + meta.Name(), nil
+ }
+ return meta.Name(), nil
}
type cache struct { | If an object has no namespace, do not add a leading slash | kubernetes_kubernetes | train | go |
15c7a00292f3e1b4276f77935df5dec44b5662c6 | diff --git a/panwid/datatable/cells.py b/panwid/datatable/cells.py
index <HASH>..<HASH> 100644
--- a/panwid/datatable/cells.py
+++ b/panwid/datatable/cells.py
@@ -76,7 +76,8 @@ class DataTableCell(urwid.WidgetWrap):
@property
def value(self):
if self.column.value_fn:
- val = self.column.value_fn(self.table, self.row)
+ row = self.table.get_dataframe_row_object(self.row.index)
+ val = self.column.value_fn(self.table, row)
else:
val = self.row[self.column.name]
return val | Pass underlying object to column value function in datatable | tonycpsu_panwid | train | py |
549d052710e7c35ed27a91b9de41a49b56a2afe1 | diff --git a/lib/compiler/passes/report-left-recursion.js b/lib/compiler/passes/report-left-recursion.js
index <HASH>..<HASH> 100644
--- a/lib/compiler/passes/report-left-recursion.js
+++ b/lib/compiler/passes/report-left-recursion.js
@@ -1,5 +1,5 @@
var utils = require("../../utils"),
- GrammarError = require("../../grammar-error.js");
+ GrammarError = require("../../grammar-error");
/* Checks that no left recursion is present. */
module.exports = function(ast) {
diff --git a/lib/compiler/passes/report-missing-rules.js b/lib/compiler/passes/report-missing-rules.js
index <HASH>..<HASH> 100644
--- a/lib/compiler/passes/report-missing-rules.js
+++ b/lib/compiler/passes/report-missing-rules.js
@@ -1,5 +1,5 @@
var utils = require("../../utils"),
- GrammarError = require("../../grammar-error.js");
+ GrammarError = require("../../grammar-error");
/* Checks that all referenced rules exist. */
module.exports = function(ast) { | Make |GrammarError| require work also in the browser version
Fixes a bug from ac<I>cda7bae7bef<I>d<I>e3f<I>e5eed<I>b<I>ef (a fix for
GH-<I>). | pegjs_pegjs | train | js,js |
9250a311510692c81f3e4e6588fe513172ad0e5d | diff --git a/lib/chrome/webdriver/index.js b/lib/chrome/webdriver/index.js
index <HASH>..<HASH> 100644
--- a/lib/chrome/webdriver/index.js
+++ b/lib/chrome/webdriver/index.js
@@ -73,6 +73,7 @@ module.exports.configureBuilder = function(builder, baseDir, options) {
// If we run in Docker we need to always use no-sandbox
if (options.docker) {
chromeOptions.addArguments('--no-sandbox');
+ chromeOptions.addArguments('--disable-setuid-sandbox');
}
if (options.xvfb && (options.xvfb === true || options.xvfb === 'true')) { | is disable-setuid-sandbox used? better safe than sorry (#<I>) | sitespeedio_browsertime | train | js |
0afb296eea46a7b16cba7ffc32a00091b9c48c7b | diff --git a/app/models/user.rb b/app/models/user.rb
index <HASH>..<HASH> 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -18,7 +18,8 @@ class User < ActiveRecord::Base
# Devise method overridden to allow sign in with email or username
def self.find_for_database_authentication(warden_conditions)
conditions = warden_conditions.dup
- if login = conditions.delete(:login)
+ login = conditions.delete(:login)
+ if login
where(conditions).where(['lower(username) = :value OR lower(email) = :value', { value: login.downcase }]).first
else
where(conditions).first | void assingment in conditional | vicvega_chaltron | train | rb |
5b3a3e28d7666e5e93f3b4fc9c27714c751af9a8 | diff --git a/python/pyspark/mllib/__init__.py b/python/pyspark/mllib/__init__.py
index <HASH>..<HASH> 100644
--- a/python/pyspark/mllib/__init__.py
+++ b/python/pyspark/mllib/__init__.py
@@ -18,3 +18,13 @@
"""
Python bindings for MLlib.
"""
+
+# MLlib currently needs Python 2.7+ and NumPy 1.7+, so complain if lower
+
+import sys
+if sys.version_info[0:2] < (2, 7):
+ raise Exception("MLlib requires Python 2.7+")
+
+import numpy
+if numpy.version.version < '1.7':
+ raise Exception("MLlib requires NumPy 1.7+") | Complain if Python and NumPy versions are too old for MLlib | apache_spark | train | py |
5981bee1c8e2d5f36d9ee7df1415a377e406d741 | diff --git a/lib/fog/terremark/requests/get_organizations.rb b/lib/fog/terremark/requests/get_organizations.rb
index <HASH>..<HASH> 100644
--- a/lib/fog/terremark/requests/get_organizations.rb
+++ b/lib/fog/terremark/requests/get_organizations.rb
@@ -14,7 +14,8 @@ module Fog
request({
:expects => 200,
:headers => {
- 'Authorization' => "Basic #{Base64.encode64("#{@terremark_username}:#{@terremark_password}").chomp!}"
+ 'Authorization' => "Basic #{Base64.encode64("#{@terremark_username}:#{@terremark_password}").chomp!}",
+ 'Content-Type' => "application/vnd.vmware.vcloud.orgList+xml"
},
:method => 'POST',
:parser => Fog::Parsers::Terremark::GetOrganizations.new, | [terremark] add content-type to get_organizations | fog_fog | train | rb |
696109a3cec2905df72a32cd6179bdab8555dce8 | diff --git a/lib/ufo/dsl/helper.rb b/lib/ufo/dsl/helper.rb
index <HASH>..<HASH> 100644
--- a/lib/ufo/dsl/helper.rb
+++ b/lib/ufo/dsl/helper.rb
@@ -30,7 +30,9 @@ module Ufo
def env_vars(text)
lines = filtered_lines(text)
lines.map do |line|
- key,*value = line.strip.split("=").map {|x| x.strip}
+ key,*value = line.strip.split("=").map do |x|
+ remove_surrounding_quotes(x.strip)
+ end
value = value.join('=')
{
name: key,
@@ -39,6 +41,16 @@ module Ufo
end
end
+ def remove_surrounding_quotes(s)
+ if s =~ /^"/ && s =~ /"$/
+ s.sub(/^["]/, '').gsub(/["]$/,'') # remove surrounding double quotes
+ elsif s =~ /^'/ && s =~ /'$/
+ s.sub(/^[']/, '').gsub(/[']$/,'') # remove surrounding single quotes
+ else
+ s
+ end
+ end
+
def filtered_lines(text)
lines = text.split("\n")
# remove comment at the end of the line | fix env vars helper to allow surrounding quotes | tongueroo_ufo | train | rb |
e932b55b7146ce382df35b8da18f357b66c44267 | diff --git a/src/service-broker.js b/src/service-broker.js
index <HASH>..<HASH> 100644
--- a/src/service-broker.js
+++ b/src/service-broker.js
@@ -509,11 +509,9 @@ class ServiceBroker {
else
serviceFiles = glob.sync(path.join(folder, fileMask));
- if (serviceFiles) {
- serviceFiles.forEach(filename => {
- this.loadService(filename);
- });
- }
+ if (serviceFiles)
+ serviceFiles.forEach(filename => this.loadService(filename));
+
return serviceFiles.length;
}
@@ -535,6 +533,7 @@ class ServiceBroker {
schema = require(fName);
} catch (e) {
this.logger.error(`Failed to load service '${fName}'`, e);
+ throw e;
}
let svc; | throw error in `loadService` | moleculerjs_moleculer | train | js |
ad97c745f05e32166995fd04219996a86d80d95a | diff --git a/fs/test.py b/fs/test.py
index <HASH>..<HASH> 100644
--- a/fs/test.py
+++ b/fs/test.py
@@ -1495,9 +1495,9 @@ class FSTestCases(object):
data = f.read()
self.assertEqual(data, b"bar")
- # upload to non-existing path (/foo/bar)
+ # upload to non-existing path (/spam/eggs)
with self.assertRaises(errors.ResourceNotFound):
- self.fs.upload("/foo/bar/baz", bytes_file)
+ self.fs.upload("/spam/eggs", bytes_file)
def test_upload_chunk_size(self):
test_data = b"bar" * 128 | Improve ResourceNotFound assertion in test_upload | PyFilesystem_pyfilesystem2 | train | py |
28309016a96941edc2922215be6b1c1fe1eaedbe | diff --git a/pandas/util/print_versions.py b/pandas/util/print_versions.py
index <HASH>..<HASH> 100644
--- a/pandas/util/print_versions.py
+++ b/pandas/util/print_versions.py
@@ -54,7 +54,7 @@ def get_sys_info():
def show_versions(as_json=False):
- import imp
+ import imp, importlib
sys_info = get_sys_info()
deps = [
@@ -89,7 +89,10 @@ def show_versions(as_json=False):
deps_blob = list()
for (modname, ver_f) in deps:
try:
- mod = imp.load_module(modname, *imp.find_module(modname))
+ try:
+ mod = imp.load_module(modname, *imp.find_module(modname))
+ except (ImportError):
+ mod = importlib.import_module(modname)
ver = ver_f(mod)
deps_blob.append((modname, ver))
except: | BLD: provide secondary catching of some imports in print_versions.py
for some reason imp can never find pytz, patsy | pandas-dev_pandas | train | py |
c0df01c0418bf92bf6fff68257953fa839aca797 | diff --git a/lib/nack/server.rb b/lib/nack/server.rb
index <HASH>..<HASH> 100644
--- a/lib/nack/server.rb
+++ b/lib/nack/server.rb
@@ -25,8 +25,15 @@ module Nack
self.server = UNIXServer.open(file)
self.server.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
- self.heartbeat = server.accept
- self.heartbeat.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+ readable, writable = IO.select([self.server], nil, nil, 3)
+
+ if readable && readable.first == self.server
+ self.heartbeat = server.accept_nonblock
+ self.heartbeat.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+ else
+ warn "No heartbeat connected"
+ exit 1
+ end
trap('TERM') { exit }
trap('INT') { exit } | Worker should timeout if heartbeat doesn't connect | josh_nack | train | rb |
d5f141dbbe6c7e1ab90e7ca94bb0b38af561fec5 | diff --git a/lottie/src/main/java/com/airbnb/lottie/BaseKeyframeAnimation.java b/lottie/src/main/java/com/airbnb/lottie/BaseKeyframeAnimation.java
index <HASH>..<HASH> 100644
--- a/lottie/src/main/java/com/airbnb/lottie/BaseKeyframeAnimation.java
+++ b/lottie/src/main/java/com/airbnb/lottie/BaseKeyframeAnimation.java
@@ -18,6 +18,7 @@ abstract class BaseKeyframeAnimation<K, A> {
// This is not a Set because we don't want to create an iterator object on every setProgress.
final List<AnimationListener> listeners = new ArrayList<>();
private boolean isDiscrete = false;
+ @Nullable private A previousValue;
private final List<? extends Keyframe<K>> keyframes;
private float progress = 0f;
@@ -48,8 +49,12 @@ abstract class BaseKeyframeAnimation<K, A> {
}
this.progress = progress;
- for (int i = 0; i < listeners.size(); i++) {
- listeners.get(i).onValueChanged();
+ A value = getValue();
+ if (previousValue == null || !previousValue.equals(value)) {
+ previousValue = value;
+ for (int i = 0; i < listeners.size(); i++) {
+ listeners.get(i).onValueChanged();
+ }
}
} | Only update an animation when the animation value actually changes | airbnb_lottie-android | train | java |
c2c64fbb6140fcd8f5d54335e173ece86c417bd4 | diff --git a/src/main/java/annis/visualizers/component/AbstractDotVisualizer.java b/src/main/java/annis/visualizers/component/AbstractDotVisualizer.java
index <HASH>..<HASH> 100644
--- a/src/main/java/annis/visualizers/component/AbstractDotVisualizer.java
+++ b/src/main/java/annis/visualizers/component/AbstractDotVisualizer.java
@@ -44,11 +44,8 @@ public abstract class AbstractDotVisualizer extends AbstractVisualizer {
@Override
public ImagePanel createComponent(final VisualizerInput visInput, VisualizationToggle visToggle) {
- try {
-
- final PipedOutputStream out = new PipedOutputStream();
- final PipedInputStream in = new PipedInputStream(out);
-
+ try (PipedOutputStream out = new PipedOutputStream();
+ PipedInputStream in = new PipedInputStream(out)) {
new Thread(() -> writeOutput(visInput, out)).start();
@@ -61,7 +58,6 @@ public abstract class AbstractDotVisualizer extends AbstractVisualizer {
emb.setStandby("loading image");
emb.setAlternateText("DOT graph visualization");
return new ImagePanel(emb);
-
} catch (IOException ex) {
log.error(null, ex);
} | Make sure to close the piped input/output streams by wrapping it in the try-statement | korpling_ANNIS | train | java |
598f49915a2f34d9e0d867a207d11b0a115406b8 | diff --git a/picker/picker.go b/picker/picker.go
index <HASH>..<HASH> 100644
--- a/picker/picker.go
+++ b/picker/picker.go
@@ -185,7 +185,7 @@ func clip(x float64) float64 {
func (mwr *remotesWeightedRandom) observe(peer api.Peer, weight float64) {
// While we have a decent, ad-hoc approach here to weight subsequent
- // observerations, we may want to look into applying forward decay:
+ // observations, we may want to look into applying forward decay:
//
// http://dimacs.rutgers.edu/~graham/pubs/papers/fwddecay.pdf
// | Fix typo in picker/picker.go | docker_swarmkit | train | go |
b52269c9f994c0e27459c60f6f473c781440eb87 | diff --git a/danceschool/financial/helpers.py b/danceschool/financial/helpers.py
index <HASH>..<HASH> 100644
--- a/danceschool/financial/helpers.py
+++ b/danceschool/financial/helpers.py
@@ -441,10 +441,7 @@ def createExpenseItemsForEvents(request=None, datetimeTuple=None, rule=None, eve
'event': staffer.event,
'category': expense_category,
'expenseRule': rule,
- 'description': (
- '%(type)s %(to)s %(name)s %(for)s: %(event)s, %(dates)s' %
- replacements,
- ),
+ 'description': '%(type)s %(to)s %(name)s %(for)s: %(event)s, %(dates)s' % replacements,
'submissionUser': submissionUser,
'hours': staffer.netHours,
'wageRate': rule.rentalRate, | Fixed issue with auto-generated expense descriptions. | django-danceschool_django-danceschool | train | py |
a364696eeca569c140ab1593df13de20347273f3 | diff --git a/sentinelhub/aws_safe.py b/sentinelhub/aws_safe.py
index <HASH>..<HASH> 100644
--- a/sentinelhub/aws_safe.py
+++ b/sentinelhub/aws_safe.py
@@ -248,7 +248,7 @@ class SafeTile(AwsTile):
safe[main_folder][AwsConstants.QI_DATA][self.get_img_name(AwsConstants.PVI)] = self.get_preview_url('L2A')
preview_type = 'L2A' if (self.data_collection is DataCollection.SENTINEL2_L2A
- and self.baseline >= '02.07') else 'L1C'
+ and (self.baseline >= '02.07' or self.baseline == '00.01')) else 'L1C'
safe[main_folder][AwsConstants.QI_DATA][self.get_preview_name()] = self.get_preview_url(preview_type)
safe[main_folder][self.get_tile_metadata_name()] = self.get_url(AwsConstants.METADATA) | Change preview type of L2A reprocessed products | sentinel-hub_sentinelhub-py | train | py |
3679a9c37af9e8bc3ef21ef054e4a4ad59be8d13 | diff --git a/spec/api-menu-spec.js b/spec/api-menu-spec.js
index <HASH>..<HASH> 100644
--- a/spec/api-menu-spec.js
+++ b/spec/api-menu-spec.js
@@ -261,7 +261,7 @@ describe('Menu module', () => {
})
})
- describe('Menu.popup', () => {
+ describe.only('Menu.popup', () => {
let w = null
let menu
@@ -285,14 +285,14 @@ describe('Menu module', () => {
})
it('should emit menu-will-show event', (done) => {
- menu.popup(w)
menu.on('menu-will-show', () => { done() })
+ menu.popup(w)
})
it('should emit menu-will-close event', (done) => {
+ menu.on('menu-will-close', () => { done() })
menu.popup(w)
menu.closePopup()
- menu.on('menu-will-close', () => { done() })
})
it('returns immediately', () => { | fix event callback placement in spec | electron_electron | train | js |
bfa3695412b45b829c7709eeb3e4424efd7af69e | diff --git a/src/BootstrapForm.php b/src/BootstrapForm.php
index <HASH>..<HASH> 100644
--- a/src/BootstrapForm.php
+++ b/src/BootstrapForm.php
@@ -144,7 +144,7 @@ class BootstrapForm
if ($options['model']->exists) {
$route = Str::contains($options['update'], '@') ? 'action' : 'route';
- $options[$route] = [$options['update'], $options['model']->getKey()];
+ $options[$route] = [$options['update'], $options['model']->getRouteKey()];
$options['method'] = 'PUT';
} else {
// Otherwise, we're storing a brand new model using the POST method. | User routable key instead of primary key (#<I>) | dwightwatson_bootstrap-form | train | php |
4fe0df5b4dfbe161cf1ad8bb5183c61506b556b6 | diff --git a/packages/material-ui/src/AccordionSummary/AccordionSummary.js b/packages/material-ui/src/AccordionSummary/AccordionSummary.js
index <HASH>..<HASH> 100644
--- a/packages/material-ui/src/AccordionSummary/AccordionSummary.js
+++ b/packages/material-ui/src/AccordionSummary/AccordionSummary.js
@@ -144,7 +144,9 @@ AccordionSummary.propTypes = {
* See [CSS API](#css) below for more details.
*/
classes: chainPropTypes(PropTypes.object, (props) => {
- if (props.classes.focused.indexOf(' ') !== -1) {
+ // Guard against when generation of classes is disabled in the stylesheets (`disableGeneration`).
+ // For `disableGeneration` we don't have an accurate warning but `disableGeneration` is an advanced use case anyway.
+ if (props.classes.focused !== undefined && props.classes.focused.indexOf(' ') !== -1) {
return new Error(
[
'Material-UI: The `classes.focused` key is deprecated.', | [AccordionSummary] Fix false-positive propType warning with `disableG… (#<I>) | mui-org_material-ui | train | js |
571f8da92ad2bc21261af5cd562c8dbfdcd445ed | diff --git a/lib/active_admin/table_builder/column.rb b/lib/active_admin/table_builder/column.rb
index <HASH>..<HASH> 100644
--- a/lib/active_admin/table_builder/column.rb
+++ b/lib/active_admin/table_builder/column.rb
@@ -13,7 +13,7 @@ module ActiveAdmin
private
def pretty_title(raw)
- raw.is_a?(Symbol) ? raw.to_s.gsub('_', ' ').capitalize : raw
+ raw.is_a?(Symbol) ? raw.to_s.split('_').collect{|s| s.capitalize }.join(' ') : raw
end
end
diff --git a/spec/active_admin/table_builder_spec.rb b/spec/active_admin/table_builder_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/active_admin/table_builder_spec.rb
+++ b/spec/active_admin/table_builder_spec.rb
@@ -17,16 +17,16 @@ describe ActiveAdmin::TableBuilder do
describe "when creating a simple column" do
before(:each) do
@builder = TableBuilder.new(@user) do |t|
- t.column :username
+ t.column :first_name
end
end
it "should set the column title" do
- @builder.columns.first.title.should == 'Username'
+ @builder.columns.first.title.should == 'First Name'
end
it "should set the column data" do
- @builder.columns.first.data.should == :username
+ @builder.columns.first.data.should == :first_name
end
end | Updated to spec out the titlecasing of titles on the form | activeadmin_activeadmin | train | rb,rb |
98778aa32e6b4ec0ce597445e96d65c4b978ec28 | diff --git a/rxjava-core/src/test/java/rx/internal/operators/OperatorReduceTest.java b/rxjava-core/src/test/java/rx/internal/operators/OperatorReduceTest.java
index <HASH>..<HASH> 100644
--- a/rxjava-core/src/test/java/rx/internal/operators/OperatorReduceTest.java
+++ b/rxjava-core/src/test/java/rx/internal/operators/OperatorReduceTest.java
@@ -16,6 +16,7 @@
package rx.internal.operators;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
@@ -114,4 +115,18 @@ public class OperatorReduceTest {
verify(observer, times(1)).onError(any(TestException.class));
}
+ @Test(timeout = 13000)
+ public void testBackpressure() throws InterruptedException {
+ Observable<Integer> source = Observable.from(1, 2, 3, 4, 5, 6);
+ Observable<Integer> reduced = source.reduce(new Func2<Integer, Integer, Integer>() {
+ @Override
+ public Integer call(Integer i1, Integer i2) {
+ return i1 + i2;
+ }
+ });
+
+ Integer r = reduced.toBlocking().first();
+ assertEquals(21, r.intValue());
+ }
+
} | Failing unit test for reduce, showing it does not implement backpressure correctly | ReactiveX_RxJava | train | java |
18c4e759aa125d4f97f16807aca42c3254e7d86b | diff --git a/umap/distances.py b/umap/distances.py
index <HASH>..<HASH> 100644
--- a/umap/distances.py
+++ b/umap/distances.py
@@ -1305,4 +1305,4 @@ def pairwise_special_metric(X, Y=None, metric="hellinger", kwds=None):
return pairwise_distances(X, Y, metric=_partial_metric)
else:
special_metric_func = named_distances[metric]
- return chunked_parallel_special_metric(X, Y, metric=special_metric_func)
+ return parallel_special_metric(X, Y, metric=special_metric_func) | Fallback to the old approach for now per #<I> | lmcinnes_umap | train | py |
339ee37143ca5a6bb22bbc1b0468d785f450cfb7 | diff --git a/hugolib/testhelpers_test.go b/hugolib/testhelpers_test.go
index <HASH>..<HASH> 100644
--- a/hugolib/testhelpers_test.go
+++ b/hugolib/testhelpers_test.go
@@ -917,13 +917,12 @@ func content(c resource.ContentProvider) string {
func dumpPages(pages ...page.Page) {
fmt.Println("---------")
- for i, p := range pages {
+ for _, p := range pages {
var meta interface{}
if p.File() != nil && p.File().FileInfo() != nil {
meta = p.File().FileInfo().Meta()
}
- fmt.Printf("%d: Kind: %s Title: %-10s RelPermalink: %-10s Path: %-10s sections: %s Lang: %s Meta: %v\n",
- i+1,
+ fmt.Printf("Kind: %s Title: %-10s RelPermalink: %-10s Path: %-10s sections: %s Lang: %s Meta: %v\n",
p.Kind(), p.Title(), p.RelPermalink(), p.Path(), p.SectionsPath(), p.Lang(), meta)
}
} | Simplify test output to simplify diffing | gohugoio_hugo | train | go |
Subsets and Splits