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
e64d5d877b78949f452a5c9201a4c407d0673273
diff --git a/cli/includes/helpers.php b/cli/includes/helpers.php index <HASH>..<HASH> 100644 --- a/cli/includes/helpers.php +++ b/cli/includes/helpers.php @@ -16,7 +16,7 @@ define('VALET_STATIC_PREFIX', '41c270e4-5535-4daa-b23e-c269744c2f45'); define('VALET_LEGACY_HOME_PATH', $_SERVER['HOME'].'/.valet'); -define('PHP_BINARY_PATH', (new CommandLine())->runAsUser('echo $(brew --prefix)/bin/php')); +define('PHP_BINARY_PATH', (new CommandLine())->runAsUser('printf $(brew --prefix)/bin/php')); /** * Output the given text to the console.
Fix command to get binary path Because echo is include new line but printf is not include
laravel_valet
train
php
6567afdc756d0fb086799b1ced44802248917efe
diff --git a/test/index.js b/test/index.js index <HASH>..<HASH> 100644 --- a/test/index.js +++ b/test/index.js @@ -54,4 +54,20 @@ describe('funcDeps', function() { assert.equal(testDeps.func, test); }); }); + describe('called with inline annotated functions', function() { + it('handles functions with different args', function() { + function test(c, d) {} + test.$deps = ['a','b']; + var testDeps = funcDeps(test); + assert.deepEqual(testDeps.deps, ['a','b']); + assert.equal(testDeps.func, test); + }); + it('handles functions with no args', function() { + function test() {} + test.$deps = ['a','b']; + var testDeps = funcDeps(test); + assert.deepEqual(testDeps.deps, ['a','b']); + assert.equal(testDeps.func, test); + }); + }); });
Add tests for inline annotated functions
itsananderson_func-deps
train
js
749e403be6611d3405046aa672ec4cbdd5892873
diff --git a/tests/test_integration.py b/tests/test_integration.py index <HASH>..<HASH> 100644 --- a/tests/test_integration.py +++ b/tests/test_integration.py @@ -484,7 +484,12 @@ class TestSonosPlaylist(object): with pytest.raises(SoCoUPnPException): soco.remove_sonos_playlist("SQ:-7") # realistic non-existing - hpl_i = max([int(x.item_id.split(":")[1]) for x in soco.get_sonos_playlists()]) + playlists = soco.get_sonos_playlists() + # Accommodate the case of no existing playlists + if len(playlists) == 0: + hpl_i = 0 + else: + hpl_i = max([int(x.item_id.split(":")[1]) for x in playlists]) with pytest.raises(SoCoUPnPException): soco.remove_sonos_playlist("SQ:{}".format(hpl_i + 1))
Improve test_remove_playlist_bad_id() to accommodate no existing playlists
amelchio_pysonos
train
py
3923a4d503ba267231c898810b5c102b507bc359
diff --git a/src/main/java/org/dasein/cloud/google/compute/server/ServerSupport.java b/src/main/java/org/dasein/cloud/google/compute/server/ServerSupport.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/dasein/cloud/google/compute/server/ServerSupport.java +++ b/src/main/java/org/dasein/cloud/google/compute/server/ServerSupport.java @@ -524,11 +524,11 @@ public class ServerSupport extends AbstractVMSupport<Google> { Iterable<VirtualMachineProduct> candidateProduct = listProducts(options, null); for (VirtualMachineProduct product : candidateProduct) { - if ( options == null || options.matches(product) ) { + if (options == null || options.matches(product)) { products.add(product); } } - return products; + return products; } @Override
and forgot to save between staging, editing and comitting...
dasein-cloud_dasein-cloud-google
train
java
a712c94619c4432467cbcabd8ea6f9573c237594
diff --git a/lib/sample.js b/lib/sample.js index <HASH>..<HASH> 100644 --- a/lib/sample.js +++ b/lib/sample.js @@ -12,10 +12,6 @@ const readFileAsync = util.promisify(fs.readFile) const pathToSamples = path.join(__dirname, '../samples.json') module.exports = function (reporter, definition) { - if (reporter.compilation) { - reporter.compilation.resourceInTemp('samples.json', pathToSamples) - } - reporter.on('express-configure', (app) => { app.post('/studio/create-samples', async (req, res) => { const { ignore } = req.body.ignore @@ -73,9 +69,7 @@ async function createSamples (reporter) { await reporter.settings.addOrSet('sample-created', true) - const pathToResource = reporter.execution ? reporter.execution.resourceTempPath('samples.json') : pathToSamples - - const res = await readFileAsync(pathToResource) + const res = await readFileAsync(pathToSamples) const entities = JSON.parse(res) const found = await reporter.documentStore.collection('folders').findOne({
refactor exe compilation to be compatible with new pkg compilation
jsreport_jsreport-sample-template
train
js
cbf2cf2dca9022ce7967215d2aff6596d24ba603
diff --git a/sources/scalac/ast/TreeGen.java b/sources/scalac/ast/TreeGen.java index <HASH>..<HASH> 100644 --- a/sources/scalac/ast/TreeGen.java +++ b/sources/scalac/ast/TreeGen.java @@ -528,6 +528,14 @@ public class TreeGen implements Kinds, Modifiers, TypeTags { //######################################################################## // Public Methods - Building expressions + /** Builds an instance test with given value and type. */ + public Tree mkIsInstanceOf(int pos, Tree value, Type type) { + return mkApplyT_(pos, Select(value, definitions.IS), new Type[]{type}); + } + public Tree mkIsInstanceOf(Tree value, Type type) { + return mkIsInstanceOf(value.pos, value, type); + } + /** Builds a cast with given value and type. */ public Tree mkAsInstanceOf(int pos, Tree value, Type type) { return mkApplyT_(pos, Select(value, definitions.AS), new Type[]{type});
- Added methods isInstanceOf
scala_scala
train
java
b6b54342fbec06e54e10005ac17cd324f13bd9e9
diff --git a/anime.js b/anime.js index <HASH>..<HASH> 100644 --- a/anime.js +++ b/anime.js @@ -7,8 +7,20 @@ * Released under the MIT license */ -var anime = (function() { - +(function (root, factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define([], factory); + } else if (typeof module === 'object' && module.exports) { + // Node. Does not work with strict CommonJS, but + // only CommonJS-like environments that support module.exports, + // like Node. + module.exports = factory(); + } else { + // Browser globals (root is window) + root.anime = factory(); + } +}(this, function () { // Defaults var defaultSettings = { @@ -590,4 +602,4 @@ var anime = (function() { return animation; -})(); +});
make anime export as a UMD module
helixbass_animejs-hooks
train
js
58c46383875e3338be900312756c7ef4092a6252
diff --git a/closure/goog/db/error.js b/closure/goog/db/error.js index <HASH>..<HASH> 100644 --- a/closure/goog/db/error.js +++ b/closure/goog/db/error.js @@ -340,6 +340,8 @@ goog.db.Error.fromRequest = function(request, message) { * @param {!IDBDatabaseException} ex The exception that was thrown. * @param {string} message The error message to add to err if it's wrapped. * @return {!goog.db.Error} The error that caused the failure. + * @suppress {invalidCasts} The cast from IDBDatabaseException to DOMError + * is invalid and will not compile. */ goog.db.Error.fromException = function(ex, message) { if ('name' in ex) {
Fix issues blocking the JSCompiler release Most of these consist of - invalid type casts - function declarations in 'if' blocks, which are forbidden in future versions of JS - bad generic types DELTA=2 (2 added, 0 deleted, 0 changed) Revision created by MOE tool push_codebase. MOE_MIGRATION=<I> git-svn-id: <URL>
google_closure-library
train
js
bbdcb929d01e4e8a8dfc434360293444fc8bb00e
diff --git a/src/Dingo/Api/Api.php b/src/Dingo/Api/Api.php index <HASH>..<HASH> 100644 --- a/src/Dingo/Api/Api.php +++ b/src/Dingo/Api/Api.php @@ -100,11 +100,11 @@ class Api { */ public function currentRequestTargettingApi() { - if ($this->request->header('host') == $this->domain) + if ( ! is_null($this->domain) and $this->request->header('host') == $this->domain) { return true; } - elseif (preg_match('#^/'.$this->prefix.'(/?.*?)#', $this->request->getPathInfo())) + elseif ( ! is_null($this->prefix) and preg_match('#^/'.$this->prefix.'(/?.*?)#', $this->request->getPathInfo())) { return true; }
Fixed bug where all requests treated as API request.
laravie_api
train
php
231e94f2d2a621f71157188577e445e0af91ff9c
diff --git a/ipyrad/assemble/cluster_across.py b/ipyrad/assemble/cluster_across.py index <HASH>..<HASH> 100644 --- a/ipyrad/assemble/cluster_across.py +++ b/ipyrad/assemble/cluster_across.py @@ -1336,6 +1336,7 @@ def build_clustbits(data, ipyclient, force): uhandle = os.path.join(data.dirs.across, data.name+".utemp") usort = os.path.join(data.dirs.across, data.name+".utemp.sort") + async1 = "" ## skip usorting if not force and already exists if not os.path.exists(usort) or force: @@ -1379,9 +1380,13 @@ def build_clustbits(data, ipyclient, force): ## check for errors for job in [async1, async2, async3]: - if not job.successful(): - raise IPyradWarningExit(job.result()) - + try: + if not job.successful(): + raise IPyradWarningExit(job.result()) + except AttributeError: + ## If we skip usorting then async1 == "" so the call to + ## successful() raises, but we can ignore it. + pass def sub_build_clustbits(data, usort, nseeds):
Better handling for restarting jobs in substeps of step 6.
dereneaton_ipyrad
train
py
a9aeb135a9d4e473abfdb82fa8759144402ee06e
diff --git a/spec/client_spec.rb b/spec/client_spec.rb index <HASH>..<HASH> 100644 --- a/spec/client_spec.rb +++ b/spec/client_spec.rb @@ -128,10 +128,10 @@ describe Customerio::Client do Customerio::Client.should_receive(:post).with( "/api/v1/customers/5/events", { :basic_auth => anything(), - :body => { + :body => MultiJson.dump({ :name => "purchase", :data => { :type => "socks", :price => "13.99" } - }.to_json, + }), :headers=>{"Content-Type"=>"application/json"}}).and_return(response) client.track(5, "purchase", :type => "socks", :price => "13.99") end
Fix use of to_json in spec
customerio_customerio-ruby
train
rb
53d4147459facb172c0a538855258cbc5ec1058d
diff --git a/vagrant_box_defaults.rb b/vagrant_box_defaults.rb index <HASH>..<HASH> 100644 --- a/vagrant_box_defaults.rb +++ b/vagrant_box_defaults.rb @@ -3,10 +3,10 @@ Vagrant.require_version ">= 2.2.0" $SERVER_BOX = "cilium/ubuntu-dev" -$SERVER_VERSION= "186" +$SERVER_VERSION= "188" $NETNEXT_SERVER_BOX= "cilium/ubuntu-next" -$NETNEXT_SERVER_VERSION= "81" +$NETNEXT_SERVER_VERSION= "83" @v419_SERVER_BOX= "cilium/ubuntu-4-19" -@v419_SERVER_VERSION= "28" +@v419_SERVER_VERSION= "30" @v49_SERVER_BOX= "cilium/ubuntu" -@v49_SERVER_VERSION= "186" +@v49_SERVER_VERSION= "188"
vagrant: bump box versions These new box images include Go <I> (cilium/packer-ci-build#<I>) and pre-pull all Docker images which are currently used to build and test Cilium (cilium/packer-ci-build#<I> and cilium/packer-ci-build#<I>).
cilium_cilium
train
rb
0d9abc201205967436b220b0170ab4718032fdbf
diff --git a/src/components/fields/Select/index.js b/src/components/fields/Select/index.js index <HASH>..<HASH> 100644 --- a/src/components/fields/Select/index.js +++ b/src/components/fields/Select/index.js @@ -3,6 +3,7 @@ import Select from 'react-select' import autobind from 'autobind-decorator' import PropTypes from 'prop-types' import isEqual from 'lodash/isEqual' +import isNil from 'lodash/isNil' export default class SelectField extends React.Component { static propTypes = { @@ -26,7 +27,7 @@ export default class SelectField extends React.Component { componentDidUpdate(prevProps, prevState) { if (!isEqual(prevProps.options, this.props.options)) { - if (!this.getValue()) { + if (isNil(this.getValue())) { this.props.onChange(null) } } @@ -38,7 +39,7 @@ export default class SelectField extends React.Component { if (multi) { this.props.onChange(params.map(item => item.value)) } else { - if (params && params.value) { + if (params && !isNil(params.value)) { this.props.onChange(params.value) } else { this.props.onChange(null)
use isNil for select has value
orionsoft_parts
train
js
b9648bb92c3733da064b1e9c3aecc023bb52c8ec
diff --git a/test.js b/test.js index <HASH>..<HASH> 100755 --- a/test.js +++ b/test.js @@ -15,7 +15,7 @@ console.log('starting actionhero test suite with NODE_ENV=test'); var execeutable; if(process.platform === 'win32'){ - execeutable = 'mocha.bash'; + execeutable = 'mocha.cmd'; }else{ execeutable = 'mocha'; }
back to spawn; but with mocha.bat
actionhero_actionhero
train
js
9af0e11a5298a8135e43ae248e7f332a6d5fa442
diff --git a/src/Email/Swift5.php b/src/Email/Swift5.php index <HASH>..<HASH> 100644 --- a/src/Email/Swift5.php +++ b/src/Email/Swift5.php @@ -35,7 +35,7 @@ class Swift5 extends SwiftAbstract { $this->config = $config; if( !class_exists('\Swift_Mailer') ) { - require_once dirname(__FILE__).'../../../vendor/swiftmailer/swiftmailer/lib/swift_required.php'; + //require_once dirname(__FILE__).'../../../vendor/swiftmailer/swiftmailer/lib/swift_required.php'; } }
removes hardcoded include to swift
jaeger-app_email
train
php
92783d3721b52ff2dce70134408cf0486cd9fc0c
diff --git a/config/options.go b/config/options.go index <HASH>..<HASH> 100644 --- a/config/options.go +++ b/config/options.go @@ -143,6 +143,26 @@ func LoadOptions(ops Options) { }).Debug("Overriding Elastic startup timeout") options.ESStartupTimeout = minTimeout } + + if options.ZKReconnectStartDelay < 1 { + log.WithFields(logrus.Fields{ + "reconnectstartdelay": options.ZKReconnectStartDelay, + }).Debug("ZK_RECONNECT_START_DELAY too low; Resetting to 1 second") + options.ZKReconnectStartDelay = 1 + } + if options.ZKReconnectMaxDelay < 1 { + log.WithFields(logrus.Fields{ + "reconnectmaxdelay": options.ZKReconnectMaxDelay, + }).Debug("ZK_RECONNECT_MAX_DELAY too low; Resetting to 1 second") + options.ZKReconnectMaxDelay = 1 + } + if options.ZKReconnectStartDelay > options.ZKReconnectMaxDelay { + log.WithFields(logrus.Fields{ + "reconnectstartdelay": options.ZKReconnectStartDelay, + "reconnectmaxdelay": options.ZKReconnectMaxDelay, + }).Debug("ZK_RECONNECT_START_DELAY too large; Resetting to ZK_RECONNECT_MAX_DELAY") + options.ZKReconnectStartDelay = options.ZKReconnectMaxDelay + } } func MuxTLSIsEnabled() bool {
Make sure start and max delays meet minimum requirements
control-center_serviced
train
go
a898cb8342cfb5f49504d7030d95b4daa5a5e62a
diff --git a/src/main/java/org/skysql/jdbc/MySQLStatement.java b/src/main/java/org/skysql/jdbc/MySQLStatement.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/skysql/jdbc/MySQLStatement.java +++ b/src/main/java/org/skysql/jdbc/MySQLStatement.java @@ -303,7 +303,12 @@ public class MySQLStatement implements Statement { isClosed = true; if (queryResult != null) { queryResult.close(); + queryResult = null; } + // No possible future use for the cached results, so these can be cleared + // This makes the cache eligible for garbage collection earlier if the statement is not + // immediately garbage collected + cachedResultSets.clear(); if (!isStreaming()) return; synchronized (protocol) {
Null out cached statements early on when a statement is closed. Attempt to reduce memory overhead
MariaDB_mariadb-connector-j
train
java
d9f788e0863d46458ecd48760c5f13567c5e3677
diff --git a/test/com/google/javascript/jscomp/CommandLineRunnerTest.java b/test/com/google/javascript/jscomp/CommandLineRunnerTest.java index <HASH>..<HASH> 100644 --- a/test/com/google/javascript/jscomp/CommandLineRunnerTest.java +++ b/test/com/google/javascript/jscomp/CommandLineRunnerTest.java @@ -1884,7 +1884,6 @@ public final class CommandLineRunnerTest extends TestCase { private void test(String[] original, String[] compiled, DiagnosticType warning) { exitCodes.clear(); Compiler compiler = compile(original); - assertThat(exitCodes).containsExactly(0); if (warning == null) { assertEquals("Expected no warnings or errors\n" + @@ -1906,6 +1905,8 @@ public final class CommandLineRunnerTest extends TestCase { "\nResult: " + compiler.toSource(root) + "\n" + explanation, explanation); } + + assertThat(exitCodes).containsExactly(0); } /**
Move the exit code test to the end of the function so that it doesn't hide real error messages.
google_closure-compiler
train
java
1f8142ad5437d40d72db42486206452b8a1f5663
diff --git a/app/mailers/pointless_feedback/feedback_mailer.rb b/app/mailers/pointless_feedback/feedback_mailer.rb index <HASH>..<HASH> 100644 --- a/app/mailers/pointless_feedback/feedback_mailer.rb +++ b/app/mailers/pointless_feedback/feedback_mailer.rb @@ -14,7 +14,7 @@ module PointlessFeedback end def feedback_subject - I18n.t('pointless_feedback.email.subject', :default => 'Pointless Feedback') + I18n.t('pointless_feedback.email.subject', :default => 'Feedback') end end end
Changed default email subject to just "Feedback" - warmest regards
vigetlabs_pointless-feedback
train
rb
bb111597fc2214f02670fb5d2d35f374a5f98466
diff --git a/lib/active_file/hash_and_array_files.rb b/lib/active_file/hash_and_array_files.rb index <HASH>..<HASH> 100644 --- a/lib/active_file/hash_and_array_files.rb +++ b/lib/active_file/hash_and_array_files.rb @@ -13,7 +13,7 @@ module ActiveFile loaded_files = full_paths.collect { |path| load_path(path) } if loaded_files.all?{ |file_data| file_data.is_a?(Array) } - loaded_files.sum + loaded_files.sum([]) elsif loaded_files.all?{ |file_data| file_data.is_a?(Hash) } loaded_files.inject({}) { |hash, file_data| hash.merge(file_data) } else
Fix deprecation warning of `Enumerable#sum` ``` DEPRECATION WARNING: Rails <I> has deprecated Enumerable.sum in favor of Ruby's native implementation available since <I>. Sum of non-numeric elements requires an initial argument. ```
zilkey_active_hash
train
rb
ee0c1632358f5b13620e6c6dd744db8478599ab6
diff --git a/app/src/js/modules/omnisearch.js b/app/src/js/modules/omnisearch.js index <HASH>..<HASH> 100644 --- a/app/src/js/modules/omnisearch.js +++ b/app/src/js/modules/omnisearch.js @@ -49,8 +49,7 @@ results.push({ id: item.path, path: item.path, - text: item.label, - priority: item.priority + text: item.label }); });
Remove priority from result, as it is unused
bolt_bolt
train
js
783be9d089c276300d35ff7dba39f2e5b15afb1b
diff --git a/gulpfile.js b/gulpfile.js index <HASH>..<HASH> 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -121,8 +121,8 @@ gulp.task('build.js.dev', function () { var result = gulp.src([join(PATH.src.all, '**/*ts'), '!' + join(PATH.src.all, '**/*_spec.ts')]) .pipe(plumber()) - .pipe(sourcemaps.init()) .pipe(inlineNg2Template({ base: 'app' })) + .pipe(sourcemaps.init()) .pipe(tsc(tsProject)); return result.js
Move inlining as does not support source map yet
NathanWalker_angular-seed-advanced
train
js
464b2de2aa88067abda5a496266244ef7d101733
diff --git a/src/StrokerCache/Service/CacheService.php b/src/StrokerCache/Service/CacheService.php index <HASH>..<HASH> 100644 --- a/src/StrokerCache/Service/CacheService.php +++ b/src/StrokerCache/Service/CacheService.php @@ -86,17 +86,18 @@ class CacheService /** * @param array $tags + * @return bool */ public function clearByTags(array $tags = array()) { if (!$this->getCacheStorage() instanceof TaggableInterface) { - return; + return false; } $tags = array_map( function ($tag) { return self::TAG_PREFIX . $tag; }, $tags ); - $this->getCacheStorage()->clearByTags($tags); + return $this->getCacheStorage()->clearByTags($tags); } /**
clearByTags should return a boolean
bramstroker_zf2-fullpage-cache
train
php
f1ba020a3c93a45167914e05b2c427e16a5143ba
diff --git a/js/main.js b/js/main.js index <HASH>..<HASH> 100644 --- a/js/main.js +++ b/js/main.js @@ -1,5 +1,5 @@ /* - * jQuery File Upload Plugin JS Example 7.1 + * jQuery File Upload Plugin JS Example 7.1.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2010, Sebastian Tschan @@ -32,7 +32,8 @@ $(function () { ) ); - if (window.location.hostname === 'blueimp.github.com') { + if (window.location.hostname === 'blueimp.github.com' || + window.location.hostname === 'blueimp.github.io') { // Demo settings: $('#fileupload').fileupload('option', { url: '//jquery-file-upload.appspot.com/', @@ -75,10 +76,10 @@ $(function () { url: $('#fileupload').fileupload('option', 'url'), dataType: 'json', context: $('#fileupload')[0] + }).always(function (result) { + $(this).removeClass('fileupload-processing'); }).done(function (result) { - $(this) - .removeClass('fileupload-processing') - .fileupload('option', 'done') + $(this).fileupload('option', 'done') .call(this, null, {result: result}); }); }
Updated domain check for the demo settings. blueimp.github.com => blueimp.github.io
blueimp_jQuery-File-Upload
train
js
80ae979794f63689cd673928b9827f06b807b416
diff --git a/stagpy/processing.py b/stagpy/processing.py index <HASH>..<HASH> 100644 --- a/stagpy/processing.py +++ b/stagpy/processing.py @@ -155,8 +155,9 @@ def stream_function(step): x=r_coord, initial=0) for i_z, r_pos in enumerate(r_coord): - psi[:, i_z] = psi[0, i_z] / r_pos - \ - integrate.cumtrapz(r_pos * v_z[:, i_z], x=x_coord, initial=0) + psi[:, i_z] = psi[0, i_z] - \ + integrate.cumtrapz(r_pos**2 * v_z[:, i_z], + x=x_coord, initial=0) else: # assume cartesian geometry psi[0, :] = integrate.cumtrapz(v_x[0, :], x=step.geom.z_coord,
Fix stream function computation in spherical geom
StagPython_StagPy
train
py
010371aa2c6dba14426f10284057d4d52a89e767
diff --git a/packages/eslint-config-import/index.js b/packages/eslint-config-import/index.js index <HASH>..<HASH> 100644 --- a/packages/eslint-config-import/index.js +++ b/packages/eslint-config-import/index.js @@ -1,6 +1,6 @@ module.exports = { "parser": "babel-eslint", - "extends": "airbnb-base/rules/import", + "extends": "airbnb-base/rules/imports", "env": { "browser": true, "node": true,
fix(eslint-config-import): fix typo in airbnb rules name affects: @goldwasserexchange/eslint-config-import the rule package is called imports and not import
goldwasserexchange_public
train
js
75426a197b34bd68c43eef0c604cbe29138e9bf8
diff --git a/core/ports/jms/src/test/java/org/openengsb/core/ports/jms/JMSPortTest.java b/core/ports/jms/src/test/java/org/openengsb/core/ports/jms/JMSPortTest.java index <HASH>..<HASH> 100644 --- a/core/ports/jms/src/test/java/org/openengsb/core/ports/jms/JMSPortTest.java +++ b/core/ports/jms/src/test/java/org/openengsb/core/ports/jms/JMSPortTest.java @@ -228,8 +228,7 @@ public class JMSPortTest { JmsTemplate template = new JmsTemplate(cf); String request = "{\"callId\":\"12345\",\"answer\":true,\"classes\":[\"java.lang.String\"]," - + "\"methodName\":\"doSomething\",\"metaData\":{\"serviceId\":\"12345\"}," - + "\"args\":[\"Audit\"]}"; + + "\"methodName\":\"audit\",\"metaData\":{\"serviceId\":\"auditing\"}," + "\"args\":[\"Audit\"]}"; template.convertAndSend("receive", request); System.out.println(template.receiveAndConvert("12345")); }
Calling audit in TestCase
openengsb_openengsb
train
java
63607f34089cd22cdce353a4150bfc54bec3c75b
diff --git a/benchmarks/regression-test.js b/benchmarks/regression-test.js index <HASH>..<HASH> 100644 --- a/benchmarks/regression-test.js +++ b/benchmarks/regression-test.js @@ -17,6 +17,10 @@ fs.readFile('books.json', 'utf8', (err, data) => setupBenchmarks(JSON.parse(data).books) ); +var filter = process.argv.length === 3 + ? new RegExp(process.argv[2]) + : null; + var benchmarks = []; function setupBenchmarks(corpus) { @@ -67,6 +71,14 @@ function initBenchmark({ indexStrategy, searchIndex }) { + if ( + filter && + !indexStrategy.match(filter) && + !searchIndex.match(filter) + ) { + return; + } + console.log(`Initializing benchmark\t${indexStrategy}\t${searchIndex}`); initBenchmarkForCreateIndex({
Added support for filtering benchmarks
bvaughn_js-search
train
js
92585f198ba96cf98d250b05f02ca50e364fabfb
diff --git a/org/postgresql/jdbc2/TimestampUtils.java b/org/postgresql/jdbc2/TimestampUtils.java index <HASH>..<HASH> 100644 --- a/org/postgresql/jdbc2/TimestampUtils.java +++ b/org/postgresql/jdbc2/TimestampUtils.java @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- * -* Copyright (c) 2003-2011, PostgreSQL Global Development Group +* Copyright (c) 2003-2014, PostgreSQL Global Development Group * * *------------------------------------------------------------------------- @@ -793,7 +793,7 @@ public class TimestampUtils { if (tz == null) { tz = defaultTz; } - int offset = tz.getOffset(millis); + int offset = tz.getOffset(millis) + tz.getDSTSavings(); long timePart = millis % ONEDAY; if (timePart + offset >= ONEDAY) { millis += ONEDAY;
use DSTSavings when converting to timestamp
pgjdbc_pgjdbc
train
java
849c72d6d193f03d5eb997d27318591a39bf109f
diff --git a/src/multi.js b/src/multi.js index <HASH>..<HASH> 100644 --- a/src/multi.js +++ b/src/multi.js @@ -135,10 +135,10 @@ var multi = (function() { item_group.className = "item-group"; if ( option.parentNode.label ) { - var label = document.createElement("span"); - label.innerHTML = option.parentNode.label; - label.className = "group-label" - item_group.appendChild(label); + var groupLabel = document.createElement("span"); + groupLabel.innerHTML = option.parentNode.label; + groupLabel.className = "group-label" + item_group.appendChild(groupLabel); } select.wrapper.non_selected.appendChild(item_group);
Fixed issue where search wouldn’t work with optgroups
fabianlindfors_multi.js
train
js
2113bba977bb592c4d00f02060879d700af45969
diff --git a/deliver/lib/deliver/html_generator.rb b/deliver/lib/deliver/html_generator.rb index <HASH>..<HASH> 100644 --- a/deliver/lib/deliver/html_generator.rb +++ b/deliver/lib/deliver/html_generator.rb @@ -9,7 +9,8 @@ module Deliver def run(options, screenshots) begin - html_path = self.render(options, screenshots, '.') + fastlane_path = FastlaneCore::FastlaneFolder.path + html_path = self.render(options, screenshots, fastlane_path) rescue => ex UI.error(ex.inspect) UI.error(ex.backtrace.join("\n"))
[deliver] generate Preview.html file in fastlane directory like gitignore suggests (#<I>)
fastlane_fastlane
train
rb
54e748d83dba0564e378a5434014090e5efcb88d
diff --git a/Tests/ResourceMirrorTest.php b/Tests/ResourceMirrorTest.php index <HASH>..<HASH> 100644 --- a/Tests/ResourceMirrorTest.php +++ b/Tests/ResourceMirrorTest.php @@ -37,4 +37,15 @@ class ResourceMirrorTest extends \PHPUnit_Framework_TestCase $mirror = new ResourceMirror(new EventDispatcher(), 'http://example.com/', $tempDir = sys_get_temp_dir()); $this->assertEquals($tempDir, $mirror->getDirectory()); } + + /** + * A resource mirror is not created if directory is not writable. + * + * @depends testCreate + * @expectedException \InvalidArgumentException + */ + public function testCreateBadDirectory() + { + new ResourceMirror(new EventDispatcher(), 'http://example.com/', '/a/probably/not/writable/directory'); + } }
Test creating a mirror with a bad directory.
orbt_ResourceMirror
train
php
9a9e089074b9f1325b298d7453b23eae472928f6
diff --git a/tests/explainers/test_kernel.py b/tests/explainers/test_kernel.py index <HASH>..<HASH> 100644 --- a/tests/explainers/test_kernel.py +++ b/tests/explainers/test_kernel.py @@ -71,7 +71,7 @@ def test_kernel_shap_with_a1a_sparse_zero_background(): explainer.shap_values(x_test) def test_kernel_shap_with_a1a_sparse_nonzero_background(): - np.set_printoptions(threshold=np.nan) + np.set_printoptions(threshold=100000) from sklearn.model_selection import train_test_split from sklearn.linear_model import LinearRegression from sklearn.utils.sparsefuncs import csc_median_axis_0
Fix windows issue with set_printoptions
slundberg_shap
train
py
433c482de719132e88e39022401629c644ba975e
diff --git a/lib/matcher/Matcher.js b/lib/matcher/Matcher.js index <HASH>..<HASH> 100644 --- a/lib/matcher/Matcher.js +++ b/lib/matcher/Matcher.js @@ -874,7 +874,7 @@ i = -1, len = m.length; for ( ; ++i < len ; ) { - for902 (j in m[i]) { + for (j in m[i]) { if (m[i].hasOwnProperty(j)) { if (j === oldId) { // Do the swap.
matcher fixedRoles and canMatchSameRole
nodeGame_nodegame-client
train
js
9a60d43a6a60c129346b813b78712bc09d94770b
diff --git a/packages/eslint-config/lib/overrides.js b/packages/eslint-config/lib/overrides.js index <HASH>..<HASH> 100644 --- a/packages/eslint-config/lib/overrides.js +++ b/packages/eslint-config/lib/overrides.js @@ -14,6 +14,23 @@ const overrides = []; if (hasTypescript) { overrides.push( { + files: ['*.mjs'], + extends: ['airbnb-base'], + parserOptions: { + ecmaVersion: 8, + sourceType: 'module', + ecmaFeatures: { + modules: true, + }, + }, + env: { + node: true, + jasmine: true, + jest: true, + }, + rules: rules.javascript, + }, + { // overrides just for react files files: ['*.jsx', '*.tsx'], extends: ['plugin:@typescript-eslint/recommended', 'plugin:react-hooks/recommended', 'airbnb'],
Make sure eslint works with mjs files
terascope_teraslice
train
js
d829cf7f86fe0c11ee7450c50b3b09c34631f967
diff --git a/src/threadPool.py b/src/threadPool.py index <HASH>..<HASH> 100644 --- a/src/threadPool.py +++ b/src/threadPool.py @@ -32,6 +32,7 @@ class ThreadPool(Module): self.name = name if prctl: prctl.set_name(name) + prctl.set_proctitle(name) self.pool.actualFT -= 1 self.pool.cond.release() try: @@ -46,6 +47,7 @@ class ThreadPool(Module): self.name = 'free' if prctl: prctl.set_name('(free)') + prctl.set_proctitle('(free)') self.pool.actualFT += 1 self.pool.expectedFT += 1 if not ret:
threadPool: also set proctitle
bwesterb_mirte
train
py
0d9351aeadb81d50aec1421335bc75a0d6d24cfe
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( author="David Uebelacker", author_email="david@uebelacker.ch", url="https://github.com/hackercowboy/python-maxcube-api.git", - license=license, + license='MIT', packages=["maxcube"], test_suite="tests", python_requires=">=3.7",
setup.py: fix license value The value is unset, which does not propagate the license into PyPi.
hackercowboy_python-maxcube-api
train
py
5c2193f3576ed8756ff3755259c9e30df3ab3a72
diff --git a/specs-go/config.go b/specs-go/config.go index <HASH>..<HASH> 100644 --- a/specs-go/config.go +++ b/specs-go/config.go @@ -24,9 +24,9 @@ type Spec struct { Annotations map[string]string `json:"annotations,omitempty"` // Linux is platform specific configuration for Linux based containers. - Linux Linux `json:"linux" platform:"linux"` + Linux Linux `json:"linux" platform:"linux,omitempty"` // Solaris is platform specific configuration for Solaris containers. - Solaris Solaris `json:"solaris" platform:"solaris"` + Solaris Solaris `json:"solaris" platform:"solaris,omitempty"` } // Process contains information to start a specific application inside the container.
specs-go/config: Make Linux and Solaris omitempty Both fields are optional, so you could conceivably have neither. However, in most cases folks will populate the one corresponding to their platform. The one that *doesn't* match their platform must not show up, in order to avoid violating the: This should only be set if **`platform.os`** is ... phrasing.
opencontainers_runtime-spec
train
go
a467673656757c209542282c4b70bc39272c9a01
diff --git a/dns.go b/dns.go index <HASH>..<HASH> 100644 --- a/dns.go +++ b/dns.go @@ -16,7 +16,7 @@ type DNSRecord struct { Name string `json:"name,omitempty"` Content string `json:"content,omitempty"` Proxiable bool `json:"proxiable,omitempty"` - Proxied bool `json:"proxied,omitempty"` + Proxied bool `json:"proxied"` TTL int `json:"ttl,omitempty"` Locked bool `json:"locked,omitempty"` ZoneID string `json:"zone_id,omitempty"` @@ -25,7 +25,7 @@ type DNSRecord struct { ModifiedOn time.Time `json:"modified_on,omitempty"` Data interface{} `json:"data,omitempty"` // data returned by: SRV, LOC Meta interface{} `json:"meta,omitempty"` - Priority int `json:"priority,omitempty"` + Priority int `json:"priority"` } // DNSRecordResponse represents the response from the DNS endpoint.
Always serialize Proxied and Priority fields
cloudflare_cloudflare-go
train
go
062c88e2e7d25f6dc1f0d2fa0b0c123f7c4f23f8
diff --git a/lib/dalli/client.rb b/lib/dalli/client.rb index <HASH>..<HASH> 100644 --- a/lib/dalli/client.rb +++ b/lib/dalli/client.rb @@ -269,7 +269,7 @@ module Dalli end def key_without_namespace(key) - @options[:namespace] ? key.gsub(%r(\A#{@options[:namespace]}:), '') : key + @options[:namespace] ? key.sub(%r(\A#{@options[:namespace]}:), '') : key end def normalize_options(opts)
Stop attempting to strip the namespace from a key multiple times
petergoldstein_dalli
train
rb
5967c52e226234da519d6801562cf4e7da0ff55c
diff --git a/test/net/fortuna/ical4j/data/CalendarOutputterTest.java b/test/net/fortuna/ical4j/data/CalendarOutputterTest.java index <HASH>..<HASH> 100644 --- a/test/net/fortuna/ical4j/data/CalendarOutputterTest.java +++ b/test/net/fortuna/ical4j/data/CalendarOutputterTest.java @@ -118,7 +118,7 @@ public class CalendarOutputterTest extends TestCase { log.debug(out.toString()); } - BufferedReader bin = new BufferedReader(new UnfoldingReader(new FileReader(filename))); + BufferedReader bin = new BufferedReader(new UnfoldingReader(new FileReader(filename), 1024), 1024); StringWriter rout = new StringWriter(); BufferedWriter bout = new BufferedWriter(rout);
Ensure BufferedReader buffer size <= UnfoldingReader buffer size
ical4j_ical4j
train
java
42ec26555aa95badd5c4f4de8f1023165533c5a8
diff --git a/lib/models/design.js b/lib/models/design.js index <HASH>..<HASH> 100644 --- a/lib/models/design.js +++ b/lib/models/design.js @@ -50,8 +50,8 @@ let designModel = function (modelSchema, methods) { _modelSchema.attributes[index].type = property.type; if (modelSchema.index) _modelSchema.attributes[index].index = modelSchema.index; - if (property.defaultValue) _modelSchema.attributes[index].defaultsTo = property.defaultValue; - if (property.defaultValue && property.defaultValue == 'timestamp') _modelSchema.attributes[index].default = Date.now(); + if (property.defaultValue !== null) _modelSchema.attributes[index].defaultsTo = property.defaultValue; + if (property.defaultValue && property.defaultValue == 'timestamp') _modelSchema.attributes[index].defaultsTo = new Date(); }); if (methods) _modelSchema[methods] = methods[modelSchema.name] ? methods : false || false;
Don't let default value of fall through.
ptariche_koa-waterline
train
js
24af16dadb003886fb8a442e1791cabfdfd4a85f
diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index <HASH>..<HASH> 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -158,6 +158,11 @@ func NewMesosSchedulerDriver(config DriverConfig) (initializedDriver *MesosSched if framework.GetUser() == "" { user, err := user.Current() if err != nil || user == nil { + if err != nil { + log.Warningln("Failed to obtain username: %v", err) + } else { + log.Warningln("Failed to obtain username.") + } framework.User = proto.String("") } else { framework.User = proto.String(user.Username)
Log warning if no username can be obtained (and none is given).
mesos_mesos-go
train
go
15a99e22d4b761845abc7e7644b88d7eb45ee538
diff --git a/publish.js b/publish.js index <HASH>..<HASH> 100644 --- a/publish.js +++ b/publish.js @@ -21,7 +21,7 @@ module.exports = function() { function putThemInVendorDir (filepath) { return 'vendor/' + path.basename(filepath); - }g + } return { humaName : 'UI.Ace',
fix(publisher): remove typo
angular-ui_ui-ace
train
js
aa91800468faee09452fed71102a27f3e5645335
diff --git a/js/base/Exchange.js b/js/base/Exchange.js index <HASH>..<HASH> 100644 --- a/js/base/Exchange.js +++ b/js/base/Exchange.js @@ -677,8 +677,8 @@ module.exports = class Exchange { async fetchL2OrderBook (symbol, params = {}) { let orderbook = await this.fetchOrderBook (symbol, params) return extend (orderbook, { - 'bids': aggregate (orderbook.bids), - 'asks': aggregate (orderbook.asks), + 'bids': sortBy (aggregate (orderbook.bids), 0, true), + 'asks': sortBy (aggregate (orderbook.asks), 0), }) }
Exchange: fix for "removed the bidask sorting from fetchL2OrderBook to fetchOrderBook #<I>"
ccxt_ccxt
train
js
419362a111376c3acc2addd5dcadae210c3840fc
diff --git a/lib/server.js b/lib/server.js index <HASH>..<HASH> 100644 --- a/lib/server.js +++ b/lib/server.js @@ -82,8 +82,12 @@ function handleResponse (opts, newReq, resp, response) { resp.writeHead(response.status, '', response.headers); resp.end(body); } else { - if (response.headers && response.headers['content-length']) { - opts.log('error/response/content-length', {req: newReq, res: response}); + if (response.headers['content-length']) { + opts.log('warn/response/content-length', { + req: newReq, + res: response, + reason: new Error('Invalid content-length') + }); delete response.headers['content-length']; } resp.writeHead(response.status, '', response.headers);
Include an Error instance in the log warning
wikimedia_restbase
train
js
5392b9d1a55b89f083059914b3e1104ae98f6969
diff --git a/src/js/lightbox/lightbox.js b/src/js/lightbox/lightbox.js index <HASH>..<HASH> 100644 --- a/src/js/lightbox/lightbox.js +++ b/src/js/lightbox/lightbox.js @@ -94,6 +94,9 @@ class PhotoSwipeLightbox extends PhotoSwipeBase { if (clickedChildIndex !== -1) { return clickedChildIndex; + } else if (this.options.children || this.options.childSelector) { + // click wasn't on a child element + return -1; } // There is only one item (which is the gallery)
#<I> fix - Clicking the surrounding element always opens the first image of the gallery
dimsemenov_PhotoSwipe
train
js
367d19e971232c48fb531183fef6c737aee7f550
diff --git a/src/EncodingHelper/FromUtf8.php b/src/EncodingHelper/FromUtf8.php index <HASH>..<HASH> 100644 --- a/src/EncodingHelper/FromUtf8.php +++ b/src/EncodingHelper/FromUtf8.php @@ -58,7 +58,7 @@ class FromUtf8 implements EncodingHelperInterface { $return = ''; for ($i = 0; $i < strlen($string); ++$i) { - $codePoint = ord($string{$i}); + $codePoint = ord($string[$i]); switch ($codePoint) { case 196: $return .= chr(142); diff --git a/src/EncodingHelper/ToUtf8.php b/src/EncodingHelper/ToUtf8.php index <HASH>..<HASH> 100644 --- a/src/EncodingHelper/ToUtf8.php +++ b/src/EncodingHelper/ToUtf8.php @@ -58,7 +58,7 @@ class ToUtf8 implements EncodingHelperInterface { $return = ''; for ($i = 0; $i < strlen($string); ++$i) { - $codePoint = ord($string{$i}); + $codePoint = ord($string[$i]); switch ($codePoint) { case 129: $return .= chr(252);
fix 'Array and string offset access syntax with curly braces is deprecated' note in php-<I> (#<I>)
algo26-matthias_idna-convert
train
php,php
75f3b723fae922013660ec9928dc0385fa131740
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php index <HASH>..<HASH> 100644 --- a/src/ServiceProvider.php +++ b/src/ServiceProvider.php @@ -17,7 +17,7 @@ class ServiceProvider extends LaravelServiceProvider * * @return void */ - protected function boot() + public function boot() { $this->publishes([ __DIR__.'/config.php' => config_path('importer.php'), @@ -29,7 +29,7 @@ class ServiceProvider extends LaravelServiceProvider * * @return void */ - protected function register() + public function register() { $this->app->singleton('importer', function () { return new Importer;
Fix wrong access type for service provider methods
DuckThom_laravel-importer
train
php
8c03cbe213cc0f19b4097ac8e7be49e46b36482e
diff --git a/model1.py b/model1.py index <HASH>..<HASH> 100644 --- a/model1.py +++ b/model1.py @@ -24,7 +24,7 @@ class Model1(object): self.en_dict, self.en_words = self.convertArgsToTokens( self.data[2] ) self.dev_in = open(self.data[3], 'r') - self._dev_lines = self.dev_in.readlines() + self.dev_lines = self.dev_in.readlines() self.dev_in.close() for index in range(len(self.en_dict)): @@ -33,7 +33,17 @@ class Model1(object): # print "PAIRS:" # print self.sent_pairs - + def printInfo(self): + for line in self.dev_lines: + self.dev_words += line.split() + #print self.dev_words + + print self.transmissions + # for word in self.dev_words: + # print "English Word:" + word + # print "German Words and Probabilities:" + # print self.transmissions[word] + def convertArgsToTokens(self, data): """ @@ -174,7 +184,7 @@ def main(): model1 = Model1(args) model1.initTef() model1.iterateEM(10) - model1._printInfo() + model1.printInfo() if __name__=="__main__": main()
writing dev-words handling and realized that I am storing the transmissions inccorrectly... need to reverse the dict.... debugging now
accraze_pymtranslate
train
py
95fb4bd1ee1618dcf1c8762f67d4fce03f2f3e5d
diff --git a/lib/browse_everything/version.rb b/lib/browse_everything/version.rb index <HASH>..<HASH> 100644 --- a/lib/browse_everything/version.rb +++ b/lib/browse_everything/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module BrowseEverything - VERSION = '1.0.1' + VERSION = '1.0.2' end
Preparing for release <I>
samvera_browse-everything
train
rb
0c139f34c60f7a60eaebe73345d3c0912d650d59
diff --git a/bugwarrior/services/gitlab.py b/bugwarrior/services/gitlab.py index <HASH>..<HASH> 100644 --- a/bugwarrior/services/gitlab.py +++ b/bugwarrior/services/gitlab.py @@ -80,7 +80,7 @@ class GitlabIssue(Issue): 'label': 'Gitlab Type', }, NUMBER: { - 'type': 'numeric', + 'type': 'string', 'label': 'Gitlab Issue/MR #', }, STATE: { @@ -180,7 +180,7 @@ class GitlabIssue(Issue): self.TITLE: title, self.DESCRIPTION: description, self.MILESTONE: milestone, - self.NUMBER: number, + self.NUMBER: str(number), self.CREATED_AT: created, self.UPDATED_AT: updated, self.DUEDATE: duedate,
gitlab: make the gitlabnumber UDA a string (fixes #<I>) The gitlabnumber's of todos on gitlab.com have grown beyond the limits of the numeric type, and that may happen on other instances too.
ralphbean_bugwarrior
train
py
98472553c96410f5cb8a8d6d9175f758054f119a
diff --git a/anypubsub/backends/memory.py b/anypubsub/backends/memory.py index <HASH>..<HASH> 100644 --- a/anypubsub/backends/memory.py +++ b/anypubsub/backends/memory.py @@ -9,8 +9,8 @@ except ImportError: # pragma: nocover class MemorySubscriber(Subscriber): - def __init__(self): - self.messages = Queue(maxsize=0) + def __init__(self, queue_factory): + self.messages = queue_factory(maxsize=0) def __iter__(self): return self @@ -25,8 +25,9 @@ class MemorySubscriber(Subscriber): class MemoryPubSub(PubSub): - def __init__(self): + def __init__(self, queue_factory=Queue): self.subscribers = defaultdict(lambda: WeakSet()) + self.queue_factory = queue_factory def publish(self, channel, message): subscribers = self.subscribers.get(channel, []) @@ -35,9 +36,9 @@ class MemoryPubSub(PubSub): return len(subscribers) def subscribe(self, *channels): - subscriber = MemorySubscriber() + subscriber = MemorySubscriber(self.queue_factory) for channel in channels: self.subscribers[channel].add(subscriber) return subscriber -backend = MemoryPubSub \ No newline at end of file +backend = MemoryPubSub
Allowed using a custom queue in memory backend.
smarzola_anypubsub
train
py
28e42e11758d769aaee0560b451586611d548e4a
diff --git a/tensorpack/dataflow/format.py b/tensorpack/dataflow/format.py index <HASH>..<HASH> 100644 --- a/tensorpack/dataflow/format.py +++ b/tensorpack/dataflow/format.py @@ -6,6 +6,7 @@ import h5py import random from six.moves import range +from ..utils import logger from .base import DataFlow """ @@ -20,7 +21,8 @@ class HDF5Data(DataFlow): """ def __init__(self, filename, data_paths, shuffle=True): self.f = h5py.File(filename, 'r') - self.dps = [self.f[k] for k in data_paths] + logger.info("Loading {} to memory...".format(filename)) + self.dps = [self.f[k].value for k in data_paths] lens = [len(k) for k in self.dps] assert all([k==lens[0] for k in lens]) self._size = lens[0]
consume all hdf5 to memory
tensorpack_tensorpack
train
py
154252a79080afb5f906261db48c09527e211ca1
diff --git a/pandas/tests/test_series.py b/pandas/tests/test_series.py index <HASH>..<HASH> 100644 --- a/pandas/tests/test_series.py +++ b/pandas/tests/test_series.py @@ -1127,12 +1127,21 @@ class TestSeries(unittest.TestCase, CheckNameIntegration): self.assertRaises(ValueError, s.__setitem__, tuple([[[True, False]]]), [0,2,3]) self.assertRaises(ValueError, s.__setitem__, tuple([[[True, False]]]), []) + + s = Series(np.arange(10), dtype=np.int32) + mask = s < 5 + s[mask] = range(5) + expected = Series(np.arange(10), dtype=np.int32) + assert_series_equal(s, expected) + self.assertEquals(s.dtype, expected.dtype) + # GH3235 s = Series(np.arange(10)) mask = s < 5 s[mask] = range(5) - expected = Series(np.arange(10),dtype='float64') - assert_series_equal(s,expected) + expected = Series(np.arange(10)) + assert_series_equal(s, expected) + self.assertEquals(s.dtype, expected.dtype) s = Series(np.arange(10)) mask = s > 5
BUG: test case showing why assigning to dtype is unsafe
pandas-dev_pandas
train
py
3518a154d34033a67d9388c3e83bc233e378f603
diff --git a/tasks/loop-mocha.js b/tasks/loop-mocha.js index <HASH>..<HASH> 100644 --- a/tasks/loop-mocha.js +++ b/tasks/loop-mocha.js @@ -97,7 +97,6 @@ module.exports = function (grunt) { _.each(_.omit(localMochaOptions , 'reportLocation' , 'iterations' - , 'noFail' , 'limit' // the limit var for mapLimit ) , function (value, key) { @@ -111,7 +110,7 @@ module.exports = function (grunt) { done(new Error("[grunt-loop-mocha] You need to make sure your report directory exists before using the xunit-file reporter")); } } - if (localMochaOptions.noFail && localMochaOptions.noFail.toString().toLowerCase() === "true") { + if (loopOptions.noFail && loopOptions.noFail.toString().toLowerCase() === "true") { noFail = true; }
moving noFail to the loop configuration area
grawk_grunt-loop-mocha
train
js
959a8da1921333699ca78f1e646e1906d5e5ded2
diff --git a/test/test_publish.py b/test/test_publish.py index <HASH>..<HASH> 100644 --- a/test/test_publish.py +++ b/test/test_publish.py @@ -11,7 +11,6 @@ import shutil import six from asv import config -from asv.commands.publish import Publish from asv import util @@ -61,7 +60,6 @@ def test_publish(tmpdir): shutil.copyfile(join(RESULT_DIR, 'cheetah', 'machine.json'), join(result_dir, 'cheetah', 'machine.json')) - # Publish the synthesized data conf = config.Config.from_json( {'benchmark_dir': BENCHMARK_DIR,
test: Remove unused import and too many blank line
airspeed-velocity_asv
train
py
eaa87a7251ce7587f34e61f40464d0f31e23d17e
diff --git a/example/src/components/IconPage.react.js b/example/src/components/IconPage.react.js index <HASH>..<HASH> 100644 --- a/example/src/components/IconPage.react.js +++ b/example/src/components/IconPage.react.js @@ -36,7 +36,7 @@ function IconPage(): React.Node { {iconSets.map(iconSet => ( <Card key={iconSet.prefix}> <Card.Header> - <Card.Title>Feather Icons</Card.Title> + <Card.Title>{iconSet.title}</Card.Title> </Card.Header> <Card.Body> <Grid.Row>
feat(IconPage): Include the title
tabler_tabler-react
train
js
ab96dc48d60a6410d620cafe68ae7add012dc9d4
diff --git a/lib/active_record/connection_adapters/activesalesforce_adapter.rb b/lib/active_record/connection_adapters/activesalesforce_adapter.rb index <HASH>..<HASH> 100644 --- a/lib/active_record/connection_adapters/activesalesforce_adapter.rb +++ b/lib/active_record/connection_adapters/activesalesforce_adapter.rb @@ -321,7 +321,7 @@ module ActiveRecord sql = fix_single_quote_in_where(sql) # Arel adds the class to the selection - we do not want this i.e... # SELECT contacts.* FROM => SELECT * FROM - sql = sql.gsub(/SELECT\s+[^\(][A-Z]+\./mi," ") + sql = sql.gsub(/SELECT\s+[^\(][A-Z]+\./mi,"SELECT ") raw_table_name = sql.match(/FROM (\w+)/mi)[1]
fixed rail <I> bug, see select_all() method: regex
raygao_asf-soap-adapter
train
rb
736990dc1cdacf8c755be9dcc81c102fb048f274
diff --git a/src/Scripts/jquery.fileDownload.js b/src/Scripts/jquery.fileDownload.js index <HASH>..<HASH> 100644 --- a/src/Scripts/jquery.fileDownload.js +++ b/src/Scripts/jquery.fileDownload.js @@ -329,7 +329,9 @@ $.extend({ function checkFileDownloadComplete() { //has the cookie been written due to a file download occuring? - if (document.cookie.indexOf(settings.cookieName + "=" + settings.cookieValue) != -1) { + var lowerCaseCookie = settings.cookieName.toLowerCase() + "=" + settings.cookieValue.toLowerCase(); + + if (document.cookie.toLowerCase().indexOf(lowerCaseCookie) > -1) { //execute specified callback internalCallbacks.onSuccess(fileUrl);
Made cookie filename comparison case insensitive.
johnculviner_jquery.fileDownload
train
js
90abbbc1306bc456eb06ad87f7c148d40051d197
diff --git a/docs/build.py b/docs/build.py index <HASH>..<HASH> 100644 --- a/docs/build.py +++ b/docs/build.py @@ -74,6 +74,7 @@ if __name__ == '__main__': # build the API doc api = ['sphinx-apidoc', + '-e', '-o', cwd, abspath('../trimesh')]
Put documentation for each module on its own page
mikedh_trimesh
train
py
f3d97623d4b2f684fba2e807eb37251995770087
diff --git a/tests/vcloud/models/compute/conn_helper.rb b/tests/vcloud/models/compute/conn_helper.rb index <HASH>..<HASH> 100644 --- a/tests/vcloud/models/compute/conn_helper.rb +++ b/tests/vcloud/models/compute/conn_helper.rb @@ -1,19 +1,17 @@ module Fog module Vcloud - class Compute < Fog::Service - class Real - def request(params, &block) - path = File.expand_path(File.join(File.dirname(__FILE__),'..','..','data',params[:path].gsub(/^\//,'').gsub('/','_+_'))) - if File.exists?(path) - body = File.read(path) - else - '' - end - Excon::Response.new( - :body => body, - :status => 200, - :header => '') + class Fog::Connection + def request(params, &block) + path = File.expand_path(File.join(File.dirname(__FILE__),'..','..','data',params[:path].gsub(/^\//,'').gsub('/','_+_'))) + if File.exists?(path) + body = File.read(path) + else + '' end + Excon::Response.new( + :body => body, + :status => 200, + :header => '') end end end
[vcloud|compute] rather mock Fog::Vcloud::Connection as this is the right place to mock things
fog_fog
train
rb
a7522c7734b587e699d3ed332d7b3e21a456461d
diff --git a/src/blocks/scratch3_data.js b/src/blocks/scratch3_data.js index <HASH>..<HASH> 100644 --- a/src/blocks/scratch3_data.js +++ b/src/blocks/scratch3_data.js @@ -17,7 +17,7 @@ Scratch3DataBlocks.prototype.getPrimitives = function () { 'data_variable': this.getVariable, 'data_setvariableto': this.setVariableTo, 'data_changevariableby': this.changeVariableBy, - 'data_list': this.getListContents, + 'data_listcontents': this.getListContents, 'data_addtolist': this.addToList, 'data_deleteoflist': this.deleteOfList, 'data_insertatlist': this.insertAtList,
Fix data_listcontents block name (#<I>)
LLK_scratch-vm
train
js
f270e292c71dc4f4a9341f1540eb94dff6fcc5d5
diff --git a/fastlane_core/lib/fastlane_core/helper.rb b/fastlane_core/lib/fastlane_core/helper.rb index <HASH>..<HASH> 100644 --- a/fastlane_core/lib/fastlane_core/helper.rb +++ b/fastlane_core/lib/fastlane_core/helper.rb @@ -202,9 +202,15 @@ module FastlaneCore return ENV["FASTLANE_ITUNES_TRANSPORTER_PATH"] if FastlaneCore::Env.truthy?("FASTLANE_ITUNES_TRANSPORTER_PATH") if self.mac? + # First check for manually install iTMSTransporter + user_local_itms_path = "/usr/local/itms" + return user_local_itms_path if File.exist?(user_local_itms_path) + + # Then check for iTMSTransporter in the Xcode path [ "../Applications/Application Loader.app/Contents/MacOS/itms", - "../Applications/Application Loader.app/Contents/itms" + "../Applications/Application Loader.app/Contents/itms", + "../SharedFrameworks/ContentDeliveryServices.framework/Versions/A/itms" # For Xcode 11 ].each do |path| result = File.expand_path(File.join(self.xcode_path, path)) return result if File.exist?(result)
[fastlane_core] added deliver/pilot support for Xcode <I> - new search path for itms_path (#<I>) * [fastlane_core] added new search path for itms_path for xcode <I> * Added path check for manually installed itms
fastlane_fastlane
train
rb
1339556b7e1e6ca52a184b5cb48e41adee61d273
diff --git a/api/models.py b/api/models.py index <HASH>..<HASH> 100644 --- a/api/models.py +++ b/api/models.py @@ -444,7 +444,7 @@ class Release(UuidAuditedModel): config = models.ForeignKey('Config') build = models.ForeignKey('Build') # NOTE: image contains combined build + config, ready to run - image = models.CharField(max_length=256) + image = models.CharField(max_length=256, default=settings.DEFAULT_BUILD) class Meta: get_latest_by = 'created' diff --git a/api/tests/test_release.py b/api/tests/test_release.py index <HASH>..<HASH> 100644 --- a/api/tests/test_release.py +++ b/api/tests/test_release.py @@ -60,6 +60,7 @@ class ReleaseTest(TransactionTestCase): self.assertIn('config', response.data) self.assertIn('build', response.data) self.assertEquals(release1['version'], 1) + self.assertEquals(release1['image'], 'deis/helloworld') # check to see that a new release was created url = '/api/apps/{app_id}/releases/v2'.format(**locals()) response = self.client.get(url)
fix(controller): set default release image If you scale an application with `deis scale cmd=1` before an application has been pushed, it should deploy deis/helloworld. However, the initial release (v1) does not have a image set for the release, only the build. Setting the default to deis/helloworld fixes the "scale before deploy" problem.
deis_controller-sdk-go
train
py,py
28bf5f6f96b020b584cd94fd33818c886ddce744
diff --git a/gwpy/plotter/core.py b/gwpy/plotter/core.py index <HASH>..<HASH> 100644 --- a/gwpy/plotter/core.py +++ b/gwpy/plotter/core.py @@ -32,6 +32,7 @@ except ImportError: from mpl_toolkits.axes_grid import make_axes_locatable from . import (tex, axes, utils) +from .axes import Axes from .log import CombinedLogFormatterMathtext from .decorators import (auto_refresh, axes_method) @@ -56,6 +57,8 @@ class Plot(figure.Figure): figures from GWpy data objects, and modifying them on-the-fly in interactive mode. """ + _DefaultAxesClass = Axes + def __init__(self, *args, **kwargs): # pull non-standard keyword arguments auto_refresh = kwargs.pop('auto_refresh', False) @@ -291,6 +294,11 @@ class Plot(figure.Figure): # These methods try to guess which axes to add to, otherwise generate # a new one + def add_subplot(self, *args, **kwargs): + kwargs.setdefault('projection', self._DefaultAxesClass.name) + return super(Plot, self).add_subplot(*args, **kwargs) + add_subplot.__doc__ = figure.Figure.add_subplot.__doc__ + def get_axes(self, projection=None): """Find all `Axes`, optionally matching the given projection
Plot: add_subplot now sets default projection - this should fix problems introduced by removing the custom gca()
gwpy_gwpy
train
py
c232dc386b4e54990ffcf5386342002e6e9e0356
diff --git a/cmsplugin_cascade/__init__.py b/cmsplugin_cascade/__init__.py index <HASH>..<HASH> 100644 --- a/cmsplugin_cascade/__init__.py +++ b/cmsplugin_cascade/__init__.py @@ -19,6 +19,6 @@ Release logic: 12. git commit -m 'Start with <version>' 13. git push """ -__version__ = "0.9.1" +__version__ = "0.10.dev" default_app_config = 'cmsplugin_cascade.apps.CascadeConfig'
prepare for version <I>.x
jrief_djangocms-cascade
train
py
f700a03ad22b9d3e3472f5d6ff17ecaafddc7e69
diff --git a/lib/client_side_validations/active_record.rb b/lib/client_side_validations/active_record.rb index <HASH>..<HASH> 100644 --- a/lib/client_side_validations/active_record.rb +++ b/lib/client_side_validations/active_record.rb @@ -6,3 +6,6 @@ require 'client_side_validations/active_record/middleware' validator.capitalize! eval "ActiveRecord::Validations::#{validator}Validator.send(:include, ClientSideValidations::ActiveRecord::#{validator})" end + +ActiveRecord::Base.send(:include, ClientSideValidations::ActiveModel::Validations) +
Load order fix. Force ActiveRecord::Base instances to have the instance methods
DavyJonesLocker_client_side_validations
train
rb
aba268156cb56074f2b4d36bd1f24fd27d2827bc
diff --git a/src/workerCode.js b/src/workerCode.js index <HASH>..<HASH> 100644 --- a/src/workerCode.js +++ b/src/workerCode.js @@ -7,12 +7,12 @@ export function workerCode() { self.document = {}; // Workaround for "ReferenceError: document is not defined" in hpccWasm - var hpccWasm; self.onconnect = function(e) { const port = e.ports[0]; port.addEventListener('message', function(event) { - if (event.data.vizURL) { + let hpccWasm = self["@hpcc-js/wasm"]; + if (hpccWasm == undefined && event.data.vizURL) { importScripts(event.data.vizURL); hpccWasm = self["@hpcc-js/wasm"]; hpccWasm.wasmFolder(event.data.vizURL.match(/.*\//)[0]);
Avoid loading script in shared worker more than once
magjac_d3-graphviz
train
js
8041560deba8529a9db51989c1713640936f4b3c
diff --git a/src/ngrest/base/Plugin.php b/src/ngrest/base/Plugin.php index <HASH>..<HASH> 100644 --- a/src/ngrest/base/Plugin.php +++ b/src/ngrest/base/Plugin.php @@ -77,7 +77,7 @@ abstract class Plugin extends Component throw new Exception("Plugin attributes name, alias and i18n must be configured."); } - $this->addEvent(NgRestModel::EVENT_AFTER_VALIDATE, 'onSave'); + $this->addEvent(NgRestModel::EVENT_BEFORE_VALIDATE, 'onSave'); $this->addEvent(NgRestModel::EVENT_AFTER_FIND, 'onFind'); $this->addEvent(NgRestModel::EVENT_AFTER_NGREST_FIND, 'onListFind'); $this->addEvent(NgRestModel::EVENT_AFTER_NGREST_UPDATE_FIND, 'onExpandFind'); @@ -258,7 +258,9 @@ abstract class Plugin extends Component } /** - * This event will be triggered `onSave` event. If the property of this plugin inside the model, the event will not be triggered. + * This event will be triggered `onSave` event. If the model property is not writeable the event will not trigger. + * + * If the beforeSave method returns true and i18n is enabled, the value will be json encoded. * * @param \yii\db\AfterSaveEvent $event AfterSaveEvent represents the information available in yii\db\ActiveRecord::EVENT_AFTER_INSERT and yii\db\ActiveRecord::EVENT_AFTER_UPDATE. * @return void
revert event validation index in order to keep model generates rules. closes #<I>
luyadev_luya-module-admin
train
php
b4c25b5631ef5330717b22facc7a80ed18b002ba
diff --git a/pydle/connection.py b/pydle/connection.py index <HASH>..<HASH> 100644 --- a/pydle/connection.py +++ b/pydle/connection.py @@ -85,6 +85,26 @@ class Connection: self.eventloop.register(self.socket.fileno()) self.setup_handlers() + + def upgrade_to_tls(self, tls_verify=False, tls_certificate_file=None, tls_certificate_keyfile=None, tls_certificate_password=None): + """ Uprade existing connection to TLS. """ + # Set local config options. + self.tls = True + self.tls_verify = False + if tls_certificate_file: + self.tls_certificate_file = tls_certificate_file + if tls_certificate_keyfile: + self.tls_certificate_keyfile = tls_certificate_keyfile + if tls_certificate_password: + self.tls_certificate_password = tls_certificate_password + + # Remove socket callbacks since the fd might change as the event loop sees it, setup TLS, and setup handlers again. + self.remove_handlers() + self.eventloop.unregister(self.socket.fileno()) + self.setup_tls() + self.eventloop.register(self.socket.fileno()) + self.setup_handlers() + def setup_tls(self): """ Transform our regular socket into a TLS socket. """ # Set up context.
Add upgrade to TLS functionality to connection.
Shizmob_pydle
train
py
9ac73660a12529b8275ebcd8fed63d4ffdb1a23d
diff --git a/pkg/index/corpus.go b/pkg/index/corpus.go index <HASH>..<HASH> 100644 --- a/pkg/index/corpus.go +++ b/pkg/index/corpus.go @@ -540,9 +540,14 @@ type pnAndTime struct { type byPermanodeModtime []pnAndTime -func (s byPermanodeModtime) Len() int { return len(s) } -func (s byPermanodeModtime) Less(i, j int) bool { return s[i].t.Before(s[j].t) } -func (s byPermanodeModtime) Swap(i, j int) { s[i], s[j] = s[j], s[i] } +func (s byPermanodeModtime) Len() int { return len(s) } +func (s byPermanodeModtime) Swap(i, j int) { s[i], s[j] = s[j], s[i] } +func (s byPermanodeModtime) Less(i, j int) bool { + if s[i].t.Equal(s[j].t) { + return s[i].pn.Less(s[j].pn) + } + return s[i].t.Before(s[j].t) +} // EnumeratePermanodesLastModified sends all permanodes, sorted by most recently modified first, to ch, // or until ctx is done.
Sort recent permanodes first by time, then by blobref. Just in case two permanodes were modified in the same nanosecond (or more likely: the client's clock resolution sucks when they created the mutation). Fixes <URL>
perkeep_perkeep
train
go
638babdde573b79eb88db3c21a12e434834cd419
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,6 @@ DOCS_REQS = [SPHINX_REQ] TEST_REQS = [ 'hypothesis < 4', - 'hypothesis-pytest < 1', 'py < 2', 'pytest < 5', 'pytest-benchmark >= 3.2.0, < 4',
Remove hypothesis-pytest dependency According to <URL>
jab_bidict
train
py
3572168e2e084423451f528d75ed1ce462ef26bc
diff --git a/upload/catalog/language/en-gb/checkout/checkout.php b/upload/catalog/language/en-gb/checkout/checkout.php index <HASH>..<HASH> 100644 --- a/upload/catalog/language/en-gb/checkout/checkout.php +++ b/upload/catalog/language/en-gb/checkout/checkout.php @@ -3,6 +3,7 @@ $_['heading_title'] = 'Checkout'; // Text +$_['text_cart'] = 'Shopping Cart'; $_['text_checkout_option'] = 'Step %s: Checkout Options'; $_['text_checkout_account'] = 'Step %s: Account &amp; Billing Details'; $_['text_checkout_payment_address'] = 'Step %s: Billing Details'; @@ -100,4 +101,4 @@ $_['error_no_shipping'] = 'Warning: No Shipping options are availab $_['error_payment'] = 'Warning: Payment method required!'; $_['error_no_payment'] = 'Warning: No Payment options are available. Please <a href="%s">contact us</a> for assistance!'; $_['error_custom_field'] = '%s required!'; -$_['error_regex'] = '%s not a valid input!'; \ No newline at end of file +$_['error_regex'] = '%s not a valid input!';
added missing word translation The same text translation may be available in other language files as well, but it is missing here.
opencart_opencart
train
php
d6470ae05941e10e45fba8af9fa61e4566ede46a
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -37,6 +37,7 @@ setup( python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*", project_urls={ "Bug Tracker": "https://github.com/stripe/stripe-python/issues", + "Changes": "https://github.com/stripe/stripe-python/blob/master/CHANGELOG.md", "Documentation": "https://stripe.com/docs/api/?lang=python", "Source Code": "https://github.com/stripe/stripe-python", },
PyPI / project URLs: Link to CHANGES.md (#<I>)
stripe_stripe-python
train
py
9c2462f912baee87c003c16d6e22209af3c9b2b3
diff --git a/src/main/date-functions.js b/src/main/date-functions.js index <HASH>..<HASH> 100644 --- a/src/main/date-functions.js +++ b/src/main/date-functions.js @@ -460,6 +460,10 @@ Date.formatCodeToRegex = function(character, currentGroup) { return {g:0, c:null, s:"[+-]\\d{1,5}"} + case ".": + return {g:0, + c:null, + s:"\\."} default: return {g:0, c:null,
Handle dot as escaped in regexp formatter
continuouscalendar_dateutils
train
js
12cf533e213f59077ff9257138fe4d7e7e857c65
diff --git a/firebase_token_generator.py b/firebase_token_generator.py index <HASH>..<HASH> 100644 --- a/firebase_token_generator.py +++ b/firebase_token_generator.py @@ -84,12 +84,16 @@ def _create_options_claims(opts): raise ValueError('Unrecognized Option: %s' % k) return claims -def _encode(bytes): - if sys.version_info < (2, 7): +if sys.version_info < (2, 7): + def _encode(bytes_data): # Python 2.6 has problems with bytearrays in b64 - bytes = str(bytes) - encoded = urlsafe_b64encode(bytes) - return encoded.decode('utf-8').replace('=', '') + encoded = urlsafe_b64encode(bytes(bytes_data)) + return encoded.decode('utf-8').replace('=', '') +else: + def _encode(bytes): + encoded = urlsafe_b64encode(bytes) + return encoded.decode('utf-8').replace('=', '') + def _encode_json(obj): return _encode(bytearray(json.dumps(obj), 'utf-8'))
Improve the previous <I> fix: use bytes rather, than string. Also, optimize for better speed.
googlearchive_firebase-token-generator-python
train
py
1803f748e6f50aaeef98cbf66c50b19260a379e6
diff --git a/py8583.py b/py8583.py index <HASH>..<HASH> 100644 --- a/py8583.py +++ b/py8583.py @@ -193,6 +193,9 @@ class Iso8583: if(Len > MaxLength): raise ParseError("F{0} is larger than maximum length ({1}>{2})".format(field, Len, MaxLength)) + # In case of zero length, don't try to parse the field itself, just continue + if(Len == 0): + return p try: if(DataType == DT.ASCII):
if length is zero don't try to parse the field because it might fail
timgabets_bpc8583
train
py
e80877a77b47a37f835601c4a6e456e023f63653
diff --git a/src/Flex.php b/src/Flex.php index <HASH>..<HASH> 100644 --- a/src/Flex.php +++ b/src/Flex.php @@ -95,10 +95,10 @@ class Flex implements PluginInterface, EventSubscriberInterface } // to avoid issues when Flex is upgraded, we load all PHP classes now - // that way, we are sure to use all files from the same version + // that way, we are sure to use all classes from the same version foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__, \FilesystemIterator::SKIP_DOTS)) as $file) { if ('.php' === substr($file, -4)) { - require_once $file; + class_exists(__NAMESPACE__.str_replace('/', '\\', substr($file, \strlen(__DIR__), -4))); } }
Fix "Cannot declare class because the name is already in use" errors
symfony_flex
train
php
8ad8bb770cacea222819bdcb1ddd782e8aa9723e
diff --git a/lib/javaReflection.js b/lib/javaReflection.js index <HASH>..<HASH> 100644 --- a/lib/javaReflection.js +++ b/lib/javaReflection.js @@ -3,14 +3,35 @@ var java = require('java'), function getMethod(obj, methodName, paramsClass, callback) { var javaParamsClass = newClassArray(paramsClass); - var method = obj.getClassSync().getMethodSync(methodName, javaParamsClass); - method.setAccessibleSync(true); - callback(method); + obj.getClass(function(err, javaClass) { + if (err) { + console.error(err); + return; + } + javaClass.getMethod(methodName, javaParamsClass, function(err, method) { + if (err) { + console.error(err); + return; + } + method.setAccessible(true, function(err) { + if (err) { + console.error(err); + return; + } + callback(method); + }); + }); + }); } function invoke(obj, method, params, callback) { - var data = method.invokeSync(obj, params); - callback(data); + var data = method.invoke(obj, params, function(err, result) { + if (err) { + console.error(err); + return; + } + callback(result); + }); } function invokeMethod(obj, methodName, paramsClass, params, callback) {
javaReflection library made Async
zuazo_node-jmx
train
js
6b90f7e5a21a3bdaa9dd4a6c77275f6af99212b5
diff --git a/pyrtl/rtllib/muxes.py b/pyrtl/rtllib/muxes.py index <HASH>..<HASH> 100644 --- a/pyrtl/rtllib/muxes.py +++ b/pyrtl/rtllib/muxes.py @@ -189,9 +189,10 @@ def demux(select): return _demux_2(select) wires = demux(select[:-1]) - not_select = ~select + sel = select[-1] + not_select = ~sel zero_wires = tuple(not_select & w for w in wires) - one_wires = tuple(select & w for w in wires) + one_wires = tuple(sel & w for w in wires) return zero_wires + one_wires
Demultiplexor was making result wires with too many bits each
UCSBarchlab_PyRTL
train
py
e27cd699741e6e96badbfc8ef8294804f1ef7d1d
diff --git a/framework/core/src/Extend/Formatter.php b/framework/core/src/Extend/Formatter.php index <HASH>..<HASH> 100644 --- a/framework/core/src/Extend/Formatter.php +++ b/framework/core/src/Extend/Formatter.php @@ -21,7 +21,7 @@ class Formatter implements ExtenderInterface, LifecycleInterface { protected $callback; - public function configure(callable $callback) + public function configure($callback) { $this->callback = $callback; @@ -34,8 +34,14 @@ class Formatter implements ExtenderInterface, LifecycleInterface $events->listen( Configuring::class, - function (Configuring $event) { - call_user_func($this->callback, $event->configurator); + function (Configuring $event) use ($container) { + if (is_string($this->callback)) { + $callback = $container->make($this->callback); + } else { + $callback = $this->callback; + } + + $callback($event->configurator); } ); }
Allow passing strings (names of invokable classes) to Formatter extender In preparation for fixing #<I>.
flarum_core
train
php
cfa75265e52d2b4182d9739416db3c6f85937951
diff --git a/packages/cli/lib/lib/babel-config.js b/packages/cli/lib/lib/babel-config.js index <HASH>..<HASH> 100644 --- a/packages/cli/lib/lib/babel-config.js +++ b/packages/cli/lib/lib/babel-config.js @@ -36,7 +36,7 @@ module.exports = function (env, options = {}) { overrides: [ // Transforms to apply only to first-party code: { - exclude: /node_modules/, + exclude: '**/node_modules/**', presets: [ [require.resolve('@babel/preset-typescript'), { jsxPragma: 'h' }], ],
Update packages/cli/lib/lib/babel-config.js
developit_preact-cli
train
js
b6fe8912c4cba9112d450ccd001fa5c469dca4b7
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,10 @@ from setuptools import setup,find_packages +import os + NAME = 'liveandletdie' +HERE = os.path.dirname(__file__) + setup( name=NAME, @@ -11,7 +15,7 @@ setup( author_email='peterhudec@peterhudec.com', description='Simplifies launching and terminating of web development ' 'servers from BDD and functional tests.', - long_description=open('README.rst').read(), + long_description=open(os.path.join(HERE, 'README.rst')).read(), keywords='Flask, Pyramid, Django, Google App Engine, GAE, BDD, TDD, ' 'functional testing, live server', url='http://github.com/peterhudec/{0}'.format(NAME),
The readme path is now relative to setup.py location.
authomatic_liveandletdie
train
py
4234a1f7056ec707e547a69b14babe1d691568a8
diff --git a/components/tree/node.js b/components/tree/node.js index <HASH>..<HASH> 100644 --- a/components/tree/node.js +++ b/components/tree/node.js @@ -1,8 +1,9 @@ let uniqueId = 0; +const prefix = '__$_'; export default class Node { static createNode = function(data, parent, tree, needRecheckNodes) { - const key = data.key == null ? uniqueId++ : data.key; + const key = data.key == null ? `${prefix}${uniqueId++}` : data.key; // if the node has been set to checked // we should set its children to checked // and recheck the parent to set to checked or indeterminate @@ -64,7 +65,7 @@ export default class Node { this.indeterminate = false; this.tree._updateCheckedKeys(this); - + if (this.tree.get('uncorrelated')) return; const children = this.children; @@ -85,7 +86,7 @@ export default class Node { if (!parent || parent === this.tree.root) return; let checkedCount = 0; - let count = 0; + let count = 0; let indeterminate; const children = parent.children; for (let i = 0; i < children.length; i++) {
fix(Tree): avoid conflicting with custom number key, close #<I>
ksc-fe_kpc
train
js
3e942e5d84c828aae599bc923e1e1dfbb737ee18
diff --git a/oled/emulator.py b/oled/emulator.py index <HASH>..<HASH> 100644 --- a/oled/emulator.py +++ b/oled/emulator.py @@ -130,7 +130,8 @@ class gifanim(emulator): with open(self._filename, "w+b") as fp: self._images[0].save(fp, save_all=True, loop=self._loop, duration=int(self._duration * 1000), - append_images=self._images[1:]) + append_images=self._images[1:], + format="GIF") print("Wrote {0} frames to file: {1} ({2} bytes)".format( len(self._images), self._filename, os.stat(self._filename).st_size))
Set format=GIF when writing image sequences (affects Python <I>)
rm-hull_luma.oled
train
py
25c7f9c946177e9d0ca668f6e181617b02b7437c
diff --git a/tools/c7n_org/c7n_org/cli.py b/tools/c7n_org/c7n_org/cli.py index <HASH>..<HASH> 100644 --- a/tools/c7n_org/c7n_org/cli.py +++ b/tools/c7n_org/c7n_org/cli.py @@ -47,7 +47,7 @@ from c7n.utils import UnicodeWriter log = logging.getLogger('c7n_org') -WORKER_COUNT = os.environ.get('C7N_ORG_PARALLEL', multiprocessing.cpu_count() * 4) +WORKER_COUNT = int(os.environ.get('C7N_ORG_PARALLEL', multiprocessing.cpu_count() * 4)) CONFIG_SCHEMA = {
tools/c7n_org - fix worker count type when set via env var (#<I>)
cloud-custodian_cloud-custodian
train
py
4be76e8d4f23a40c63ec7799470c23baad5c4f4a
diff --git a/src/TournamentsServiceProvider.php b/src/TournamentsServiceProvider.php index <HASH>..<HASH> 100644 --- a/src/TournamentsServiceProvider.php +++ b/src/TournamentsServiceProvider.php @@ -29,7 +29,6 @@ class TournamentsServiceProvider extends ServiceProvider $router->post('/championships/{championship}/trees', 'Xoco70\LaravelTournaments\TreeController@store')->name('tree.store'); $router->put('/championships/{championship}/trees', 'Xoco70\LaravelTournaments\TreeController@update')->name('tree.update'); }); - } /**
Apply fixes from StyleCI (#<I>)
xoco70_laravel-tournaments
train
php
6ae85c8b64244db4d30918841239f5d98b782efa
diff --git a/androguard/core/bytecodes/apk.py b/androguard/core/bytecodes/apk.py index <HASH>..<HASH> 100644 --- a/androguard/core/bytecodes/apk.py +++ b/androguard/core/bytecodes/apk.py @@ -1767,17 +1767,14 @@ class ARSCParser(object): if header.type == RES_TABLE_TYPE_TYPE: a_res_type = self.packages[package_name][nb + 1] - if a_res_type.config.get_language( - ) not in self.values[package_name]: - self.values[package_name][ - a_res_type.config.get_language() - ] = {} - self.values[package_name][a_res_type.config.get_language( - )]["public"] = [] - - c_value = self.values[package_name][ - a_res_type.config.get_language() - ] + language = a_res_type.config.get_language() + region = a_res_type.config.get_country() + if region == "\x00\x00": + locale = language + else: + locale = "{}-r{}".format(anguage, region) + + c_value = self.values[package_name].setdefault(locale, {"public":[]}) entries = self.packages[package_name][nb + 2] nb_i = 0
apk: build locale code properly
androguard_androguard
train
py
561b9f14169ceadb42dfaae418313d4bf0e468b2
diff --git a/lib/coffeecup.js b/lib/coffeecup.js index <HASH>..<HASH> 100644 --- a/lib/coffeecup.js +++ b/lib/coffeecup.js @@ -40,7 +40,7 @@ elements = { html i iframe ins kbd label legend li map mark menu meter nav noscript object\ ol optgroup option output p pre progress q rp rt ruby s samp script section\ select small span strong style sub summary sup table tbody td textarea tfoot\ - th thead time title tr u ul video', + th thead time title tr u ul video urlset url loc lastmod changefreq prioriy', svg: 'a altGlyph altGlyphDef altGlyphItem animate animateColor animateMotion\ animateTransform circle clipPath color-profile cursor defs desc ellipse\ feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix\
Added XML elements for sitemaps
gradus_coffeecup
train
js
17946e6656a6a1932734697ec92be051b9e1668b
diff --git a/src/GameEngine.js b/src/GameEngine.js index <HASH>..<HASH> 100644 --- a/src/GameEngine.js +++ b/src/GameEngine.js @@ -338,6 +338,8 @@ class GameEngine { */ removeObjectFromWorld(id) { let ob = this.world.objects[id]; + if (!ob) + throw new Error(`Game attempted to remove a game object which doesn't (or never did) exist, id=${id}`); this.trace.info(`========== destroying object ${ob.toString()} ==========`); this.emit('objectDestroyed', ob); ob.destroy();
friendly error on double-remove
lance-gg_lance
train
js
c1ab34bcdbcbee67191957b4c85a754009fbe51e
diff --git a/revproxy/utils.py b/revproxy/utils.py index <HASH>..<HASH> 100644 --- a/revproxy/utils.py +++ b/revproxy/utils.py @@ -19,7 +19,7 @@ HTML_CONTENT_TYPES = ( 'application/xhtml+xml' ) -MIN_STREAMING_LENGTH = 128 * 1024 # 128KB +MIN_STREAMING_LENGTH = 4 * 1024 # 4KB _get_charset_re = re.compile(r';\s*charset=(?P<charset>[^\s;]+)', re.I) @@ -39,7 +39,11 @@ def should_stream(proxy_response): if is_html_content_type(content_type): return False - content_length = proxy_response.headers.get('Content-Length') + try: + content_length = int(proxy_response.headers.get('Content-Length', 0)) + except ValueError: + content_length = 0 + if not content_length or content_length > MIN_STREAMING_LENGTH: return True
Only stream if content-length > MIN_STREAMING_LENGTH
TracyWebTech_django-revproxy
train
py
0d8682f6d3a94f1799bebd7b88107222e1618177
diff --git a/nanocomp/NanoComp.py b/nanocomp/NanoComp.py index <HASH>..<HASH> 100644 --- a/nanocomp/NanoComp.py +++ b/nanocomp/NanoComp.py @@ -153,7 +153,7 @@ def make_plots(df, settings): if "start_time" in df: plots.extend( compplots.compare_cumulative_yields( - df=sub_df, + df=df, path=settings["path"], title=settings["title"], palette=settings["colors"]) @@ -161,7 +161,7 @@ def make_plots(df, settings): if "channelIDs" in df: plots.append( compplots.active_pores_over_time( - df=sub_df, + df=df, path=settings["path"], palette=settings["colors"], title=settings["title"]
don't use subdf for cumulative yield and pores over time
wdecoster_nanocomp
train
py
51b47c9ebe3f53de911b300d8b73e59256f5f782
diff --git a/package.php b/package.php index <HASH>..<HASH> 100644 --- a/package.php +++ b/package.php @@ -4,7 +4,7 @@ require_once 'PEAR/PackageFileManager2.php'; -$version = '1.4.132'; +$version = '1.4.133'; $notes = <<<EOT No release notes for you! EOT;
prepare for release of <I> svn commit r<I>
silverorange_swat
train
php
c6c44212780f52595cca93b4a619db4f29f39dcd
diff --git a/openquake/baselib/parallel.py b/openquake/baselib/parallel.py index <HASH>..<HASH> 100644 --- a/openquake/baselib/parallel.py +++ b/openquake/baselib/parallel.py @@ -772,7 +772,8 @@ class Starmap(object): self.sent = AccumDict(accum=AccumDict()) # fname -> argname -> nbytes self.monitor.inject = (self.argnames[-1].startswith('mon') or self.argnames[-1].endswith('mon')) - self.receiver = 'tcp://0.0.0.0:%s' % config.dbserver.receiver_ports + self.receiver = 'tcp://%s:%s' % ( + socket.gethostname(), config.dbserver.receiver_ports) self.monitor.backurl = None # overridden later self.tasks = [] # populated by .submit self.task_no = 0
Using gethostname in the receiver URL
gem_oq-engine
train
py
a79fd4c984547b2fa101610fdadcf7fa3bbeb0d0
diff --git a/test/adapters/influxdb_test.rb b/test/adapters/influxdb_test.rb index <HASH>..<HASH> 100644 --- a/test/adapters/influxdb_test.rb +++ b/test/adapters/influxdb_test.rb @@ -1,9 +1,5 @@ require_relative "../test_helper" -# USE blazer_test -# DROP SERIES FROM items -# INSERT items,hello=world value=1 - class InfluxdbTest < ActionDispatch::IntegrationTest include AdapterTest @@ -11,6 +7,15 @@ class InfluxdbTest < ActionDispatch::IntegrationTest "influxdb" end + def setup + @@once ||= begin + client = InfluxDB::Client.new(url: "http://localhost:8086/blazer_test") + client.delete_series("items") + client.write_point("items", {values: {value: 1}, tags: {hello: "world"}, timestamp: 0}) + true + end + end + def test_run expected = [{"time" => "1970-01-01 00:00:00 UTC", "count_value" => "1"}] assert_result expected, "SELECT COUNT(*) FROM items WHERE hello = 'world'"
Improved InfluxDB test [skip ci]
ankane_blazer
train
rb
483ff7dda50d22a11d97b823c18353a9cc57d0c7
diff --git a/revive.js b/revive.js index <HASH>..<HASH> 100644 --- a/revive.js +++ b/revive.js @@ -2,30 +2,41 @@ var createKey = require('./createKey'), keyKey = createKey(-1); function revive(input){ - objects = {}; + var objects = {}, scannedObjects = []; function scan(input){ + var output = input; + + if(typeof output !== 'object'){ + return output; + } + + output = input instanceof Array ? [] : {}; + if(input[keyKey]){ - objects[input[keyKey]] = input; - delete input[keyKey]; + objects[input[keyKey]] = output; } for(var key in input){ var value = input[key]; + if(key === keyKey){ + continue; + } + if(value != null && typeof value === 'object'){ if(scannedObjects.indexOf(value)<0){ scannedObjects.push(value); - scan(value); + output[key] = scan(value); } - } - - if(typeof value === 'string' && value.length === 1 && value.charCodeAt(0) > keyKey.charCodeAt(0)){ - input[key] = objects[value]; + }else if(typeof value === 'string' && value.length === 1 && value.charCodeAt(0) > keyKey.charCodeAt(0)){ + output[key] = objects[value]; + }else{ + output[key] = input[key]; } } - return input; + return output; } return scan(input);
reviver is non-destuctive
KoryNunn_statham
train
js
991a76331cdf5d8f9dbf5b18f6e29adc80749a2f
diff --git a/nntp/nntp.py b/nntp/nntp.py index <HASH>..<HASH> 100644 --- a/nntp/nntp.py +++ b/nntp/nntp.py @@ -59,7 +59,7 @@ class NNTPReplyError(NNTPError): return self.args[1] def __str__(self): - return "%d: %s" % self.args + return "%d %s" % self.args class NNTPTemporaryError(NNTPReplyError): """NNTP temporary errors.
Changed __str__ for NNTPReplyError It now matches the format of the original response i.e. theres no colon
greenbender_pynntp
train
py
66168a425ac429543f64d874116744e212c247c2
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ setuptools.setup( url="https://github.com/ecmwf/cfgrib", packages=setuptools.find_packages(), include_package_data=True, - install_requires=["attrs>=19.2", "cffi", "click", "eccodes", "numpy"], + install_requires=["attrs>=19.2", "click", "eccodes", "numpy"], python_requires=">=3.5", extras_require={ "xarray": ["xarray>=0.12.0"],
Drop cffi from setup dependencies
ecmwf_cfgrib
train
py
08f7c2b9b9c31be9f1a05113c466189a2187dd0f
diff --git a/examples/bookstore/bookstore.js b/examples/bookstore/bookstore.js index <HASH>..<HASH> 100644 --- a/examples/bookstore/bookstore.js +++ b/examples/bookstore/bookstore.js @@ -113,7 +113,7 @@ function createTabFolder() { createBooksList(books).appendTo(relatedTab); var commentsTab = tabris.create("Tab", {title: "Comments"}).appendTo(tabFolder); tabris.create("TextView", { - layoutData: {left: PAGE_MARGIN, top: PAGE_MARGIN, right: PAGE_MARGIN, bottom: PAGE_MARGIN}, + layoutData: {left: PAGE_MARGIN, top: PAGE_MARGIN, right: PAGE_MARGIN}, text: "Great Book." }).appendTo(commentsTab); return tabFolder;
Fix broken layout of bookstore demo The new TextView behaves different on iOS and Android. On iOS the text will be displayed vertically centered. Thus the bottom property of the TextView in the bookstore demo needs to be removed. Change-Id: Iba1d5a0c1dd<I>c<I>fb2bfb<I>e7f3ac3c<I>f3
eclipsesource_tabris-js
train
js