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
b6eaead0dbbceac13efee5ec810b0909c79ec803
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -142,6 +142,7 @@ setup( "Changelog": "https://github.com/libtcod/python-tcod/blob/develop/CHANGELOG.rst", "Source": "https://github.com/libtcod/python-tcod", "Tracker": "https://github.com/libtcod/python-tcod/issues", + "Forum": "https://github.com/libtcod/python-tcod/discussions", }, py_modules=["libtcodpy"], packages=["tdl", "tcod"],
Link to GitHub Discussions from the project URLs.
libtcod_python-tcod
train
py
937cc1625032e73af61cb909422420e515beb5e3
diff --git a/xpdo/om/xpdoquery.class.php b/xpdo/om/xpdoquery.class.php index <HASH>..<HASH> 100644 --- a/xpdo/om/xpdoquery.class.php +++ b/xpdo/om/xpdoquery.class.php @@ -808,7 +808,7 @@ abstract class xPDOQuery extends xPDOCriteria { $output = preg_replace('/\\".*?\\"/', '{mask}', $output); $output = preg_replace("/'.*?'/", '{mask}', $output); $output = preg_replace('/".*?"/', '{mask}', $output); - return strpos($output, ';') === false && strpos(strtolower($output), 'union') === false; + return strpos($output, ';') === false && strpos(strtolower($output), 'union ') === false; } /**
Accept benign values that contain the word union <URL> instead of "union" will solve some problems without sacrificing safety.
modxcms_xpdo
train
php
730b10f9f73af2ea1589a93d64684a6570ef421b
diff --git a/lib/grably/core/commands.rb b/lib/grably/core/commands.rb index <HASH>..<HASH> 100644 --- a/lib/grably/core/commands.rb +++ b/lib/grably/core/commands.rb @@ -14,10 +14,6 @@ module Grably # :nodoc: end def relative_path(base, path) - # TODO: Reimplement - Dir.chdir(base) do - path = File.expand_path(path) - end - path + File.expand_path(path, base) end end
Do not use Dir.chdir - it's too dangerous
vizor-games_grably
train
rb
537178d7965cb71ba122e9a55b6e32e48dc216b8
diff --git a/Str.php b/Str.php index <HASH>..<HASH> 100644 --- a/Str.php +++ b/Str.php @@ -486,9 +486,17 @@ class Str } $encoding = $encoding ?: static::encoding($haystack); + $length = mb_strlen($haystack, $encoding); + + // With a negative offset, we'll be starting at $offset characters from the end of $haystack. + // mb_strpos does not natively support negative offsets, which is why we're simply converting + // the negative one to a positive one. + if ($offset < 0) { + $offset = $length + $offset; + } // Make sure the offset given exists within the $haystack. - if ((abs($offset) + 1) > mb_strlen($haystack, $encoding)) { + if ((abs($offset) + 1) > $length) { throw new \OutOfBoundsException('The requested $offset ['.$offset.'] does not exist within the string ["'.$haystack.'"].'); }
[Utils/Str] Fixed negative offsets in Str::occurrences()
unyx_utils
train
php
62ed4153b4991a84229f5115174ce54ee2fd47b2
diff --git a/libraries/ui-shared/Card/style.js b/libraries/ui-shared/Card/style.js index <HASH>..<HASH> 100644 --- a/libraries/ui-shared/Card/style.js +++ b/libraries/ui-shared/Card/style.js @@ -9,4 +9,5 @@ export default css({ borderRadius: 2, background: themeConfig.colors.light, overflow: 'hidden', + position: 'relative', }).toString();
PWA-<I> Added relative for positioning element inside the Card component
shopgate_pwa
train
js
b976852b2d819bd363714c214472d659b0e2ce34
diff --git a/test/integration_helper.rb b/test/integration_helper.rb index <HASH>..<HASH> 100644 --- a/test/integration_helper.rb +++ b/test/integration_helper.rb @@ -65,7 +65,8 @@ class IntegrationTest < MiniTest::Unit::TestCase end def run_subcommand(subcommand) - system "knife #{subcommand} -i #{key_file} #{user}@#{server.public_ip_address}" + verbose = ENV['VERBOSE'] && "-VV" + system "knife #{subcommand} -i #{key_file} #{user}@#{server.public_ip_address} #{verbose}" end def test_prepare_and_cook
Allow for VERBOSE=true on integration testing
matschaffer_knife-solo
train
rb
1ec077bb8af8a26bf6f734d85926ff7337b3434e
diff --git a/src/core/field.js b/src/core/field.js index <HASH>..<HASH> 100644 --- a/src/core/field.js +++ b/src/core/field.js @@ -553,10 +553,19 @@ export default class Field { _addHTMLEventListener (evt, validate) { if (!this.el || this.component) return; + // listen for the current element. + addEventListener(this.el, evt, validate); + this.watchers.push({ + tag: 'input_native', + unwatch: () => { + this.el.removeEventListener(evt, validate); + } + }); + if (~['radio', 'checkbox'].indexOf(this.el.type)) { const els = document.querySelectorAll(`input[name="${this.el.name}"]`); toArray(els).forEach(el => { - // skip if it is added by v-validate. + // skip if it is added by v-validate and is not the current element. if (getDataAttribute(el, 'id') && el !== this.el) { return; } @@ -569,17 +578,7 @@ export default class Field { } }); }); - - return; } - - addEventListener(this.el, evt, validate); - this.watchers.push({ - tag: 'input_native', - unwatch: () => { - this.el.removeEventListener(evt, validate); - } - }); } /**
make sure to attach the field event first fixes the failing test
baianat_vee-validate
train
js
8182dcd9b21369660667ce9f335e46d72838e053
diff --git a/src/Image/Cache.php b/src/Image/Cache.php index <HASH>..<HASH> 100644 --- a/src/Image/Cache.php +++ b/src/Image/Cache.php @@ -88,7 +88,9 @@ class Cache } // From remote else { $tmp_dir = $dompdf->getOptions()->getTempDir(); - $resolved_url = @tempnam($tmp_dir, "ca_dompdf_img_"); + if (($resolved_url = @tempnam($tmp_dir, "ca_dompdf_img_")) === false) { + throw new ImageException("Unable to create temporary image in " . $tmp_dir, E_WARNING); + } $image = ""; if ($data_uri) { @@ -110,7 +112,9 @@ class Cache //- a remote url does not need to have a file extension at all //- local cached file does not have a matching file extension //Therefore get image type from the content - file_put_contents($resolved_url, $image); + if (@file_put_contents($resolved_url, $image) === false) { + throw new ImageException("Unable to create temporary image in " . $tmp_dir, E_WARNING); + } } } } // Not remote, local image
Catch temp file creation errors for remote images Addresses #<I>
dompdf_dompdf
train
php
a132f798f4e86f849c3ec4a1c7e35460b6c1715b
diff --git a/lib/Dwoo/Adapters/ZendFramework/View.php b/lib/Dwoo/Adapters/ZendFramework/View.php index <HASH>..<HASH> 100644 --- a/lib/Dwoo/Adapters/ZendFramework/View.php +++ b/lib/Dwoo/Adapters/ZendFramework/View.php @@ -295,6 +295,10 @@ class Dwoo_Adapters_ZendFramework_View extends Zend_View_Abstract { if (null === $this->_dataProvider) { $this->_dataProvider = new Dwoo_Data; + + // Satisfy Zend_View_Abstract wishes to access this unexisting property + // by setting it to empty array (see Zend_View_Abstract::_filter) + $this->_dataProvider->_filter = array(); } return $this->_dataProvider;
Fix for reading unassigned _filter from Zend_View_Abstract
dwoo-project_dwoo
train
php
74e139111c6345348482d7fa487543f4d150ee02
diff --git a/lib/zendesk_apps_support/validations/requirements.rb b/lib/zendesk_apps_support/validations/requirements.rb index <HASH>..<HASH> 100644 --- a/lib/zendesk_apps_support/validations/requirements.rb +++ b/lib/zendesk_apps_support/validations/requirements.rb @@ -4,7 +4,7 @@ module ZendeskAppsSupport module Validations module Requirements MAX_REQUIREMENTS = 5000 - MAX_CUSTOM_OBJECTS_REQUIREMENTS = 10 + MAX_CUSTOM_OBJECTS_REQUIREMENTS = 50 class << self def call(package) diff --git a/spec/validations/requirements_spec.rb b/spec/validations/requirements_spec.rb index <HASH>..<HASH> 100644 --- a/spec/validations/requirements_spec.rb +++ b/spec/validations/requirements_spec.rb @@ -89,13 +89,13 @@ describe ZendeskAppsSupport::Validations::Requirements do custom_object_relationships: [] } } - 5.times do + 25.times do requirements_content[:custom_objects][:custom_object_types] << { key: 'foo', schema: {} } end - 6.times do + 26.times do requirements_content[:custom_objects][:custom_object_relationships] << { key: 'foo', source: 'bar',
Update constant from <I> to <I>
zendesk_zendesk_apps_support
train
rb,rb
e12c86d25b708a75beb883cbc1eb98fabd659551
diff --git a/ui/fields/select2.php b/ui/fields/select2.php index <HASH>..<HASH> 100644 --- a/ui/fields/select2.php +++ b/ui/fields/select2.php @@ -0,0 +1,30 @@ +<?php +$attributes = array(); +$attributes['type'] = 'hidden'; +$attributes['value'] = $value; +$attributes['data-field-type'] = 'select2'; +$attributes = PodsForm::merge_attributes($attributes, $name, PodsForm::$field_type, $options); +?> +<input<?php PodsForm::attributes($attributes, $name, PodsForm::$field_type, $options); ?> /> + +<script type="text/javascript"> +jQuery(function($) { + $('#<?php echo $attributes['id']; ?>').select2({ + placeholder: 'Start Typing...', + minimumInputLength: 1, + ajax: { + url: pods_ajaxurl, + type: 'POST', + dataType: 'json', + data: function(term, page) { + return { + _wpnonce: nonce, + action: 'pods_admin', + method: 'select2_ajax', + query: term + }; + } + } + }); +}); +</script>
Started adding JS for select2 view file
pods-framework_pods
train
php
5f6651eea17a8b6c1972eb7df185284f0861631f
diff --git a/lib/slate/parser/extensions.rb b/lib/slate/parser/extensions.rb index <HASH>..<HASH> 100644 --- a/lib/slate/parser/extensions.rb +++ b/lib/slate/parser/extensions.rb @@ -1,56 +1,33 @@ module Slate module SlateTree class Target < Treetop::Runtime::SyntaxNode - def type - :target - end - def text_value elements.detect{ |e| e.is_a? String }.text_value end end class Function < Treetop::Runtime::SyntaxNode - def type - :function - end - def text_value elements.detect{ |e| e.is_a? Token }.text_value end end class Token < Treetop::Runtime::SyntaxNode - def type - :token - end end class Argument < Treetop::Runtime::SyntaxNode - def type - :argument - end - def text_value elements.first.text_value end end class String < Treetop::Runtime::SyntaxNode - def type - :string - end - def text_value super.gsub(/"/,'') end end class Integer < Treetop::Runtime::SyntaxNode - def type - :integer - end - def text_value super.to_i end
Removing unused type attribute on slate extensions
trobrock_slate
train
rb
42453bcd94ecc1c01770034a50b67eb563a57d3b
diff --git a/dev/com.ibm.ws.repository/test/com/ibm/ws/repository/connections/test/SingleFileRepositoryConnectionTest.java b/dev/com.ibm.ws.repository/test/com/ibm/ws/repository/connections/test/SingleFileRepositoryConnectionTest.java index <HASH>..<HASH> 100644 --- a/dev/com.ibm.ws.repository/test/com/ibm/ws/repository/connections/test/SingleFileRepositoryConnectionTest.java +++ b/dev/com.ibm.ws.repository/test/com/ibm/ws/repository/connections/test/SingleFileRepositoryConnectionTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.fail; import java.io.File; import org.junit.After; +import org.junit.Before; import org.junit.Test; import com.ibm.ws.repository.connections.SingleFileRepositoryConnection; @@ -30,6 +31,7 @@ public class SingleFileRepositoryConnectionTest { private static final File FILE = new File("testSingleFileRepo"); + @Before @After public void cleanup() { if (FILE.exists()) {
Clean up test file before+after tests for windows
OpenLiberty_open-liberty
train
java
89a8ca3f4bb1e711410a8474cf1dc29c36d6e5eb
diff --git a/tasks/handlebars.js b/tasks/handlebars.js index <HASH>..<HASH> 100644 --- a/tasks/handlebars.js +++ b/tasks/handlebars.js @@ -99,8 +99,8 @@ module.exports = function(grunt) { if (options.amd) { // Wrap the file in an AMD define fn. - output.unshift('define(function() { return'); - output.push('});'); + output.unshift("define(['handlebars'], function(Handlebars) { return"); + output.push("});"); } grunt.file.write(f.dest, output.join(grunt.util.normalizelf(options.separator))); diff --git a/test/expected/amd_compile.js b/test/expected/amd_compile.js index <HASH>..<HASH> 100644 --- a/test/expected/amd_compile.js +++ b/test/expected/amd_compile.js @@ -1,4 +1,4 @@ -define(function() { return +define(['handlebars'], function(Handlebars) { return Handlebars.template(function (Handlebars,depth0,helpers,partials,data) { helpers = helpers || Handlebars.helpers; data = data || {};
define handlebars as a dependency for amd option
gruntjs_grunt-contrib-handlebars
train
js,js
20381958afb5d61950d60bbecec244d302334e5c
diff --git a/rpcclient.go b/rpcclient.go index <HASH>..<HASH> 100644 --- a/rpcclient.go +++ b/rpcclient.go @@ -151,9 +151,9 @@ func (self *RpcClient) Call(serviceMethod string, args interface{}, reply interf err = ErrDisconnected } else { errChan := make(chan error, 1) - go func() { + go func(serviceMethod string, args interface{}, reply interface{}) { errChan <- self.connection.Call(serviceMethod, args, reply) - }() + }(serviceMethod, args, reply) select { case err = <-errChan: case <-time.After(self.replyTimeout):
Concurrency fix for RpcClient call
cgrates_rpcclient
train
go
c6d3fa20c148399b11abeb3b2093eac9b3944c74
diff --git a/cassandra/cluster.py b/cassandra/cluster.py index <HASH>..<HASH> 100644 --- a/cassandra/cluster.py +++ b/cassandra/cluster.py @@ -1339,3 +1339,8 @@ class ResponseFuture(object): """ self.add_callback(callback, *callback_args, **(callback_kwargs or {})) self.add_errback(errback, *errback_args, **(errback_kwargs or {})) + + def __str__(self): + query = self.query.query_string + return "<ResponseFuture: query='%s' request_id=%s result=%s exception=%s host=%s>" \ + % (query, self._req_id, self._final_result, self._final_exception, self._current_host)
Add __str__ method for ResponseFuture
datastax_python-driver
train
py
fd1d767cd7d79a4ebb41e428cb16c264b2b97e0b
diff --git a/lib/writer.rb b/lib/writer.rb index <HASH>..<HASH> 100644 --- a/lib/writer.rb +++ b/lib/writer.rb @@ -3,7 +3,6 @@ module WaveFile def initialize(file_name, format) @file = File.open(file_name, "w") @format = format.dup - @format.interleaving = :interleaved @sample_count = 0 @pack_code = PACK_CODES[format.bits_per_sample]
Removing another reference to interleaving
jstrait_wavefile
train
rb
c3eb3cd567503754b2af58c820b1422d860b4d6e
diff --git a/core/server/services/members/service.js b/core/server/services/members/service.js index <HASH>..<HASH> 100644 --- a/core/server/services/members/service.js +++ b/core/server/services/members/service.js @@ -60,7 +60,7 @@ const processImport = async (options) => { delete result.meta.originalImportSize; const importThreshold = await verificationTrigger.getImportThreshold(); - if (importThreshold > importSize) { + if (importSize > importThreshold) { await verificationTrigger.startVerificationProcess({ amountImported: importSize, throwOnTrigger: true
Fix imports triggering verification when below threshold no issue Swapped the variable names for importSize and importThreshold
TryGhost_Ghost
train
js
80240e9aa3ce63081365f2fe581dacd0423feedc
diff --git a/lib/plugin/components/state-resources/send-task-heartbeat/index.js b/lib/plugin/components/state-resources/send-task-heartbeat/index.js index <HASH>..<HASH> 100644 --- a/lib/plugin/components/state-resources/send-task-heartbeat/index.js +++ b/lib/plugin/components/state-resources/send-task-heartbeat/index.js @@ -21,11 +21,11 @@ class SendTaskHeartbeat { return this.notRunning(event, context) } - if (this.lastDescribedTimeFrame && execution.lastDescribed) { + if (this.lastDescribedTimeFrame) { const expected = moment().subtract(this.lastDescribedTimeFrame, 'seconds') - const lastDescribed = moment(execution.lastDescribed) + const lastDescribed = execution.lastDescribed ? moment(execution.lastDescribed) : null - if (lastDescribed.isBefore(expected)) { + if (lastDescribed === null || lastDescribed.isBefore(expected)) { await this.statebox.stopExecution( 'Execution stopped interally', 'STOPPED',
fix: send task heartbeat to check if last described execution is null
wmfs_tymly-core
train
js
71111746ec7aff7219cd703bed8ab8cf802031e0
diff --git a/netmiko/fortinet/fortinet_ssh.py b/netmiko/fortinet/fortinet_ssh.py index <HASH>..<HASH> 100644 --- a/netmiko/fortinet/fortinet_ssh.py +++ b/netmiko/fortinet/fortinet_ssh.py @@ -11,7 +11,7 @@ class FortinetSSH(SSHConnection): def session_preparation(self): """Prepare the session after the connection has been established.""" - self.set_base_prompt(pri_prompt_terminator='$') + self.set_base_prompt(alt_prompt_terminator='$') self.disable_paging() def disable_paging(self, delay_factor=.1):
Define $ as alt prompt terminator instead of primary prompt terminator for Fortinet devices
ktbyers_netmiko
train
py
b5d931650529e22f044a6120938a027ec46f74de
diff --git a/sos/plugins/zfs.py b/sos/plugins/zfs.py index <HASH>..<HASH> 100644 --- a/sos/plugins/zfs.py +++ b/sos/plugins/zfs.py @@ -13,24 +13,24 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from sos.plugins import Plugin, UbuntuPlugin, DebianPlugin +from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin -class Zfs(Plugin, UbuntuPlugin, DebianPlugin): +class Zfs(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): """ZFS filesystem """ plugin_name = 'zfs' profiles = ('storage',) - packages = ('zfsutils-linux',) + packages = ('zfsutils-linux', 'zfs',) def setup(self): self.add_cmd_output([ "zfs get all", "zfs list -t all -o space", "zpool list", - "zpool status -x" + "zpool status -vx" ]) zpools = self.call_ext_prog("zpool list -H -o name")
[zfs] Add support for zfsonlinux and rhel This add support for the official OpenZFS port for Linux <URL>
sosreport_sos
train
py
24856811d767b0c4d3e97c966fc3da345a3ccdb2
diff --git a/openstack_dashboard/api/keystone.py b/openstack_dashboard/api/keystone.py index <HASH>..<HASH> 100644 --- a/openstack_dashboard/api/keystone.py +++ b/openstack_dashboard/api/keystone.py @@ -232,9 +232,9 @@ def domain_update(request, domain_id, name=None, description=None, try: response = manager.update(domain_id, name=name, description=description, enabled=enabled) - except Exception as e: + except Exception: LOG.exception("Unable to update Domain: %s" % domain_id) - raise e + raise return response diff --git a/openstack_dashboard/api/neutron.py b/openstack_dashboard/api/neutron.py index <HASH>..<HASH> 100644 --- a/openstack_dashboard/api/neutron.py +++ b/openstack_dashboard/api/neutron.py @@ -1144,11 +1144,11 @@ def _server_get_addresses(request, server, ports, floating_ips, network_names): def _format_address(mac, ip, type): try: version = netaddr.IPAddress(ip).version - except Exception as e: + except Exception: error_message = _('Unable to parse IP address %s.') % ip LOG.error(error_message) messages.error(request, error_message) - raise e + raise return {u'OS-EXT-IPS-MAC:mac_addr': mac, u'version': version, u'addr': ip,
Correct reraising of exception When an exception was caught and rethrown, it should call 'raise' without any arguments because it shows the place where an exception occured initially instead of place where the exception re-raised. Change-Id: I<I>c<I>ac<I>f5d<I>a<I>e6a<I>db<I>e<I>b<I>b
openstack_horizon
train
py,py
c185e9997026f6fdf21245065fa9c13a71cf170c
diff --git a/salt/utils/gitfs.py b/salt/utils/gitfs.py index <HASH>..<HASH> 100644 --- a/salt/utils/gitfs.py +++ b/salt/utils/gitfs.py @@ -1508,7 +1508,7 @@ class GitBase(object): self.cache_root = os.path.join(self.opts['cachedir'], self.role) self.env_cache = os.path.join(self.cache_root, 'envs.p') self.hash_cachedir = os.path.join( - self.cache_root, self.role, 'hash') + self.cache_root, 'hash') self.file_list_cachedir = os.path.join( self.opts['cachedir'], 'file_lists', self.role)
Second attempt to fix #<I>
saltstack_salt
train
py
91b825dec23942eca18b3d673ed32a71904412e1
diff --git a/src/constructN.js b/src/constructN.js index <HASH>..<HASH> 100644 --- a/src/constructN.js +++ b/src/constructN.js @@ -23,9 +23,7 @@ var nAry = require('./nAry'); * this.ingredients = arguments; * }; * Salad.prototype.recipe = function() { - * var instructions = R.map((ingredient) => ( - * 'Add a whollop of ' + ingredient), this.ingredients - * ) + * var instructions = R.map((ingredient) => 'Add a dollop of ' + ingredient, this.ingredients) * return R.join('\n', instructions) * } * @@ -34,9 +32,9 @@ var nAry = require('./nAry'); * // Notice we no longer need the 'new' keyword, and the constructor is curried for 3 arguments. * var salad = ThreeLayerSalad('Mayonnaise')('Potato Chips')('Ketchup') * console.log(salad.recipe()); - * // Add a whollop of Mayonnaise - * // Add a whollop of Potato Chips - * // Add a whollop of Potato Ketchup + * // Add a dollop of Mayonnaise + * // Add a dollop of Potato Chips + * // Add a dollop of Potato Ketchup */ module.exports = _curry2(function constructN(n, Fn) { if (n > 10) {
Place R.map call on one line, change whollop to dollop
ramda_ramda
train
js
d47b4f4b27326d6405d662d74f6685f227259b54
diff --git a/libkbfs/cr_chains.go b/libkbfs/cr_chains.go index <HASH>..<HASH> 100644 --- a/libkbfs/cr_chains.go +++ b/libkbfs/cr_chains.go @@ -975,7 +975,8 @@ func (ccs *crChains) copyOpAndRevertUnrefsToOriginals(currOp op) op { return newOp } -// changeOriginal converts the original of a chain to a different original. +// changeOriginal converts the original of a chain to a different +// original, which originated in some other branch. func (ccs *crChains) changeOriginal(oldOriginal BlockPointer, newOriginal BlockPointer) error { chain, ok := ccs.byOriginal[oldOriginal] @@ -998,7 +999,8 @@ func (ccs *crChains) changeOriginal(oldOriginal BlockPointer, } if _, ok := ccs.createdOriginals[oldOriginal]; ok { delete(ccs.createdOriginals, oldOriginal) - ccs.createdOriginals[newOriginal] = true + // We're swapping in an original made on some other branch, so + // it shouldn't go in the `createdOriginals` map. } if ri, ok := ccs.renamedOriginals[oldOriginal]; ok { delete(ccs.renamedOriginals, oldOriginal)
cr_chains: changeOriginal shouldn't put into createdOriginals Since the new original actually came from some other branch. Issue: KBFS-<I>
keybase_client
train
go
91fd76c34dbb3417ef35ea2b4452cde09c4b03cb
diff --git a/src/Database/Query.php b/src/Database/Query.php index <HASH>..<HASH> 100644 --- a/src/Database/Query.php +++ b/src/Database/Query.php @@ -644,7 +644,7 @@ class Query */ public function delete() { - $query = 'delete from '.getTables($this->tables).' '; + $query = 'delete from '.$this->getTables($this->tables).' '; // $query .= ' '.$this->where; //
fix a bug in Query surface
vinala_kernel
train
php
f99e0be24862b67cd0400af845a51b1f1dc70ed0
diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js index <HASH>..<HASH> 100644 --- a/CordovaLib/cordova.js +++ b/CordovaLib/cordova.js @@ -1,5 +1,5 @@ // Platform: ios -// c517ca811b4948b630e0b74dbae6c9637939da24 +// 2fd4bcb84048415922d13d80d35b8d1668e8e150 /* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -817,7 +817,7 @@ module.exports = channel; }); -// file: /Users/steveng/repo/cordova/cordova-ios/cordova-js-src/exec.js +// file: /Users/ednamorales/dev/apache_plugins/cordova-ios/cordova-js-src/exec.js define("cordova/exec", function(require, exports, module) { /*global require, module, atob, document */ @@ -1545,7 +1545,7 @@ exports.reset(); }); -// file: /Users/steveng/repo/cordova/cordova-ios/cordova-js-src/platform.js +// file: /Users/ednamorales/dev/apache_plugins/cordova-ios/cordova-js-src/platform.js define("cordova/platform", function(require, exports, module) { module.exports = {
Update JS snapshot to version <I>-dev (via coho)
apache_cordova-ios
train
js
564100a8c09ff2eadc706669ac5e656ff52e2866
diff --git a/hazelcast/src/test/java/com/hazelcast/scheduledexecutor/ScheduledExecutorServiceTest.java b/hazelcast/src/test/java/com/hazelcast/scheduledexecutor/ScheduledExecutorServiceTest.java index <HASH>..<HASH> 100644 --- a/hazelcast/src/test/java/com/hazelcast/scheduledexecutor/ScheduledExecutorServiceTest.java +++ b/hazelcast/src/test/java/com/hazelcast/scheduledexecutor/ScheduledExecutorServiceTest.java @@ -38,6 +38,7 @@ import com.hazelcast.test.annotation.ParallelTest; import com.hazelcast.test.annotation.QuickTest; import com.hazelcast.util.executor.ManagedExecutorService; import org.junit.After; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -147,6 +148,7 @@ public class ScheduledExecutorServiceTest extends HazelcastTestSupport { } @Test + @Ignore public void stats() throws ExecutionException, InterruptedException { double delay = 2.0; @@ -177,6 +179,7 @@ public class ScheduledExecutorServiceTest extends HazelcastTestSupport { } @Test + @Ignore public void stats_whenMemberOwned() throws ExecutionException, InterruptedException { double delay = 2.0;
Disable Scheduled Executor stats related tests until fixed
hazelcast_hazelcast
train
java
37b540be00ff748b3741d273257d2b1358ab0062
diff --git a/src/main/java/org/dasein/cloud/aws/compute/EC2InstanceCapabilities.java b/src/main/java/org/dasein/cloud/aws/compute/EC2InstanceCapabilities.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/dasein/cloud/aws/compute/EC2InstanceCapabilities.java +++ b/src/main/java/org/dasein/cloud/aws/compute/EC2InstanceCapabilities.java @@ -46,7 +46,7 @@ public class EC2InstanceCapabilities extends AbstractCapabilities<AWSCloud> impl @Override public boolean canAlter(@Nonnull VmState fromState) throws CloudException, InternalException { - return false; + return VmState.STOPPED.equals(fromState); } @Override
Can only alter VMs when they are stopped
dasein-cloud_dasein-cloud-aws
train
java
cd12450af0ac71562cdc4a85df5c2770d0124cf4
diff --git a/lib/bumper_pusher/bumper.rb b/lib/bumper_pusher/bumper.rb index <HASH>..<HASH> 100755 --- a/lib/bumper_pusher/bumper.rb +++ b/lib/bumper_pusher/bumper.rb @@ -39,7 +39,7 @@ module BumperPusher if is_git_flow_installed # supposed, that with git flow you should release from develop branch - if current_branch != 'develop' + if current_branch != 'develop' && current_branch.split('/').first != 'hotfix' puts "Warning: You're in branch (#{current_branch})!".yellow ask_sure_Y end
remove varning in case of hotfix branch
skywinder_bumper_pusher
train
rb
f3321283b6e71dffa3748b39950aaa815071383c
diff --git a/src/barbequeue/common/classes.py b/src/barbequeue/common/classes.py index <HASH>..<HASH> 100644 --- a/src/barbequeue/common/classes.py +++ b/src/barbequeue/common/classes.py @@ -2,7 +2,7 @@ import enum import logging from collections import namedtuple -from barbequeue.common.utils import stringify_func, import_stringified_func +from barbequeue.common.utils import import_stringified_func, stringify_func logger = logging.getLogger(__name__) @@ -10,7 +10,7 @@ logger = logging.getLogger(__name__) class Job(object): class State(enum.Enum): SCHEDULED = 0 - # STARTED = 1 + QUEUED = 1 RUNNING = 2 FAILED = 3 CANCELED = 4 @@ -41,6 +41,10 @@ class Job(object): y = lambda: func(*self.args, **self.kwargs) return y + def __repr__(self): + return "Job id: {id} state: {state} func: {func}".format(id=self.job_id, state=self.state.name, + func=self.func) + def serialize(self): pass @@ -53,5 +57,3 @@ class Function(namedtuple("_Function", ["module", "funcname"])): def serialize(self): # Since this is all in memory, there is no need to serialize anything. raise NotImplementedError() - -
Add the queued job state, and give a better string representation of a Job
learningequality_iceqube
train
py
9fdcf0b36000c500c862659f3416133587e0e97e
diff --git a/components/prism-sql.js b/components/prism-sql.js index <HASH>..<HASH> 100644 --- a/components/prism-sql.js +++ b/components/prism-sql.js @@ -1,6 +1,6 @@ Prism.languages.sql= { 'comment': { - pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|((--)|(\/\/)).*?(\r?\n|$))/g, + pattern: /(^|[^\\])(\/\*[\w\W]*?\*\/|((--)|(\/\/)|#).*?(\r?\n|$))/g, lookbehind: true }, 'string' : /("|')(\\?.)*?\1/g,
Added support for MySQL single line comment Added an extra hash to support MySQL single line comments
PrismJS_prism
train
js
f5a46cbfafa1459b3033c797d27d4a1d354556ac
diff --git a/code/administrator/components/com_activities/databases/rows/activity.php b/code/administrator/components/com_activities/databases/rows/activity.php index <HASH>..<HASH> 100644 --- a/code/administrator/components/com_activities/databases/rows/activity.php +++ b/code/administrator/components/com_activities/databases/rows/activity.php @@ -53,6 +53,21 @@ class ComActivitiesDatabaseRowActivity extends KDatabaseRowDefault } } + $required_columns = array('package','name','action','title', 'status'); + $empty_columns = array(); + + foreach ($required_columns as $column) { + if (empty($this->$column)) { + $empty_columns[] = $column; + } + } + + if (count($empty_columns)) { + $this->setStatus(KDatabase::STATUS_FAILED); + $this->setStatusMessage(JText::sprintf('COM_ACTIVITIES_REQUIRED_COLUMNS', implode(', ', $empty_columns))); + return false; + } + $result = parent::save(); if ($result && ($this->action == 'delete') && $this->row) {
Added data validation on some mandatory columns.
joomlatools_joomlatools-framework
train
php
8d94231146275e6476ff7790bb5c021c5976920c
diff --git a/resources/lang/ar-SA/cachet.php b/resources/lang/ar-SA/cachet.php index <HASH>..<HASH> 100644 --- a/resources/lang/ar-SA/cachet.php +++ b/resources/lang/ar-SA/cachet.php @@ -33,6 +33,7 @@ return [ 'scheduled' => 'صيانة مجدولة', 'scheduled_at' => ', مجدولة :timestamp', 'posted' => 'تم الإرسال :timestamp', + 'posted_at' => 'Posted at :timestamp', 'status' => [ 1 => 'تحقيق', 2 => 'تم التعرف عليه',
New translations cachet.php (Arabic)
CachetHQ_Cachet
train
php
f7ce3121284b5a1a79c922a7675a8a3bdac17353
diff --git a/lib/tmuxinator/cli.rb b/lib/tmuxinator/cli.rb index <HASH>..<HASH> 100644 --- a/lib/tmuxinator/cli.rb +++ b/lib/tmuxinator/cli.rb @@ -6,7 +6,7 @@ module Tmuxinator def initialize(*args) super - @command_list = %w(commands copy debug delete doctor help implode list start version) + @command_list = %w(commands copy debug delete doctor help implode list open start version) end package_name "tmuxinator" unless Gem::Version.create(Thor::VERSION) < Gem::Version.create("0.18")
[Closes #<I>] Add open to command list
tmuxinator_tmuxinator
train
rb
7020278e959a3182fb594af2afca5cb4bfd97204
diff --git a/lib/clearwater/version.rb b/lib/clearwater/version.rb index <HASH>..<HASH> 100644 --- a/lib/clearwater/version.rb +++ b/lib/clearwater/version.rb @@ -1,3 +1,3 @@ module Clearwater - VERSION = "0.3.0" + VERSION = "0.3.1" end
Version <I> This version fixes compatibility with Opal <I>.x
clearwater-rb_clearwater
train
rb
df9ab5884e4091f59469625d03e35479d4a9cf90
diff --git a/src/PhpPact/Consumer/Listener/PactTestListener.php b/src/PhpPact/Consumer/Listener/PactTestListener.php index <HASH>..<HASH> 100644 --- a/src/PhpPact/Consumer/Listener/PactTestListener.php +++ b/src/PhpPact/Consumer/Listener/PactTestListener.php @@ -65,17 +65,14 @@ class PactTestListener implements TestListener } } - /** - * Mark the test suite as a failure so that the PACT file does not get pushed to the broker. - * - * @param Test $test - * @param float $time - */ - public function endTest(Test $test, $time) + public function addError(Test $test, \Exception $e, $time) { - if ($test->hasFailed() === true) { - $this->failed = true; - } + $this->failed = true; + } + + public function addFailure(Test $test, AssertionFailedError $e, $time) + { + $this->failed = true; } /**
Fixed call to undefined method Test::hasFailed()
pact-foundation_pact-php
train
php
2209e71840492615af9bb30070ec3fee42d6a2aa
diff --git a/src/Repositories/Character/Info.php b/src/Repositories/Character/Info.php index <HASH>..<HASH> 100644 --- a/src/Repositories/Character/Info.php +++ b/src/Repositories/Character/Info.php @@ -67,9 +67,9 @@ trait Info * * @param int $character_id * - * @return \Seat\Eveapi\Models\Character\CharacterSheet + * @return \Seat\Eveapi\Models\Character\CharacterSheet|null */ - public function getCharacterSheet(int $character_id): CharacterSheet + public function getCharacterSheet(int $character_id) { return CharacterSheet::find($character_id);
Remove return type as it can be null too
eveseat_services
train
php
9681f5b74010ee1e100dad767e7f9688221d22eb
diff --git a/src/org/jgroups/jmx/JmxConfigurator.java b/src/org/jgroups/jmx/JmxConfigurator.java index <HASH>..<HASH> 100644 --- a/src/org/jgroups/jmx/JmxConfigurator.java +++ b/src/org/jgroups/jmx/JmxConfigurator.java @@ -17,7 +17,7 @@ import java.util.Iterator; /** * @author Bela Ban - * @version $Id: JmxConfigurator.java,v 1.11 2008/03/10 03:21:14 vlada Exp $ + * @version $Id: JmxConfigurator.java,v 1.12 2008/03/12 08:01:50 vlada Exp $ */ public class JmxConfigurator { static final Log log=LogFactory.getLog(JmxConfigurator.class); @@ -50,12 +50,10 @@ public class JmxConfigurator { if(register_protocols) { ProtocolStack stack=channel.getProtocolStack(); Vector<Protocol> protocols=stack.getProtocols(); - for(Protocol p:protocols) { - if(p.getClass().isAnnotationPresent(MBean.class)) { - Registration.register(p, - ManagementFactory.getPlatformMBeanServer(), - getProtocolRegistrationName(cluster_name, domain, p)); - } + for(Protocol p:protocols) { + Registration.register(p, + ManagementFactory.getPlatformMBeanServer(), + getProtocolRegistrationName(cluster_name, domain, p)); } } Registration.register(channel, server, getChannelRegistrationName(channel,
allow non-annotated MBean protocols to be exposed
belaban_JGroups
train
java
9573bb44a4d6ca41af1fbcca77595e33e93de632
diff --git a/js/cw/objsize.js b/js/cw/objsize.js index <HASH>..<HASH> 100644 --- a/js/cw/objsize.js +++ b/js/cw/objsize.js @@ -16,10 +16,8 @@ goog.provide('cw.objsize'); cw.objsize.totalSizeOf = function(obj) { var type = goog.typeOf(obj); if(type == 'string') { - // We don't know if the UTF-16 string has mostly has 2-byte - // characters, or 4-byte characters. Split the difference. - // and not 4-byte characters. - return 21 + 3 * obj.length; + // Assume the UTF-16 string is using 2 bytes per codepoint. + return 21 + 2 * obj.length; } else if(type == 'number') { return 16; } else if(type == 'boolean') {
js/cw/objsize.js: totalSizeOf: return better measurement for strings. .length returns the number of UTF-<I> pairs, not the number of "real" characters.
ludiosarchive_Coreweb
train
js
f9406d71581805a8174eafe0b7986e5ece78caed
diff --git a/src/Router/HandlerMapping.php b/src/Router/HandlerMapping.php index <HASH>..<HASH> 100644 --- a/src/Router/HandlerMapping.php +++ b/src/Router/HandlerMapping.php @@ -164,7 +164,7 @@ class HandlerMapping extends AbstractRouter implements HandlerMappingInterface protected function collectParamRoute(string $route, array $methods, array $conf) { $conf['original'] = $route; - $params = $this->getAvailableParams($opts['params'] ?? []); + $params = $this->getAvailableParams($conf['option']['params'] ?? []); list($first, $conf) = $this->parseParamRoute($route, $params, $conf); // route string have regular @@ -366,7 +366,10 @@ class HandlerMapping extends AbstractRouter implements HandlerMappingInterface } } - return [self::NOT_FOUND, \explode(',', \trim($allowedMethods, ','))]; + return [ + self::NOT_FOUND, + $allowedMethods ? \explode(',', \rtrim($allowedMethods, ',')) : [] + ]; } /**
fix: cannot setting params. Sometimes 'notFound' would be considered 'notAllowed'
swoft-cloud_swoft-http-server
train
php
de4a226d36f00f3733fa045f4348379ab2727ee4
diff --git a/pushbullet/pushbullet.py b/pushbullet/pushbullet.py index <HASH>..<HASH> 100644 --- a/pushbullet/pushbullet.py +++ b/pushbullet/pushbullet.py @@ -34,6 +34,32 @@ class PushBullet(object): d._account = self self.devices.append(d) + def get_pushes(self, modified_after=None): + data = {"modified_after": modified_after} + r = self._session.get(self.PUSH_URL, params=data) + + if r.status_code == requests.codes.ok: + return True, r.json().get("pushes") + else: + return False, r.json() + + def dismiss_push(self, iden): + data = {"dismissed": True} + r = self._session.post("{}/{}".format(self.PUSH_URL, iden), data=json.dumps(data)) + + if r.status_code == requests.codes.ok: + return True, r.json() + else: + return False, r.json() + + def delete_push(self, iden): + r = self._session.delete("{}/{}".format(self.PUSH_URL, iden)) + + if r.status_code == requests.codes.ok: + return True, r.json() + else: + return False, r.json() + def upload_file(self, f, file_name, file_type=None): if not file_type: file_type = magic.from_buffer(f.read(1024), mime=True)
Added: getting, dismissing and deleting pushes.
rbrcsk_pushbullet.py
train
py
d4c139614ed63a61bdebf104109ee9a6583de95c
diff --git a/test/history_test.rb b/test/history_test.rb index <HASH>..<HASH> 100644 --- a/test/history_test.rb +++ b/test/history_test.rb @@ -217,7 +217,7 @@ class HistoryTestWithFriendlyFinders < HistoryTest end end -class HistoryTestWithFriendlyFindersModuleBeforeHistory < HistoryTest +class HistoryTestWithFindersBeforeHistory < HistoryTest class Novelist < ActiveRecord::Base has_many :novels end
Renamed HistoryTestWithFriendlyFindersModuleBeforeHistory to HistoryTestWithFindersBeforeHistory. Test was broken on Travis CI because Name HistoryTestWithFriendlyFindersModuleBeforeHistory::Novelist is too long for sluggable_type.
norman_friendly_id
train
rb
19aeb4acb0f04fb0281331f9e0524416147f39b3
diff --git a/src/Zephyrus/Utilities/Gravatar.php b/src/Zephyrus/Utilities/Gravatar.php index <HASH>..<HASH> 100644 --- a/src/Zephyrus/Utilities/Gravatar.php +++ b/src/Zephyrus/Utilities/Gravatar.php @@ -28,7 +28,9 @@ class Gravatar $uri = 'https://www.gravatar.com/avatar/' . $this->hash . '?d=404'; $headers = @get_headers($uri); if (is_bool($headers)) { + // @codeCoverageIgnoreStart return false; + // @codeCoverageIgnoreEnd } return preg_match("|200|", $headers[0]); }
Ignored coverage for gravatar specific case
dadajuice_zephyrus
train
php
e71dfa4b6ee733430548ebc8708e3f49909aaf8e
diff --git a/tests/DompdfTest.php b/tests/DompdfTest.php index <HASH>..<HASH> 100644 --- a/tests/DompdfTest.php +++ b/tests/DompdfTest.php @@ -71,6 +71,42 @@ class DompdfTest extends TestCase $this->assertEquals('', $dompdf->getDom()->textContent); } + public function callbacksProvider(): array + { + return [ + ["begin_page_reflow", 1], + ["begin_frame", 3], + ["end_frame", 3], + ["begin_page_render", 1], + ["end_page_render", 1] + ]; + } + + /** + * @dataProvider callbacksProvider + */ + public function testCallbacks(string $event, int $numCalls): void + { + $called = 0; + + $dompdf = new Dompdf(); + $dompdf->setCallbacks([ + [ + "event" => $event, + "f" => function ($infos) use (&$called) { + $this->assertIsArray($infos); + $this->assertCount(4, $infos); + $called++; + } + ] + ]); + + $dompdf->loadHtml("<html><body><p>Some text</p></body></html>"); + $dompdf->render(); + + $this->assertSame($numCalls, $called); + } + public function testSpaceAtStartOfSecondInlineTag() { $text_frame_contents = [];
Adds some very basic tests for callback handling
dompdf_dompdf
train
php
fddeb22f8ee17370e2a11b9d038995a76af2887a
diff --git a/mod/glossary/view.php b/mod/glossary/view.php index <HASH>..<HASH> 100644 --- a/mod/glossary/view.php +++ b/mod/glossary/view.php @@ -353,7 +353,18 @@ /// highlight the term if necessary if ($mode == 'search') { - $entry->highlight = $hook; + //We have to strip any word starting by + and take out words starting by - + //to make highlight works properly + $searchterms = explode(' ', $hook); // Search for words independently + foreach ($searchterms as $key => $searchterm) { + if (preg_match('/^\-/',$searchterm)) { + unset($searchterms[$key]); + } else { + $searchterms[$key] = preg_replace('/^\+/','',$searchterm); + } + } + $strippedsearch = implode(' ', $searchterms); // Rebuild the string + $entry->highlight = $strippedsearch; } /// and finally print the entry.
Now + and - search terms are properly highlighted under glossary searches. This was broken recently solving some non-iso problems. Merged from MOODLE_<I>_STABLE
moodle_moodle
train
php
4733757bb1e997493c148e2a515cc9d45b4cd099
diff --git a/dvc/output/local.py b/dvc/output/local.py index <HASH>..<HASH> 100644 --- a/dvc/output/local.py +++ b/dvc/output/local.py @@ -73,9 +73,9 @@ class LocalOutput(BaseOutput): if os.path.isabs(self.def_path): return False - if self.repo and not self.path_info.isin(self.repo.root_dir): - return False - return True + return self.repo and path_isin( + os.path.realpath(self.path_info), self.repo.root_dir + ) def dumpd(self): ret = super().dumpd()
use realpath for is_in_repo calculation (#<I>) This is because, the repo root is used from a realpath, and the stage.wdir is abspath. We might need to use same kinds of path, but this patch seems to be the easiest/fastest way to fix the flaky tests (if all the tests agree).
iterative_dvc
train
py
804e86607f090c951aaf3330cb1df6c7816d86fa
diff --git a/pymatbridge/tests/test_json.py b/pymatbridge/tests/test_json.py index <HASH>..<HASH> 100644 --- a/pymatbridge/tests/test_json.py +++ b/pymatbridge/tests/test_json.py @@ -15,7 +15,7 @@ def test_demo_func(): mlab.stop() npt.assert_(not mlab.is_connected(), msg = "Disconnection failed") -# Print some strange charactes in Matlab, get them back and compare. +# Print some strange characters in Matlab, get them back and compare. def test_special_character(): mlab = pymat.Matlab() mlab.start()
Typo fixed in line <I>
arokem_python-matlab-bridge
train
py
27a847eb2c258c9cfae1c464bed75a6ee632943b
diff --git a/pkts-core/src/main/java/io/pkts/framer/FramingException.java b/pkts-core/src/main/java/io/pkts/framer/FramingException.java index <HASH>..<HASH> 100644 --- a/pkts-core/src/main/java/io/pkts/framer/FramingException.java +++ b/pkts-core/src/main/java/io/pkts/framer/FramingException.java @@ -2,10 +2,10 @@ package io.pkts.framer; import io.pkts.protocol.Protocol; -public class FramingException extends Exception { +public class FramingException extends RuntimeException { private final Protocol protocol; - FramingException(String message, Protocol protocol) { + FramingException(final String message, final Protocol protocol) { super(message); this.protocol = protocol; }
Changing FramingException to be a RuntimeException
aboutsip_pkts
train
java
c9f2438ec88ff24e022e43b7dac02b669de0b97c
diff --git a/lib/pgslice.rb b/lib/pgslice.rb index <HASH>..<HASH> 100644 --- a/lib/pgslice.rb +++ b/lib/pgslice.rb @@ -253,6 +253,10 @@ CREATE TABLE #{partition_name} ( $stderr.puts message end + def log_sql(message = nil) + $stdout.puts message + end + def abort(message) raise PgSlice::Error, message end @@ -284,10 +288,10 @@ CREATE TABLE #{partition_name} ( def run_queries(queries) connection.transaction do execute("SET client_min_messages TO warning") - log + log_sql queries.each do |query| - log query - log + log_sql query + log_sql execute(query) unless options[:dry_run] end end
Output sql to stdout
ankane_pgslice
train
rb
a813ac6af2b38e57e351e95783d18564a1c6701a
diff --git a/smartcard/test/framework/testcase_CAtr.py b/smartcard/test/framework/testcase_CAtr.py index <HASH>..<HASH> 100755 --- a/smartcard/test/framework/testcase_CAtr.py +++ b/smartcard/test/framework/testcase_CAtr.py @@ -111,8 +111,8 @@ class testcase_CAtr(unittest.TestCase): self.assert_(a.getTB1() == 0x00) self.assert_(a.getTC1() == 0x00) self.assert_(a.getTD1() == 0x81) - self.assert_(a.TD[2 - 1] == 0x21) # TD2 - self.assert_(a.TB[3 - 1] == 0x45) # TB3 + self.assert_(a.TD[2 - 1] == 0x21) # TD2 + self.assert_(a.TB[3 - 1] == 0x45) # TB3 def suite():
Fixed E<I> pep8 error at least two spaces before inline commen
LudovicRousseau_pyscard
train
py
e1cbc073bfcb3b9844760598477f5dfa092a9cd8
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -149,7 +149,7 @@ _deps = [ "tf2onnx", "timeout-decorator", "timm", - "tokenizers>=0.10.1,!=0.11.3", + "tokenizers>=0.11.1,!=0.11.3", "torch>=1.0", "torchaudio", "pyctcdecode>=0.3.0", diff --git a/src/transformers/dependency_versions_table.py b/src/transformers/dependency_versions_table.py index <HASH>..<HASH> 100644 --- a/src/transformers/dependency_versions_table.py +++ b/src/transformers/dependency_versions_table.py @@ -59,7 +59,7 @@ deps = { "tf2onnx": "tf2onnx", "timeout-decorator": "timeout-decorator", "timm": "timm", - "tokenizers": "tokenizers>=0.10.1,!=0.11.3", + "tokenizers": "tokenizers>=0.11.1,!=0.11.3", "torch": "torch>=1.0", "torchaudio": "torchaudio", "pyctcdecode": "pyctcdecode>=0.3.0",
Require tokenizers>=<I> (#<I>) `tokenizers` version that supports the feature to choose the direction of truncation
huggingface_pytorch-pretrained-BERT
train
py,py
9591cfdc20b7f292a12b65c9d977ef7e773be3bb
diff --git a/BimServer/src/org/bimserver/renderengine/RenderEnginePools.java b/BimServer/src/org/bimserver/renderengine/RenderEnginePools.java index <HASH>..<HASH> 100644 --- a/BimServer/src/org/bimserver/renderengine/RenderEnginePools.java +++ b/BimServer/src/org/bimserver/renderengine/RenderEnginePools.java @@ -54,7 +54,7 @@ public class RenderEnginePools { } } - public RenderEnginePool getRenderEnginePool(Schema schema, String className, PluginConfiguration pluginConfiguration) throws PluginException { + public synchronized RenderEnginePool getRenderEnginePool(Schema schema, String className, PluginConfiguration pluginConfiguration) throws PluginException { if (pools.containsKey(schema)) { Map<String, RenderEnginePool> map = pools.get(schema); if (map.containsKey(className)) {
synchronize on getRenderEnginePool since it's a quick call and we don't want to end up with 2 pools for the same engine
opensourceBIM_BIMserver
train
java
f577e48cdf8dc7669b7c415d309e2cf563e25cb9
diff --git a/upup/pkg/fi/cloudup/dns.go b/upup/pkg/fi/cloudup/dns.go index <HASH>..<HASH> 100644 --- a/upup/pkg/fi/cloudup/dns.go +++ b/upup/pkg/fi/cloudup/dns.go @@ -153,7 +153,7 @@ func precreateDNS(ctx context.Context, cluster *kops.Cluster, cloud fi.Cloud) er return nil } - klog.Infof("Pre-creating DNS records") + klog.Infof("Checking DNS records") zone, err := findZone(cluster, cloud) if err != nil { @@ -215,6 +215,8 @@ func precreateDNS(ctx context.Context, cluster *kops.Cluster, cloud fi.Cloud) er } if len(created) != 0 { + klog.Infof("Pre-creating DNS records") + err := changeset.Apply(ctx) if err != nil { return fmt.Errorf("error pre-creating DNS records: %v", err)
Logging: don't suggest we are pre-creating DNS records unless we are We want to communicate what we're doing, but the log message is confusing.
kubernetes_kops
train
go
12f58773fe347f23371ae7f2cdd1737d69ef021e
diff --git a/vault/token_store.go b/vault/token_store.go index <HASH>..<HASH> 100644 --- a/vault/token_store.go +++ b/vault/token_store.go @@ -749,8 +749,12 @@ func (ts *TokenStore) handleCreateCommon( // If we have a role, we don't even consider parent policies; the role // allowed policies trumps all case role != nil: - if !strListSubset(role.AllowedPolicies, data.Policies) { - return logical.ErrorResponse("token policies must be subset of the role's allowed policies"), logical.ErrInvalidRequest + if len(data.Policies) == 0 { + data.Policies = role.AllowedPolicies + } else { + if !strListSubset(role.AllowedPolicies, data.Policies) { + return logical.ErrorResponse("token policies must be subset of the role's allowed policies"), logical.ErrInvalidRequest + } } case len(data.Policies) == 0:
Use role's allowed policies if none are given
hashicorp_vault
train
go
45c740b6b837d97dd5cce878f88c225cf5c52a16
diff --git a/errors/errors.go b/errors/errors.go index <HASH>..<HASH> 100644 --- a/errors/errors.go +++ b/errors/errors.go @@ -50,6 +50,12 @@ var ( Description: "The user requested metadata that is not known to the server.", HTTPStatusCode: http.StatusNotFound, }) + ErrInvalidUpdate = errcode.Register(errGroup, errcode.ErrorDescriptor{ + Value: "INVALID_UPDATE", + Message: "Update sent by the client is invalid.", + Description: "The user-uploaded TUF data has been parsed but failed validation.", + HTTPStatusCode: http.StatusBadRequest, + }) ErrMalformedUpload = errcode.Register(errGroup, errcode.ErrorDescriptor{ Value: "MALFORMED_UPLOAD", Message: "The body of your request is malformed.", diff --git a/server/handlers/default.go b/server/handlers/default.go index <HASH>..<HASH> 100644 --- a/server/handlers/default.go +++ b/server/handlers/default.go @@ -87,7 +87,7 @@ func atomicUpdateHandler(ctx context.Context, w http.ResponseWriter, r *http.Req } updates, err = validateUpdate(cryptoService, gun, updates, store) if err != nil { - return errors.ErrMalformedUpload.WithDetail(err) + return errors.ErrInvalidUpdate.WithDetail(err) } err = store.UpdateMany(gun, updates) if err != nil {
Add an invalid update error to the server errors. This would represent a validation error on the updates, as opposed to a malformed upload error.
theupdateframework_notary
train
go,go
ba057c46cb97a5cd7854cd3e872189ce99486ae7
diff --git a/lib/GoCardless/Client.php b/lib/GoCardless/Client.php index <HASH>..<HASH> 100644 --- a/lib/GoCardless/Client.php +++ b/lib/GoCardless/Client.php @@ -119,7 +119,7 @@ class GoCardless_Client { * * @param array $params The parameters to use * - * @return array The access token + * @return array Array containing the Merchant ID ('merchant_id') and Access Token ('access_token') */ public function fetch_access_token($params) {
Return annotation description needs changing as well as type
gocardless_gocardless-legacy-php
train
php
4e48bbd1822d8b9ab36668b061fc33cd9f56cb3c
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index <HASH>..<HASH> 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -204,6 +204,21 @@ class Configuration ->scalarNode('index')->end() ->scalarNode('analyzer')->end() ->scalarNode('term_vector')->end() + ->arrayNode('fields') + ->useAttributeAsKey('name') + ->prototype('array') + ->treatNullLike(array()) + ->addDefaultsIfNotSet() + ->children() + ->scalarNode('type')->defaultValue('string')->end() + ->scalarNode('boost')->end() + ->scalarNode('store')->end() + ->scalarNode('index')->end() + ->scalarNode('analyzer')->end() + ->scalarNode('term_vector')->end() + ->end() + ->end() + ->end() ->end() ->end() ;
Merge pull request #<I> from nurikabe/master Allow variable "fields" configuration node for attachment mapping.
FriendsOfSymfony_FOSElasticaBundle
train
php
6be86e33f0d429984f915565788fafd2c12a3809
diff --git a/tests/scaffold_test.py b/tests/scaffold_test.py index <HASH>..<HASH> 100644 --- a/tests/scaffold_test.py +++ b/tests/scaffold_test.py @@ -18,7 +18,7 @@ class TestScaffold(unittest.TestCase): # run demo testcases try: - subprocess.check_call(["hrun", project_name]) + subprocess.check_call(["hrun", project_name], shell=True) except subprocess.SubprocessError: raise finally:
fix: Resolve the FileNotFoundError while using subprocess on Windows
HttpRunner_HttpRunner
train
py
d887b30564bc19f3fa6080cfde3d10b1208081a2
diff --git a/tests/components/footer.spec.js b/tests/components/footer.spec.js index <HASH>..<HASH> 100644 --- a/tests/components/footer.spec.js +++ b/tests/components/footer.spec.js @@ -23,11 +23,11 @@ describe('Footer component', () => { })); describe('Footer while not logged in', () => { - it('should not display a logout button', () => { + it('should only display one li', () => { let tpl = angular.element('<monad-footer></monad-footer>'); element = $compile(tpl)($rootScope); $rootScope.$digest(); - expect(element.find('#logout').length).toBe(0); + expect(element.find('li').length).toBe(1); }); }); });
Check for amount of li's
monomelodies_monad
train
js
00cbed46d7893581ac4cc6c45c1a0a600dafe1df
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,11 @@ #!/usr/bin/env python import os import sys -from distutils.core import setup + +try: + from setuptools import setup +except ImportError: + from distutils.core import setup setup_args = {}
Added optional support for setuptools in setup.py
pyviz_param
train
py
17e0cc299371c0b921de77b914aec72d8dff4c62
diff --git a/openquake/calculators/tests/disagg_test.py b/openquake/calculators/tests/disagg_test.py index <HASH>..<HASH> 100644 --- a/openquake/calculators/tests/disagg_test.py +++ b/openquake/calculators/tests/disagg_test.py @@ -149,7 +149,8 @@ class DisaggregationTestCase(CalculatorTestCase): aae(aw.eps, [-3., 3.]) # 6 bins -> 1 bin self.assertEqual(aw.trt, [b'Active Shallow Crust']) - check_disagg_by_src(self.calc.datastore) + # FIXME: temporarily disabled + # check_disagg_by_src(self.calc.datastore) def test_case_7(self): # test with 7+2 ruptures of two source models, 1 GSIM, 1 site @@ -190,4 +191,5 @@ class DisaggregationTestCase(CalculatorTestCase): self.assertEqualFiles( 'expected_output/%s' % strip_calc_id(fname), fname) - check_disagg_by_src(self.calc.datastore) + # FIXME: temporarily disabled + # check_disagg_by_src(self.calc.datastore
Temporarily disabled check_disagg_by_src
gem_oq-engine
train
py
fcad5f2254495eac04c209875db24a0bc015641c
diff --git a/pypot/primitive/move.py b/pypot/primitive/move.py index <HASH>..<HASH> 100755 --- a/pypot/primitive/move.py +++ b/pypot/primitive/move.py @@ -120,6 +120,7 @@ class MoveRecorder(LoopPrimitive): LoopPrimitive.__init__(self, robot, freq) self.freq = freq self.tracked_motors = list(map(self.get_mockup_motor, tracked_motors)) + self._move = Move(self.freq) def setup(self): self._move = Move(self.freq)
feat(REST API): Seems like moves were not overwritten when we record with same name
poppy-project_pypot
train
py
fde65dd2590784ceed9f3a8883911abb409cdcca
diff --git a/lib/run.js b/lib/run.js index <HASH>..<HASH> 100644 --- a/lib/run.js +++ b/lib/run.js @@ -194,7 +194,9 @@ TestRunner.prototype._startServer = function(socketPath, connectionHandler, }; TestRunner.prototype._stopServer = function() { - this._server.close(); + if (this._server.fd) { + this._server.close(); + } }; function run(cwd, argv) { @@ -258,6 +260,7 @@ function run(cwd, argv) { process.on('SIGINT', function onSigint() { runner._handleTestsCompleted(); + process.exit(); }); process.on('exit', function() {
Only stop server if it's running
cloudkick_whiskey
train
js
6b0808889fff8b78d978aff6e7d66fd30273c3a8
diff --git a/taxi/__init__.py b/taxi/__init__.py index <HASH>..<HASH> 100644 --- a/taxi/__init__.py +++ b/taxi/__init__.py @@ -1 +1 @@ -__version__ = '3.0-beta1' +__version__ = '3.0-beta2'
set version to <I>-beta2
liip_taxi
train
py
a19499e8de1c38536905e2fee4586c55a5635a80
diff --git a/LegacyMapper/Configuration.php b/LegacyMapper/Configuration.php index <HASH>..<HASH> 100644 --- a/LegacyMapper/Configuration.php +++ b/LegacyMapper/Configuration.php @@ -254,6 +254,7 @@ class Configuration extends ContainerAware implements EventSubscriberInterface private function getMultiSiteSettings() { $rootLocationId = $this->configResolver->getParameter( 'content.tree_root.location_id' ); + $defaultPage = $this->configResolver->getParameter( 'default_page' ); if ( $rootLocationId === null ) { return array(); @@ -273,7 +274,7 @@ class Configuration extends ContainerAware implements EventSubscriberInterface 'site.ini/SiteAccessSettings/PathPrefixExclude' => $pathPrefixExcludeItems, 'logfile.ini/AccessLogFileSettings/PathPrefix' => $pathPrefix, 'site.ini/SiteSettings/IndexPage' => "/content/view/full/$rootLocationId/", - 'site.ini/SiteSettings/DefaultPage' => "/content/view/full/$rootLocationId/", + 'site.ini/SiteSettings/DefaultPage' => $defaultPage !== null ? $defaultPage : "/content/view/full/$rootLocationId/", 'content.ini/NodeSettings/RootNode' => $rootLocationId, ); }
Fix EZP-<I>: DefaultPage setting injected from eZ5 into legacy, but it can not be set via yml configuration
ezsystems_LegacyBridge
train
php
60eff3f16a6675d4a9b9e04f8160d6d7e335d4ac
diff --git a/fedmsg/meta/__init__.py b/fedmsg/meta/__init__.py index <HASH>..<HASH> 100644 --- a/fedmsg/meta/__init__.py +++ b/fedmsg/meta/__init__.py @@ -100,7 +100,7 @@ def make_processors(**config): processors.append(processor.load()(_, **config)) except Exception as e: log.warn("Failed to load %r processor." % processor.name) - log.warn(str(e)) + log.exception(e) # This should always be last processors.append(DefaultProcessor(_, **config))
Be more explicit with warnings from processors. Should have done this a long time ago.
fedora-infra_fedmsg
train
py
f02156c0e3057aa5b0af929200ae2309d5415460
diff --git a/lib/ooor/connection.rb b/lib/ooor/connection.rb index <HASH>..<HASH> 100644 --- a/lib/ooor/connection.rb +++ b/lib/ooor/connection.rb @@ -4,7 +4,7 @@ # Licensed under the MIT license, see MIT-LICENSE file require 'xmlrpc/client' -require 'active_support' +require 'active_support/dependencies/autoload' require 'active_support/core_ext/hash/indifferent_access' require 'logger' require 'ooor/services.rb' @@ -43,8 +43,7 @@ module Ooor end def initialize(config, env=false) - @config = config.is_a?(String) ? Ooor.load_config(config, env) : config - @config.symbolize_keys! + @config = HashWithIndifferentAccess.new(config.is_a?(String) ? Ooor.load_config(config, env) : config) @logger = ((defined?(Rails) && $0 != 'irb' && Rails.logger || @config[:force_rails_logger]) ? Rails.logger : Logger.new($stdout)) @logger.level = @config[:log_level] if @config[:log_level] Base.logger = @logger
more flexible config with HashWithIndifferentAccess
akretion_ooor
train
rb
974d5ddb7fdce5facdc3ff441cf99259c918d96e
diff --git a/src/Events/ApiEvent.php b/src/Events/ApiEvent.php index <HASH>..<HASH> 100644 --- a/src/Events/ApiEvent.php +++ b/src/Events/ApiEvent.php @@ -25,7 +25,12 @@ class ApiEvent extends ServiceEvent { $this->request = $request; $this->response = $response; - $name = strtolower($path . '.' . $request->getMethod()); + + if (empty($resource)) { + $name = strtolower($path . '.' . $request->getMethod()); + } else { + $name = strtolower($path . '.' . $resource . '.' . $request->getMethod()); + } parent::__construct($name, $resource); }
Fix scripting for remote web services.
dreamfactorysoftware_df-core
train
php
882e0f235b82721e87aa9275c8e8281e6e95ea94
diff --git a/channel.js b/channel.js index <HASH>..<HASH> 100644 --- a/channel.js +++ b/channel.js @@ -21,7 +21,10 @@ 'use strict'; var assert = require('assert'); +var process = require('process'); var version = require('./package.json').version; + +/*global global*/ if (typeof global.tchannelVersion === 'string' && version !== global.tchannelVersion ) {
linting: [channel] comply with no-undef rule
uber_tchannel-node
train
js
a068eb7948c2a81c66a47c642645d4f558035540
diff --git a/go/client/kvstore_api_handler.go b/go/client/kvstore_api_handler.go index <HASH>..<HASH> 100644 --- a/go/client/kvstore_api_handler.go +++ b/go/client/kvstore_api_handler.go @@ -62,7 +62,10 @@ func (t *kvStoreAPIHandler) handleV1(ctx context.Context, c Call, w io.Writer) e status, err := config.GetCurrentStatus(context.Background(), 0) if err != nil { return err + } else if !status.LoggedIn || status.User == nil { + return errors.New("not logged in") } + username := status.User.Username t.selfTeam = fmt.Sprintf("%s,%s", username, username)
check nil user from status (#<I>)
keybase_client
train
go
4ae5027fa01c4fbb8d2a79e8d3c58c59819c1b88
diff --git a/src/DataGrid.php b/src/DataGrid.php index <HASH>..<HASH> 100644 --- a/src/DataGrid.php +++ b/src/DataGrid.php @@ -1505,6 +1505,8 @@ class DataGrid extends Nette\Application\UI\Control public function setRememberState($remember = TRUE) { $this->remember_state = (bool) $remember; + + return $this; }
DataGrid: Preserve method chaining for rememberState
contributte_datagrid
train
php
97909571b2c96e5b22da47646fc4352b7a7a6dbc
diff --git a/src/main/java/com/spotify/docker/client/messages/RegistryAuth.java b/src/main/java/com/spotify/docker/client/messages/RegistryAuth.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/spotify/docker/client/messages/RegistryAuth.java +++ b/src/main/java/com/spotify/docker/client/messages/RegistryAuth.java @@ -146,7 +146,7 @@ public abstract class RegistryAuth { final Builder builder; if (auth != null) { - builder = forAuthToken(auth); + builder = forAuth(auth); } else { builder = builder() .username(username) @@ -160,7 +160,7 @@ public abstract class RegistryAuth { } /** Construct a Builder based upon the "auth" field of the docker client config file. */ - public static Builder forAuthToken(String auth) { + public static Builder forAuth(String auth) { final String[] authParams = Base64.decodeAsString(auth).split(":"); if (authParams.length != 2) {
rename RegistryAuth.forAuth for a closer fit the "auth" in this method name is the "auth" field from the docker client config file
spotify_docker-client
train
java
cea5c0003cd891a28bf2b3e49198f4674acfe7ab
diff --git a/src/com/google/javascript/rhino/jstype/ArrowType.java b/src/com/google/javascript/rhino/jstype/ArrowType.java index <HASH>..<HASH> 100644 --- a/src/com/google/javascript/rhino/jstype/ArrowType.java +++ b/src/com/google/javascript/rhino/jstype/ArrowType.java @@ -144,7 +144,7 @@ final class ArrowType extends JSType { JSType resolveInternal(ErrorReporter reporter) { returnType = safeResolve(returnType, reporter); for (Parameter param : parameterList) { - param.setJSType(param.getJSType().resolve(reporter)); + param.getJSType().resolve(reporter); } return this;
Stop updating function param JSTypes post-type-resolution This requires making a change to Clutz to stop it from outputting invalid TS. This change is a no-op because Clutz currently types `typeof <imported name>` as any. PiperOrigin-RevId: <I>
google_closure-compiler
train
java
062af2316cba16f7d92e58fde9567fb13ca285c9
diff --git a/etrago/tools/plot.py b/etrago/tools/plot.py index <HASH>..<HASH> 100644 --- a/etrago/tools/plot.py +++ b/etrago/tools/plot.py @@ -462,7 +462,7 @@ def network_extension(network, method = 'rel', ext_min=0.1, if not boundaries: v = np.linspace(min(extension), max(extension), 101) - boundaries = [min(extension), max(extension)] + boundaries = [min(extension).round(0), max(extension).round(0)] else: v = np.linspace(boundaries[0], boundaries[1], 101) @@ -517,16 +517,10 @@ def network_extension_diff (networkA, networkB, filename=None, boundaries=[]): bus_sizes=0, title="Derivation of AC- and DC-line extension", line_widths=2) - - if not boundaries: - v = np.linspace(min(extension), max(extension), 101) - - else: - v = np.linspace(boundaries[0], boundaries[1], 101) - + if not boundaries: v = np.linspace(min(extension), max(extension), 101) - boundaries = [min(extension), max(extension)] + boundaries = [min(extension).round(0), max(extension).round(0)] else: v = np.linspace(boundaries[0], boundaries[1], 101)
Update network_expansion_diff
openego_eTraGo
train
py
d1ba86c4eb0b0df1fe452d2c4386ac490ec5b6de
diff --git a/src/Router/Router.php b/src/Router/Router.php index <HASH>..<HASH> 100644 --- a/src/Router/Router.php +++ b/src/Router/Router.php @@ -50,6 +50,10 @@ final class Router implements RouterInterface $route = $result[1]; $params = $result[2]; + if (($routeName = $route->name()) !== null) { + $request = $request->withAttribute('route', $routeName); + } + $request = $request->withAttribute('params', $params); foreach ($params as $key => $value) {
Add the matched route name as a Request attribute
tonis-io-legacy_tonis
train
php
3a59eab5f78f4c11915eba150c88ce384d046dff
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb index <HASH>..<HASH> 100644 --- a/activesupport/lib/active_support/cache/file_store.rb +++ b/activesupport/lib/active_support/cache/file_store.rb @@ -1,7 +1,7 @@ require 'active_support/core_ext/file/atomic' require 'active_support/core_ext/string/conversions' require 'active_support/core_ext/object/inclusion' -require 'rack/utils' +require 'uri/common' module ActiveSupport module Cache @@ -126,7 +126,7 @@ module ActiveSupport # Translate a key into a file path. def key_file_path(key) - fname = Rack::Utils.escape(key) + fname = URI.encode_www_form_component(key) hash = Zlib.adler32(fname) hash, dir_1 = hash.divmod(0x1000) dir_2 = hash.modulo(0x1000) @@ -144,7 +144,7 @@ module ActiveSupport # Translate a file path into a key. def file_path_key(path) fname = path[cache_path.to_s.size..-1].split(File::SEPARATOR, 4).last - Rack::Utils.unescape(fname) + URI.decode_www_form_component(fname, Encoding::UTF_8) end # Delete empty directories in the cache.
Remove wrong rack/utils dependency from AS Closes #<I>
rails_rails
train
rb
70bfc26cfa0d8378c6d52511e03a34f34349e0c1
diff --git a/htmresearch/frameworks/classification/classification_network.py b/htmresearch/frameworks/classification/classification_network.py index <HASH>..<HASH> 100755 --- a/htmresearch/frameworks/classification/classification_network.py +++ b/htmresearch/frameworks/classification/classification_network.py @@ -488,7 +488,8 @@ def _getClassifierInference(classifierRegion): def _inspectTMPredictionQuality(tm, numRecordsToInspect): - """Inspect prediction quality of TM over the most recent N records""" + """ Inspect prediction quality of TM over the most recent + numRecordsToInspect records """ # correct predictions: predicted -> active columns predictedActiveCols = tm.mmGetTracePredictedActiveColumns() numPredictedActiveCols = predictedActiveCols.makeCountsTrace().data
updated comments for _inspectTMPredictionQuality
numenta_htmresearch
train
py
9880baa90b330225f989a70c8859a29cec24f1ec
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index <HASH>..<HASH> 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -1,5 +1,6 @@ require 'stringio' require 'uri' +require 'active_support/test_case' module ActionController module Integration #:nodoc:
Ensure Test::Unit::Assertions is available
rails_rails
train
rb
bac97289f9c3194f13729eb6b8531b4c6afcaec8
diff --git a/gpflow/training/monitor/actions.py b/gpflow/training/monitor/actions.py index <HASH>..<HASH> 100644 --- a/gpflow/training/monitor/actions.py +++ b/gpflow/training/monitor/actions.py @@ -177,7 +177,7 @@ class ModelTensorBoard(TriggeredAction): all_summaries = [] if additional_summaries is None else additional_summaries parameters = model.parameters if parameters is None else parameters - all_summaries += [tf.summary.scalar(p.full_name, p.constrained_tensor) + all_summaries += [tf.summary.scalar(p.full_name, tf.reshape(p.constrained_tensor, [])) for p in parameters if p.size == 1] if not only_scalars:
fix for Param(shape=(1,)) in ModelTensorBoard (#<I>) Some parameters of size 1 need to be squeezed to scalars before they can be viewed with TensorBoard.
GPflow_GPflow
train
py
32ea541fe9bbc220fe17a4e8300ed4feb334e640
diff --git a/flow/ondemand/client/client.go b/flow/ondemand/client/client.go index <HASH>..<HASH> 100644 --- a/flow/ondemand/client/client.go +++ b/flow/ondemand/client/client.go @@ -164,14 +164,6 @@ func (o *OnDemandProbeClient) registerProbe(np nodeProbe) bool { func (o *OnDemandProbeClient) unregisterProbe(node *graph.Node) bool { msg := shttp.NewWSMessage(ondemand.Namespace, "CaptureStop", ondemand.CaptureQuery{NodeID: string(node.ID)}) - o.RLock() - _, ok := o.registeredNodes[string(node.ID)] - o.RUnlock() - - if !ok { - return false - } - if _, err := node.GetFieldString("Capture/ID"); err != nil { return false } diff --git a/tests/scale_test.go b/tests/scale_test.go index <HASH>..<HASH> 100644 --- a/tests/scale_test.go +++ b/tests/scale_test.go @@ -205,6 +205,10 @@ func TestHA(t *testing.T) { // 4 expected because the gremlin expression matches all the eth0 checkFlows(4) + // delete the capture to check that all captures will be delete at the agent side + client.Delete("capture", capture.ID()) + checkCaptures(0) + // delete an agent setupCmds = []helper.Cmd{ {fmt.Sprintf("%s stop-agent 1", scale), false},
capture: fix capture can't be deleted by any analyzer It was impossible for an analyzer to request a capture deletion for a capture not created by itself. Change-Id: Ibc8e2b<I>b<I>f<I>b<I>ae<I>a3d<I> Reviewed-on: <URL>
skydive-project_skydive
train
go,go
fb56633c2a568fe04995da86c187f7f30288ca0c
diff --git a/basil/TL/SiUsb.py b/basil/TL/SiUsb.py index <HASH>..<HASH> 100644 --- a/basil/TL/SiUsb.py +++ b/basil/TL/SiUsb.py @@ -47,6 +47,11 @@ class SiUsb (SiTransferLayer): if 'avoid_download' in self._init.keys() and self._init['avoid_download'] is True and self._sidev.XilinxAlreadyLoaded(): logging.info("FPGA already programmed, skipping download") else: + # invert polarity of the interface clock (IFCONFIG.4) -> IFCLK & UCLK are in-phase + ifconfig = self._sidev._Read8051(0xE601, 1)[0] + ifconfig = ifconfig & ~0x10 + self._sidev._Write8051(0xE601, [ifconfig]) + if os.path.exists(self._init['bit_file']): bit_file = self._init['bit_file'] elif os.path.exists(os.path.join(os.path.dirname(self.parent.conf_path), self._init['bit_file'])):
BUG: fix polarity of IFCLK on FX2
SiLab-Bonn_basil
train
py
b3ed3d78cb398b5ab7c3d4db14d4fb38108186aa
diff --git a/core/client/components/gh-navitem-url-input.js b/core/client/components/gh-navitem-url-input.js index <HASH>..<HASH> 100644 --- a/core/client/components/gh-navitem-url-input.js +++ b/core/client/components/gh-navitem-url-input.js @@ -58,8 +58,23 @@ var NavItemUrlInputComponent = Ember.TextField.extend({ } }, + keyPress: function (event) { + // enter key + if (event.keyCode === 13) { + event.preventDefault(); + this.notifyUrlChanged(); + } + + return true; + }, + focusOut: function () { this.set('hasFocus', false); + + this.notifyUrlChanged(); + }, + + notifyUrlChanged: function () { this.set('value', this.get('value').trim()); var url = this.get('value'),
Add new navigation item on enter key No Issue - Fix regression in add item on enter behavior.
TryGhost_Ghost
train
js
4ff924bcfb720f8ca1186a649d7d779613722618
diff --git a/pyrogram/__init__.py b/pyrogram/__init__.py index <HASH>..<HASH> 100644 --- a/pyrogram/__init__.py +++ b/pyrogram/__init__.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with Pyrogram. If not, see <http://www.gnu.org/licenses/>. -__version__ = "0.17.0" +__version__ = "0.17.1" __license__ = "GNU Lesser General Public License v3 or later (LGPLv3+)" __copyright__ = "Copyright (C) 2017-2020 Dan <https://github.com/delivrance>"
Update Pyrogram to <I>
pyrogram_pyrogram
train
py
908574caa96a80483fa642e08b3b1e9ad1cd1c60
diff --git a/tests/custodia.py b/tests/custodia.py index <HASH>..<HASH> 100644 --- a/tests/custodia.py +++ b/tests/custodia.py @@ -27,10 +27,8 @@ class CustodiaTests(unittest.TestCase): @classmethod def tearDownClass(self): - try: - os.killpg(self.custodia_process.pid, signal.SIGTERM) - except OSError: - pass + self.custodia_process.kill() + self.custodia_process.wait() for fname in ['server_socket', 'secrets.db']: try: os.unlink(fname)
kill() and waitpid() custodia process The test suite leaves child processes behind. The teardown class method now call Popen.kill() and Popen.wait() to kill and wait for its child process.
latchset_custodia
train
py
ba36d6abdecf777f2182ca2e977012c14601cb14
diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js index <HASH>..<HASH> 100644 --- a/frontend/webpack.config.js +++ b/frontend/webpack.config.js @@ -5,7 +5,7 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin"); const SRC = path.resolve(__dirname, 'src'); const BUILD = path.resolve(path.dirname(__dirname), 'web_pdb', 'static'); -var config = { +const config = { entry: SRC + '/index.js', output: { path: BUILD,
Use const in webpack.config.js
romanvm_python-web-pdb
train
js
ee50cfc9ccc8db9061470bc9b6920a01d0a23e54
diff --git a/pyemma/msm/ui/timescales.py b/pyemma/msm/ui/timescales.py index <HASH>..<HASH> 100644 --- a/pyemma/msm/ui/timescales.py +++ b/pyemma/msm/ui/timescales.py @@ -127,10 +127,12 @@ class ImpliedTimescales(object): """ # connected set - C = (connected_cmatrix(C)).toarray() - if (len(C) > 1): + C = connected_cmatrix(C) + if (np.shape(C)[0] > 1): # estimate transition matrix T = tmatrix(C, reversible=self._reversible) + # make it dense + T = T.toarray() # timescales ts = timescales(T, tau, k=min(self._nits, len(T)) + 1, reversible=self._reversible)[1:] return ts
[msm.ui.timescales]: changing from sparse to dense at the end to save estimation time
markovmodel_PyEMMA
train
py
9fc09a188fbeef9f6201d3c5ff10a97c09d330d6
diff --git a/hampy/detect.py b/hampy/detect.py index <HASH>..<HASH> 100644 --- a/hampy/detect.py +++ b/hampy/detect.py @@ -65,7 +65,7 @@ def detect_markers(img, marker_ids=None): for _ in range(4): try: - code = decode(sub_marker).flatten() + code = decode(sub_marker).flatten()[::-1] id = (2 ** find(code == 1)).sum() markers.append(HammingMarker(id=id, contours=approx_curve, img_size=(width, height))) except ValueError: # The hamming code is incorrect
Bug in the decode function (was actually reading the reverse code...)
pierre-rouanet_hampy
train
py
875381e2c3b1d4bb0f88af466069f45a05d7d69f
diff --git a/test/root.js b/test/root.js index <HASH>..<HASH> 100644 --- a/test/root.js +++ b/test/root.js @@ -1,6 +1,10 @@ /* -*- Mode: Javascript; js-indent-level: 2 -*- */ var testDatabase = require('./util/database'); +var db = require('../')(testDatabase.url); before(testDatabase.refreshDb); +before(function(done) { + db.changePassword('test', done); +}); after(testDatabase.stopDb);
auth: change password on test setup. also acts as a test for changePassword
brikteknologier_seraph
train
js
04374d72d0b4fce6c6842cbb57ecafb5fb3e515d
diff --git a/salt/modules/dnsutil.py b/salt/modules/dnsutil.py index <HASH>..<HASH> 100644 --- a/salt/modules/dnsutil.py +++ b/salt/modules/dnsutil.py @@ -254,7 +254,7 @@ def MX(domain, resolve=False, nameserver=None): >>> dnsutil.MX('saltstack.org') [ [10, 'mx01.1and1.com.'], [10, 'mx00.1and1.com.'] ] - If the 'ip' argument is True, resolve IPs for the servers. + If the 'resolve' argument is True, resolve IPs for the servers. It's limited to one IP, because although in practice it's very rarely a round robin, it is an acceptable configuration and pulling just one IP lets
Update docstring to reflect the previous argument rename.
saltstack_salt
train
py
e19228266ab3057ac0d9a32d7cb541edd963f980
diff --git a/lib/https/index.js b/lib/https/index.js index <HASH>..<HASH> 100644 --- a/lib/https/index.js +++ b/lib/https/index.js @@ -34,7 +34,7 @@ var proxy, server; function handleWebsocket(socket, clientIp, clientPort, wss) { var headers = socket.headers; - if (!wss && headers[config.HTTPS_FIELD]) { + if (headers[config.HTTPS_FIELD]) { delete headers[config.HTTPS_FIELD]; wss = true; } @@ -563,9 +563,9 @@ function resolveWebsocket(socket, wss) { function addReqInfo(req) { var clientPort = req.socket.remotePort; var remoteData = tunnelTmplData.get(clientPort); + req.headers[config.HTTPS_FIELD] = 1; if (remoteData) { tunnelTmplData.del(clientPort); - req.headers[config.HTTPS_FIELD] = 1; req.headers[config.CLIENT_IP_HEAD] = remoteData.clientIp || LOCALHOST; req.headers[config.CLIENT_PORT_HEAD] = remoteData.clientPort; }
refactor: addReqInfo
avwo_whistle
train
js
f393838dbab109ecbffe2a802259f64fa362f202
diff --git a/spec/services/hyrax/collections/managed_collections_service_spec.rb b/spec/services/hyrax/collections/managed_collections_service_spec.rb index <HASH>..<HASH> 100644 --- a/spec/services/hyrax/collections/managed_collections_service_spec.rb +++ b/spec/services/hyrax/collections/managed_collections_service_spec.rb @@ -4,7 +4,9 @@ RSpec.describe Hyrax::Collections::ManagedCollectionsService, clean_repo: true d let(:scope) { FakeSearchBuilderScope.new(current_ability: current_ability) } describe '.managed_collections_count' do - let!(:collection) { FactoryBot.create(:public_collection) } + before do + FactoryBot.valkyrie_create(:hyrax_collection, :public) + end it 'returns number of collections that can be managed' do expect(described_class.managed_collections_count(scope: scope)).to eq(1)
change ManagedCollectionsServiceSpec to use valkyrie models in setup setup these tests with valkyrie.
samvera_hyrax
train
rb
46c7798003ce2eef60440860cc305372bd73a57d
diff --git a/salt/returners/cassandra_return.py b/salt/returners/cassandra_return.py index <HASH>..<HASH> 100644 --- a/salt/returners/cassandra_return.py +++ b/salt/returners/cassandra_return.py @@ -43,5 +43,5 @@ def returner(ret): else: columns['return'] = str(ret['return']) - log.debug(back) + log.debug(columns) cf.insert(ret['jid'], columns)
Debug statement used the wrong variable.
saltstack_salt
train
py
47c7ab393d05f2b438703381fbb90afd0be64dbb
diff --git a/teamcity/flake8.py b/teamcity/flake8.py index <HASH>..<HASH> 100644 --- a/teamcity/flake8.py +++ b/teamcity/flake8.py @@ -14,12 +14,9 @@ class Pep8MonkeyPatcher(object): @classmethod def add_options(cls, parser): - if is_running_under_teamcity(): - cls._set_teamcity_options() - else: - parser.add_option('--teamcity', default=False, - action='callback', callback=Pep8MonkeyPatcher.set_option_callback, - help="Enable teamcity messages") + parser.add_option('--teamcity', default=False, + action='callback', callback=Pep8MonkeyPatcher.set_option_callback, + help="Enable teamcity messages") @staticmethod def set_option_callback(option, opt, value, parser):
Removed autodetecting teamcity This caused strange issues. --teamcity would work in local build scripts, but they would fail in teamcity (as the option was not defined)
JetBrains_teamcity-messages
train
py
2f8af49d6e67769baf19b269f275284554a7caa6
diff --git a/src/MediaCollections/Filesystem.php b/src/MediaCollections/Filesystem.php index <HASH>..<HASH> 100644 --- a/src/MediaCollections/Filesystem.php +++ b/src/MediaCollections/Filesystem.php @@ -2,6 +2,7 @@ namespace Spatie\MediaLibrary\MediaCollections; +use Exception; use Illuminate\Contracts\Filesystem\Factory; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; @@ -182,7 +183,11 @@ class Filesystem collect([$mediaDirectory, $conversionsDirectory, $responsiveImagesDirectory]) ->each(function (string $directory) use ($media) { - $this->filesystem->disk($media->conversions_disk)->deleteDirectory($directory); + try { + $this->filesystem->disk($media->conversions_disk)->deleteDirectory($directory); + } catch (Exception $exception) { + report($exception); + } }); }
Report an error when it can't delete a directory (#<I>) * Report an error when it can't delete a directory Resolves issue: #<I>, #<I> and #<I> * Update Filesystem.php
spatie_laravel-medialibrary
train
php
6a9a7df172cc1fcd81e4585f44b09200b6087cc0
diff --git a/csrf.go b/csrf.go index <HASH>..<HASH> 100644 --- a/csrf.go +++ b/csrf.go @@ -18,13 +18,14 @@ package csrf import ( "net/http" + "time" "github.com/Unknwon/com" "github.com/go-macaron/session" "gopkg.in/macaron.v1" ) -const _VERSION = "0.0.5" +const _VERSION = "0.1.0" func Version() string { return _VERSION @@ -209,11 +210,11 @@ func Generate(options ...Options) macaron.Handler { if needsNew { // FIXME: actionId. x.Token = GenerateToken(x.Secret, x.ID, "POST") + if opt.SetCookie { + ctx.SetCookie(opt.Cookie, x.Token, 0, opt.CookiePath, "", false, true, time.Now().AddDate(0, 0, 1)) + } } - if opt.SetCookie { - ctx.SetCookie(opt.Cookie, x.Token, 86400, opt.CookiePath) - } if opt.SetHeader { ctx.Resp.Header().Add(opt.Header, x.Token) }
Fix set CSRF every request which would never expire
go-macaron_csrf
train
go
447d3d257731d01b2eb80605a68f1130a370a605
diff --git a/core/Version.php b/core/Version.php index <HASH>..<HASH> 100644 --- a/core/Version.php +++ b/core/Version.php @@ -21,5 +21,5 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '2.8.0-b2'; + const VERSION = '2.8.0-b3'; }
res #<I> I have to increase the version number to require this version in the other plugins
matomo-org_matomo
train
php
1f61e3fe0b906f37c1558486e6b8d21926840350
diff --git a/spyder/plugins/editor/widgets/editor.py b/spyder/plugins/editor/widgets/editor.py index <HASH>..<HASH> 100644 --- a/spyder/plugins/editor/widgets/editor.py +++ b/spyder/plugins/editor/widgets/editor.py @@ -182,7 +182,6 @@ class FileInfo(QObject): self.lastmodified = QFileInfo(filename).lastModified() self.editor.textChanged.connect(self.text_changed) - self.editor.breakpoints_changed.connect(self.breakpoints_changed) self.editor.bookmarks_changed.connect(self.bookmarks_changed) self.sig_filename_changed.connect(self.editor.sig_filename_changed)
Bookmarks: Remove old breakpoints_changed statement
spyder-ide_spyder
train
py
0129b7ca651a304a8f0b0a1dbd5618e73e78d250
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,5 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -import os -import sys from setuptools import find_packages, setup
Removing unnecessary imports from setup.py
gregmuellegger_django-autofixture
train
py
c0b2166e39abb0dad006e7738c8d97d9737fc37e
diff --git a/core-bundle/src/Resources/contao/classes/Backend.php b/core-bundle/src/Resources/contao/classes/Backend.php index <HASH>..<HASH> 100644 --- a/core-bundle/src/Resources/contao/classes/Backend.php +++ b/core-bundle/src/Resources/contao/classes/Backend.php @@ -520,7 +520,7 @@ abstract class Backend extends Controller $table = $strTable; $ptable = ($act != 'edit') ? $GLOBALS['TL_DCA'][$strTable]['config']['ptable'] : $strTable; - while ($ptable && !\in_array($GLOBALS['TL_DCA'][$table]['list']['sorting']['mode'], array(5, 6))) + while ($ptable && !\in_array($GLOBALS['TL_DCA'][$table]['list']['sorting']['mode'], array(5, 6)) && ($GLOBALS['TL_DCA'][$ptable]['config']['dataContainer'] ?? null) === 'Table') { $objRow = $this->Database->prepare("SELECT * FROM " . $ptable . " WHERE id=?") ->limit(1)
Do not query for PIDs when building the breadcrumb of a File data container (see #<I>) Description ----------- | Q | A | -----------------| --- | Fixed issues | Fixes #<I> Looks like I was already affected by that bug, but instead of fixing it I used a workaround in <URL>
contao_contao
train
php