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
4808cd56ea40787c8c74dd487c2efa74e7c66871
diff --git a/src/main/java/net/e175/klaus/solarpositioning/PSA.java b/src/main/java/net/e175/klaus/solarpositioning/PSA.java index <HASH>..<HASH> 100644 --- a/src/main/java/net/e175/klaus/solarpositioning/PSA.java +++ b/src/main/java/net/e175/klaus/solarpositioning/PSA.java @@ -17,6 +17,8 @@ import java.util.TimeZone; * minutes of arc for the period 1999–2015." * * @author Klaus A. Brunner + * + * @deprecated PSA shouldn't be used after the year 2015. * */ public final class PSA {
add "soft" deprecation, as PSA's time is running out
KlausBrunner_solarpositioning
train
java
9eb4816b27916334b4eface33b4c5c983c5fd999
diff --git a/src/ol/events/Target.js b/src/ol/events/Target.js index <HASH>..<HASH> 100644 --- a/src/ol/events/Target.js +++ b/src/ol/events/Target.js @@ -40,7 +40,7 @@ class Target extends Disposable { * @private * @type {*} */ - this.target_ = opt_target; + this.eventTarget_ = opt_target; /** * @private @@ -96,7 +96,7 @@ class Target extends Disposable { const evt = typeof event === 'string' ? new Event(event) : event; const type = evt.type; if (!evt.target) { - evt.target = this.target_ || this; + evt.target = this.eventTarget_ || this; } const listeners = this.listeners_[type]; let propagate;
Fix property name collision target_ with Control * As described in #<I>, Control uses the property target_ for a custom parent HTMLElement, leading to Events on the Control being dispatched with that as the target and not the Control itself. * Solved by renaming the target_ property on Target to eventTarget_
openlayers_openlayers
train
js
67aa1a1c041d03a8139aac7081500ddd55665c46
diff --git a/kafka/consumer/new.py b/kafka/consumer/new.py index <HASH>..<HASH> 100644 --- a/kafka/consumer/new.py +++ b/kafka/consumer/new.py @@ -172,7 +172,7 @@ class KafkaConsumer(object): self._msg_iter = self.fetch_messages() # Check for auto-commit - if self.should_auto_commit(): + if self._should_auto_commit(): self.commit() try: @@ -220,7 +220,7 @@ class KafkaConsumer(object): self._offsets.task_done[topic_partition] = offset - def should_auto_commit(self): + def _should_auto_commit(self): if not self._config['auto_commit_enable']: return False
_should_auto_commit is private
dpkp_kafka-python
train
py
211d9af57e7da98bb33854560200124a2309e284
diff --git a/src/LockServiceProvider.php b/src/LockServiceProvider.php index <HASH>..<HASH> 100644 --- a/src/LockServiceProvider.php +++ b/src/LockServiceProvider.php @@ -13,8 +13,6 @@ class LockServiceProvider extends ServiceProvider */ public function boot() { - $this->package('beatswitch/lock-laravel', 'lock-laravel', __DIR__); - // Here we should execute the permissions callback from the config file so all // the roles and aliases get registered and if we're using the array driver, // all of our permissions get set beforehand. @@ -33,6 +31,8 @@ class LockServiceProvider extends ServiceProvider */ public function register() { + $this->package('beatswitch/lock-laravel', 'lock-laravel', __DIR__); + $this->bootstrapManager(); $this->bootstrapAuthedUserLock(); }
Register package config before bootstrap Fixes a bug where the default driver couldn't be set
BeatSwitch_lock-laravel
train
php
504272c57f01c80016b6d9681e647b4c45bbfb8c
diff --git a/tlsconfig/config.go b/tlsconfig/config.go index <HASH>..<HASH> 100644 --- a/tlsconfig/config.go +++ b/tlsconfig/config.go @@ -46,8 +46,6 @@ var acceptedCBCCiphers = []uint16{ tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA, tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA, - tls.TLS_RSA_WITH_AES_256_CBC_SHA, - tls.TLS_RSA_WITH_AES_128_CBC_SHA, } // DefaultServerAcceptedCiphers should be uses by code which already has a crypto/tls
Remove TLS_RSA ciphers from the default accepted ciphers - weak & triggers scanning warnings
docker_go-connections
train
go
db2ed139aec00994020bec13e867b7b525f142c8
diff --git a/lib/things/task.rb b/lib/things/task.rb index <HASH>..<HASH> 100644 --- a/lib/things/task.rb +++ b/lib/things/task.rb @@ -101,6 +101,10 @@ module Things node.inner_text.to_f.to_cocoa_date end + def due? + due_date && Time.now > due_date + end + def bullet completed? ? "✓" : canceled? ? "×" : "-" end diff --git a/test/test_task.rb b/test/test_task.rb index <HASH>..<HASH> 100644 --- a/test/test_task.rb +++ b/test/test_task.rb @@ -132,6 +132,19 @@ class TaskTest < Test::Unit::TestCase assert_equal "2009-08-01", task.due_date.strftime("%Y-%m-%d") end + test "should know that the task is due" do + assert task_by_id("z186").due? + end + + test "should know that the task is not due" do + Time.stubs(:now).returns(Time.parse('2009-07-31')) + assert !task_by_id("z186").due? + end + + test "should not be due for a task without due date" do + assert !find_task(:basic).due? + end + test "each state should have a bullet" do assert_equal "✓", task_by_id("z173").bullet # complete assert_equal "×", task_by_id("z189").bullet # canceled
added Task#due? to check if a task is due yet
haraldmartin_things-rb
train
rb,rb
02e5631916f962799da24e61af6561649a2248a6
diff --git a/app/controllers/component-tree.js b/app/controllers/component-tree.js index <HASH>..<HASH> 100644 --- a/app/controllers/component-tree.js +++ b/app/controllers/component-tree.js @@ -170,10 +170,19 @@ export default Controller.extend({ scrollTreeToItem(objectId) { let selectedItemIndex = this.get('displayedList').findIndex(item => item.view.objectId === objectId); - if (selectedItemIndex) { - const averageItemHeight = 22; + if (!selectedItemIndex) { + return; + } + + const averageItemHeight = 25; + const targetScrollTop = averageItemHeight * selectedItemIndex; + const componentTreeEl = document.querySelector('.js-component-tree'); + const height = componentTreeEl.offsetHeight; + + // Only scroll to item if not already in view + if (targetScrollTop < componentTreeEl.scrollTop || targetScrollTop > componentTreeEl.scrollTop + height) { schedule('afterRender', () => { - document.querySelector('.js-component-tree').scrollTop = averageItemHeight * selectedItemIndex; + componentTreeEl.scrollTop = targetScrollTop - (height / 2); }); } },
Only scroll to an element when it's out of view (#<I>) Avoid scrolling to visible elements and match the behavior of the Elements panel.
emberjs_ember-inspector
train
js
53e1055845459d77dedf29451bc2b1b784ad96f1
diff --git a/src/headers.js b/src/headers.js index <HASH>..<HASH> 100644 --- a/src/headers.js +++ b/src/headers.js @@ -34,7 +34,7 @@ export default class Headers { * @return Void */ constructor(headers) { - this[MAP] = {}; + this[MAP] = Object.create(null); this[FOLLOW_SPEC] = Headers.FOLLOW_SPEC; // Headers @@ -100,11 +100,11 @@ export default class Headers { * @return Void */ forEach(callback, thisArg) { - Object.getOwnPropertyNames(this[MAP]).forEach(name => { + for (let name in this[MAP]) { this[MAP][name].forEach(value => { callback.call(thisArg, value, name, this); }); - }); + } } /** @@ -141,7 +141,7 @@ export default class Headers { * @return Boolean */ has(name) { - return this[MAP].hasOwnProperty(sanitizeName(name)); + return !!this[MAP][sanitizeName(name)]; } /**
Use Object.create(null) for Headers' internal map Suggested by @jimmywarting.
bitinn_node-fetch
train
js
5ac7a656e2493b43ec88c4ec37b218fa10d2c40a
diff --git a/pychromecast.py b/pychromecast.py index <HASH>..<HASH> 100644 --- a/pychromecast.py +++ b/pychromecast.py @@ -21,7 +21,7 @@ APP_ID_NETFLIX = "Netflix" APP_ID_TICTACTOE = "TicTacToe" APP_ID_GOOGLE_MUSIC = "GoogleMusic" APP_ID_PLAY_MOVIES = "PlayMovies" - +APP_ID_HULU_PLUS = "Hulu_Plus" def start_app(host, app_id, data=None):
Added app_id for Hulu Plus
balloob_pychromecast
train
py
9b69a672575e79da9918b474e1038e487fa841e8
diff --git a/daemon/src/main/java/io/minecloud/daemon/StatisticsWatcher.java b/daemon/src/main/java/io/minecloud/daemon/StatisticsWatcher.java index <HASH>..<HASH> 100644 --- a/daemon/src/main/java/io/minecloud/daemon/StatisticsWatcher.java +++ b/daemon/src/main/java/io/minecloud/daemon/StatisticsWatcher.java @@ -52,7 +52,7 @@ public class StatisticsWatcher extends Thread { if (!file.isDirectory()) continue; - File currentFreq = new File(file, "cpufreq/cpuinfo_cur_freq"); + File currentFreq = new File(file, "cpufreq/scaling_cur_freq"); if (!currentFreq.exists()) continue;
Use of scaling_cur_freq instead of cpuinfo_cur_freq It's just so much better in many ways.
mkotb_MineCloud
train
java
5de9407eca668ba614bef698a0cc443021f1b073
diff --git a/core/server/master/src/main/java/alluxio/master/lineage/recompute/RecomputePlanner.java b/core/server/master/src/main/java/alluxio/master/lineage/recompute/RecomputePlanner.java index <HASH>..<HASH> 100644 --- a/core/server/master/src/main/java/alluxio/master/lineage/recompute/RecomputePlanner.java +++ b/core/server/master/src/main/java/alluxio/master/lineage/recompute/RecomputePlanner.java @@ -46,8 +46,8 @@ public class RecomputePlanner { * @param fileSystemMaster the file system master */ public RecomputePlanner(LineageStore lineageStore, FileSystemMaster fileSystemMaster) { - mLineageStore = Preconditions.checkNotNull(lineageStore); - mFileSystemMaster = Preconditions.checkNotNull(fileSystemMaster); + mLineageStore = Preconditions.checkNotNull(lineageStore, "lineageStore"); + mFileSystemMaster = Preconditions.checkNotNull(fileSystemMaster, "fileSystemMaster"); } /**
Supply variable name for Precondition.checkNotNull of RecomputePlanner.java
Alluxio_alluxio
train
java
16fd4396ef2aa631700b0be434270f77b1701214
diff --git a/packages/ruby/test/test.js b/packages/ruby/test/test.js index <HASH>..<HASH> 100644 --- a/packages/ruby/test/test.js +++ b/packages/ruby/test/test.js @@ -16,8 +16,16 @@ const testsThatFailToBuild = new Map([ ], ]); +const testsThatShouldBeSkipped = ['06-rails']; + // eslint-disable-next-line no-restricted-syntax for (const fixture of fs.readdirSync(fixturesPath)) { + const shouldSkip = testsThatShouldBeSkipped.includes(fixture); + if (shouldSkip) { + console.log(`Skipping: ${fixture}`); + continue; + } + const errMsg = testsThatFailToBuild.get(fixture); if (errMsg) { // eslint-disable-next-line no-loop-func
[tests] skip ruby test for now (#<I>)
zeit_now-cli
train
js
1f29ae5eb2a6954f0bba13d79a7a0e360bdfd8d4
diff --git a/lib/escobar/heroku/pipeline.rb b/lib/escobar/heroku/pipeline.rb index <HASH>..<HASH> 100644 --- a/lib/escobar/heroku/pipeline.rb +++ b/lib/escobar/heroku/pipeline.rb @@ -69,11 +69,11 @@ module Escobar end def required_commit_contexts(forced = false) - @required_commit_contexts ||= fetch_required_commit_contexts(forced) + return [] if forced + @required_commit_contexts ||= fetch_required_commit_contexts end - def fetch_required_commit_contexts(forced = false) - return [] if forced + def fetch_required_commit_contexts github_client.required_contexts.map do |context| if context == "continuous-integration/travis-ci" context = "continuous-integration/travis-ci/push"
Return early outside of cache if forced
atmos_escobar
train
rb
45566feb75e28c47df05d40d281e59315abc828d
diff --git a/command/build/command.go b/command/build/command.go index <HASH>..<HASH> 100644 --- a/command/build/command.go +++ b/command/build/command.go @@ -112,6 +112,10 @@ func (c Command) Run(env packer.Environment, args []string) int { builds = append(builds, build) } + if cfgDebug { + env.Ui().Say("Debug mode enabled. Builds will not be parallelized.") + } + // Compile all the UIs for the builds colors := [5]packer.UiColor{ packer.UiColorGreen,
command/build: Say we're in debug mode if we're in it
hashicorp_packer
train
go
3a79776035a1194f3d3d775e7447a96f8d70b9c2
diff --git a/test/form/samples/namespace-optimization-computed-string/main.js b/test/form/samples/namespace-optimization-computed-string/main.js index <HASH>..<HASH> 100644 --- a/test/form/samples/namespace-optimization-computed-string/main.js +++ b/test/form/samples/namespace-optimization-computed-string/main.js @@ -1,3 +1,4 @@ import * as foo from './foo.js'; foo['bar']['quux']['a'](); +foo['bar']['quux']['b'](); diff --git a/test/form/samples/namespace-optimization-computed-string/quux.js b/test/form/samples/namespace-optimization-computed-string/quux.js index <HASH>..<HASH> 100644 --- a/test/form/samples/namespace-optimization-computed-string/quux.js +++ b/test/form/samples/namespace-optimization-computed-string/quux.js @@ -1,3 +1,5 @@ export function a () { console.log('effect'); } + +export function b () {}
Improve test to show that tree-shaking now works with computed namespace props.
rollup_rollup
train
js,js
22f408210e70f0212958639e6be499bcd409df0e
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,6 @@ setup(name='mmpy', package_dir={'mmpy':'src'}, provides=['mmpy'], license='ISCL', - requires=['simplejson'], install_requires=['simplejson'], classifiers=['Development Status :: 3 - Alpha', 'License :: OSI Approved :: ISC License (ISCL)',
remove the requires= keyword per @mattjeffery's suggestion
musicmetric_mmpy
train
py
7c29c52c1b576ed97da659a449bb7f0e86921bff
diff --git a/test/datepicker_test.js b/test/datepicker_test.js index <HASH>..<HASH> 100644 --- a/test/datepicker_test.js +++ b/test/datepicker_test.js @@ -98,4 +98,17 @@ describe("DatePicker", () => { TestUtils.Simulate.click(clearButton); expect(cleared).to.be.true; }); + + it("should mount and unmount properly", done => { + var TestComponent = React.createClass({ + getInitialState() { + return { mounted: true }; + }, + render() { + return this.state.mounted ? <DatePicker /> : null; + } + }); + var element = TestUtils.renderIntoDocument(<TestComponent />); + element.setState({ mounted: false }, done); + }); });
Add failing unit test for unmount error
Hacker0x01_react-datepicker
train
js
8b4fb764cf2731e2e01aab793cdfc79ca69bb279
diff --git a/examples/cmd.php b/examples/cmd.php index <HASH>..<HASH> 100644 --- a/examples/cmd.php +++ b/examples/cmd.php @@ -34,6 +34,7 @@ args optional arguments ], 'cmd:date' => 'Displays the current date', 'cmd:cal' => 'Displays the calendar of current month', + 'cmd:dump' => 'Dumps the help array', ]; parent::__construct(); @@ -62,6 +63,11 @@ args optional arguments $cmd->execute('cal'); $this->writeln($cmd->output()); } + + function cmd_dump() + { + $this->_dump($this->help); + } } $c = new TestCommand;
added dump example into example/cmd.php
irfantoor_console
train
php
625342536e8cb9f8f729c427824d21dcb216fad7
diff --git a/examples/plot_loo_pit_ecdf.py b/examples/plot_loo_pit_ecdf.py index <HASH>..<HASH> 100644 --- a/examples/plot_loo_pit_ecdf.py +++ b/examples/plot_loo_pit_ecdf.py @@ -1,6 +1,6 @@ """ LOO-PIT ECDF Plot -========= +================= _thumb: .5, .7 """ diff --git a/examples/plot_loo_pit_overlay.py b/examples/plot_loo_pit_overlay.py index <HASH>..<HASH> 100644 --- a/examples/plot_loo_pit_overlay.py +++ b/examples/plot_loo_pit_overlay.py @@ -1,6 +1,6 @@ """ LOO-PIT Overlay Plot -========= +==================== _thumb: .5, .7 """
fix underline (#<I>)
arviz-devs_arviz
train
py,py
bdf18fb3fbba5e28f884b04244a585589b6f9463
diff --git a/lib/turbot/command.rb b/lib/turbot/command.rb index <HASH>..<HASH> 100644 --- a/lib/turbot/command.rb +++ b/lib/turbot/command.rb @@ -119,20 +119,6 @@ module Turbot require 'rest_client' raise(error) end - rescue RestClient::Unauthorized - display 'Authentication failure' - if ENV['TURBOT_API_KEY'] - exit(1) - else - run 'login' - retry - end - rescue RestClient::ResourceNotFound => e - error extract_error(e.http_body) { e.http_body =~ /^([\w\s]+ not found).?$/ ? $1 : 'Resource not found' } - rescue RestClient::PaymentRequired, RestClient::RequestFailed => e # 402, 502 - error extract_error(e.http_body) - rescue RestClient::RequestTimeout - error 'API request timed out. Please try again, or contact bots@opencorporates.com if this issue persists.' rescue SocketError => e error 'Unable to connect to Turbot API, please check internet connectivity and try again.' rescue OptionParser::ParseError
Remove unreachable code (all API calls are handled in bots.rb)
openc_turbot-client
train
rb
e6e6015419506d342c80310f070feb4ab3320507
diff --git a/news-bundle/src/Resources/contao/modules/ModuleNews.php b/news-bundle/src/Resources/contao/modules/ModuleNews.php index <HASH>..<HASH> 100644 --- a/news-bundle/src/Resources/contao/modules/ModuleNews.php +++ b/news-bundle/src/Resources/contao/modules/ModuleNews.php @@ -126,10 +126,12 @@ abstract class ModuleNews extends \Module // Compile the news text else { - $objTemplate->text = function () use ($objArticle) + $id = $objArticle->id; + + $objTemplate->text = function () use ($id) { $strText = ''; - $objElement = \ContentModel::findPublishedByPidAndTable($objArticle->id, 'tl_news'); + $objElement = \ContentModel::findPublishedByPidAndTable($id, 'tl_news'); if ($objElement !== null) {
[News] Do not pass the database object to the closure generating the content.
contao_contao
train
php
a00483bee2648afc405c8201201f912e01b1044a
diff --git a/tests/JMS/Tests/SerializerServiceProvider/SerializerServiceProviderTest.php b/tests/JMS/Tests/SerializerServiceProvider/SerializerServiceProviderTest.php index <HASH>..<HASH> 100644 --- a/tests/JMS/Tests/SerializerServiceProvider/SerializerServiceProviderTest.php +++ b/tests/JMS/Tests/SerializerServiceProvider/SerializerServiceProviderTest.php @@ -89,12 +89,12 @@ XML; foreach($files as $file) { if ($file->isDir()){ - rmdir($file->getRealPath()); + @rmdir($file->getRealPath()); } else { - unlink($file->getRealPath()); + @unlink($file->getRealPath()); } } - rmdir($directory); + @rmdir($directory); } }
Supress errors when deleting cache files.
pink-tie_JMSSerializerServiceProvider
train
php
33c7e67d3cd38a2bc457fcaae2901c0a18c9ff6f
diff --git a/lib/aruba/api/core.rb b/lib/aruba/api/core.rb index <HASH>..<HASH> 100644 --- a/lib/aruba/api/core.rb +++ b/lib/aruba/api/core.rb @@ -140,7 +140,10 @@ module Aruba Aruba::Platform.chdir(path) { Aruba::Platform.expand_path(file_name, dir_string) } end else - Aruba::Platform.chdir(File.join(aruba.root_directory, aruba.current_directory)) { Aruba::Platform.expand_path(file_name, dir_string) } + directory = File.join(aruba.root_directory, aruba.current_directory) + + Aruba::Platform.mkdir directory unless File.exist? directory + Aruba::Platform.chdir(directory) { Aruba::Platform.expand_path(file_name, dir_string) } end end # rubocop:enable Metrics/MethodLength
Create current directory if does not exist
cucumber_aruba
train
rb
b3a54bace56775d3df49833b4fe0dcbbe0fb1e7d
diff --git a/context.js b/context.js index <HASH>..<HASH> 100644 --- a/context.js +++ b/context.js @@ -19,13 +19,14 @@ function Namespace (name) { this.active = Object.create(null); } +function getNamespace(name) { return namespaces[name]; } + // "class" method Namespace.get = getNamespace; -function getNamespace(name) { return namespaces[name]; } - Namespace.prototype.set = function (key, value) { - return this.active[key] = value; + this.active[key] = value; + return value; }; Namespace.prototype.get = function (key) {
Make jshint happy.
othiym23_node-continuation-local-storage
train
js
76bdff999ae2cbbc04c6676fc55b465a8a11f6f4
diff --git a/src/utils/utils.js b/src/utils/utils.js index <HASH>..<HASH> 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -63,7 +63,7 @@ Utils.pathForURL = function (url) { }; Utils.isRelativeURL = function (url) { - return !(url.search(/^(http|https|data|blob):\/\//) > -1 || url.substr(0, 2) === '//'); + return !(url.search(/^(http|https|data|blob):/) > -1 || url.substr(0, 2) === '//'); }; Utils.extensionForURL = function (url) {
fix bug where blob URLs were treated as relative URLs
tangrams_tangram
train
js
24bbff7629950f3b6cb519c7caa74867e7e7051b
diff --git a/src/formats/geojson/GeoJSONParser.js b/src/formats/geojson/GeoJSONParser.js index <HASH>..<HASH> 100644 --- a/src/formats/geojson/GeoJSONParser.js +++ b/src/formats/geojson/GeoJSONParser.js @@ -1100,13 +1100,16 @@ define(['../../error/ArgumentError', GeoJSONParser.prototype.setProj4jsAliases = function () { Proj4.defs([ [ + "urn:ogc:def:crs:EPSG::4326", + Proj4.defs('EPSG:4326') + ], + [ 'urn:ogc:def:crs:OGC:1.3:CRS84', Proj4.defs('EPSG:4326') ], [ 'urn:ogc:def:crs:EPSG::3857', Proj4.defs('EPSG:3857') - ] ]); };
Add urn:ogc:def:crs:EPSG::<I> as alias for EPSG:<I> in GeoJSONParser (#<I>)
NASAWorldWind_WebWorldWind
train
js
ed7ea72f892f3f3439af7913530db4fe2ca2c06f
diff --git a/src/models/Client.php b/src/models/Client.php index <HASH>..<HASH> 100644 --- a/src/models/Client.php +++ b/src/models/Client.php @@ -11,6 +11,7 @@ namespace hipanel\modules\client\models; use hipanel\helpers\StringHelper; +use hipanel\models\Ref; use hipanel\modules\client\forms\EmployeeForm; use hipanel\modules\client\models\query\ClientQuery; use hipanel\modules\domain\models\Domain; @@ -29,7 +30,7 @@ class Client extends \hipanel\base\Model { use \hipanel\base\ModelTrait; - const TYPE_SELLER = 'seller'; + const TYPE_SELLER = 'reseller'; const TYPE_ADMIN = 'admin'; const TYPE_MANAGER = 'manager'; const TYPE_CLIENT = 'client';
Fixed seller type of client to Reseller in Clinent model
hiqdev_hipanel-module-client
train
php
69c8bfd3ea3d8c4460c015cab262ffc08ed9e4c5
diff --git a/github-release-from-changelog.js b/github-release-from-changelog.js index <HASH>..<HASH> 100755 --- a/github-release-from-changelog.js +++ b/github-release-from-changelog.js @@ -115,7 +115,7 @@ var changelogLines = changelog.replace(/\r\n/g, "\n").split("\n"); // # 1.0 // ## v1.0 // ## [v1.0 -var versionStartStringRe = "##? \\[?v?"; +var versionStartStringRe = "^##? \\[?v?"; var versionStartRe = new RegExp(versionStartStringRe); var versionRe = new RegExp(versionStartStringRe + version.replace(/\./, ".")); var footerLinkRe = new RegExp("$\\[");
Fix a specific bug if a line contain a version similar to supported markdown title
MoOx_github-release-from-changelog
train
js
b89565955619625040725135e5838a63dffdc0a0
diff --git a/extensions/tags/js/src/admin/components/EditTagModal.js b/extensions/tags/js/src/admin/components/EditTagModal.js index <HASH>..<HASH> 100644 --- a/extensions/tags/js/src/admin/components/EditTagModal.js +++ b/extensions/tags/js/src/admin/components/EditTagModal.js @@ -74,9 +74,9 @@ export default class EditTagModal extends Modal { </div>, 20); items.add('icon', <div className="Form-group"> - <label>{app.translator.trans('core.admin.edit_group.icon_label')}</label> + <label>{app.translator.trans('flarum-tags.admin.edit_tag.icon_label')}</label> <div className="helpText"> - {app.translator.trans('core.admin.edit_group.icon_text', {a: <a href="https://fontawesome.com/icons?m=free" tabindex="-1"/>})} + {app.translator.trans('flarum-tags.admin.edit_tag.icon_text', {a: <a href="https://fontawesome.com/icons?m=free" tabindex="-1"/>})} </div> <input className="FormControl" placeholder="fas fa-bolt" value={this.icon()} oninput={m.withAttr('value', this.icon)}/> </div>, 10);
Updated edit tag modal to use appropriate lang-english keys
flarum_core
train
js
1a8c86f33a32297925b0463528b079f96cc9f962
diff --git a/src/de/lmu/ifi/dbs/elki/database/ids/integer/DoubleIntegerDBIDPair.java b/src/de/lmu/ifi/dbs/elki/database/ids/integer/DoubleIntegerDBIDPair.java index <HASH>..<HASH> 100644 --- a/src/de/lmu/ifi/dbs/elki/database/ids/integer/DoubleIntegerDBIDPair.java +++ b/src/de/lmu/ifi/dbs/elki/database/ids/integer/DoubleIntegerDBIDPair.java @@ -23,7 +23,6 @@ package de.lmu.ifi.dbs.elki.database.ids.integer; along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import de.lmu.ifi.dbs.elki.database.ids.DBID; import de.lmu.ifi.dbs.elki.database.ids.DoubleDBIDPair; /** @@ -68,16 +67,4 @@ class DoubleIntegerDBIDPair implements DoubleDBIDPair, IntegerDBIDRef { public double doubleValue() { return value; } - - @Override - @Deprecated - public Double getFirst() { - return new Double(value); - } - - @Override - @Deprecated - public DBID getSecond() { - return new IntegerDBID(id); - } }
Delete PairInterface interface leftovers.
elki-project_elki
train
java
474c43e433eecb4d129918769af95468a22152e9
diff --git a/mithril.js b/mithril.js index <HASH>..<HASH> 100644 --- a/mithril.js +++ b/mithril.js @@ -1007,6 +1007,10 @@ } function copyStyleAttrs(node, dataAttr, cachedAttr) { + if (cachedAttr === dataAttr) { + node.style = "" + cachedAttr = {} + } for (var rule in dataAttr) { if (hasOwn.call(dataAttr, rule)) { if (cachedAttr == null || cachedAttr[rule] !== dataAttr[rule]) { @@ -1091,7 +1095,7 @@ tag, namespace ) { - if (!(attrName in cachedAttrs) || (cachedAttr !== dataAttr) || ($document.activeElement === node)) { + if (!(attrName in cachedAttrs) || (cachedAttr !== dataAttr) || typeof dataAttr === "object" || ($document.activeElement === node)) { cachedAttrs[attrName] = dataAttr try { return setSingleAttr(
update style if it's mutated object
MithrilJS_mithril.js
train
js
0c305c193a5c2aa4e4727c2e38b00fb27c64d7f2
diff --git a/tests/Small/ConfigTest.php b/tests/Small/ConfigTest.php index <HASH>..<HASH> 100644 --- a/tests/Small/ConfigTest.php +++ b/tests/Small/ConfigTest.php @@ -48,6 +48,24 @@ class ConfigTest extends TestCase /** * @test * @small + * @covers ::validateConfig + */ + public function itCanHandleIntoToBoolConversion(): void + { + $server[ConfigInterface::PARAM_DB_USER] = self::SERVER[ConfigInterface::PARAM_DB_USER]; + $server[ConfigInterface::PARAM_DB_PASS] = self::SERVER[ConfigInterface::PARAM_DB_PASS]; + $server[ConfigInterface::PARAM_DB_HOST] = self::SERVER[ConfigInterface::PARAM_DB_HOST]; + $server[ConfigInterface::PARAM_DB_NAME] = self::SERVER[ConfigInterface::PARAM_DB_NAME]; + $server[ConfigInterface::PARAM_DEVMODE] = 0; + $server[ConfigInterface::PARAM_DB_DEBUG] = 1; + $config = new Config($server); + self::assertFalse($config->get(ConfigInterface::PARAM_DEVMODE)); + self::assertTrue($config->get(ConfigInterface::PARAM_DB_DEBUG)); + } + + /** + * @test + * @small * @covers ::get */ public function getParam(): void
some tests for the int/bool conversion
edmondscommerce_doctrine-static-meta
train
php
8873ccb0377cf11f09c5a92cdb14df3395afddbd
diff --git a/lib/mobility/version.rb b/lib/mobility/version.rb index <HASH>..<HASH> 100644 --- a/lib/mobility/version.rb +++ b/lib/mobility/version.rb @@ -7,9 +7,9 @@ module Mobility module VERSION MAJOR = 1 - MINOR = 2 - TINY = 2 - PRE = nil + MINOR = 3 + TINY = 0 + PRE = alpha STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end
Bump to <I>.alpha
shioyama_mobility
train
rb
4da6c37c2a38fec684847fcc1a92e3cda3fe1b16
diff --git a/splinter/element_list.py b/splinter/element_list.py index <HASH>..<HASH> 100644 --- a/splinter/element_list.py +++ b/splinter/element_list.py @@ -2,7 +2,7 @@ class ElementDoesNotExist(Exception): pass class ElementList(list): - + def __init__(self, list): self.extend(list) @@ -11,17 +11,11 @@ class ElementList(list): return super(ElementList, self).__getitem__(index) except IndexError: raise ElementDoesNotExist('element does not exist') - + @property def first(self): - try: - return self[0] - except IndexError: - raise ElementDoesNotExist('element does not exist') - + return self[0] + @property def last(self): - try: - return self[-1] - except IndexError: - raise ElementDoesNotExist('element does not exist') + return self[-1]
refactoring exceptions element list
cobrateam_splinter
train
py
9fdd54d44433d66d3615bcdc6c9a996d37552900
diff --git a/liquibase-core/src/main/java/liquibase/datatype/core/UnknownType.java b/liquibase-core/src/main/java/liquibase/datatype/core/UnknownType.java index <HASH>..<HASH> 100644 --- a/liquibase-core/src/main/java/liquibase/datatype/core/UnknownType.java +++ b/liquibase-core/src/main/java/liquibase/datatype/core/UnknownType.java @@ -26,7 +26,12 @@ public class UnknownType extends LiquibaseDataType { public DatabaseDataType toDatabaseDataType(Database database) { int dataTypeMaxParameters = database.getDataTypeMaxParameters(getName()); Object[] parameters = getParameters(); - if (database instanceof MySQLDatabase && getName().equals("TINYBLOB") || getName().equals("MEDIUMBLOB")) { + if (database instanceof MySQLDatabase && ( + getName().equals("TINYBLOB") + || getName().equals("MEDIUMBLOB") + || getName().equals("TINYTEXT") + || getName().equals("MEDIUMTEXT") + )) { parameters = new Object[0]; }
CORE-<I> Unnecessary size specifications on MEDIUMTEXT, TINYTEXT, MEDIUMBLOB, TINYBLOB from generateChangeLog
liquibase_liquibase
train
java
83a107f1375fc05b1c7518517c78cc3185c12554
diff --git a/neo/Settings.py b/neo/Settings.py index <HASH>..<HASH> 100644 --- a/neo/Settings.py +++ b/neo/Settings.py @@ -183,7 +183,7 @@ class SettingsHolder: self.NODE_PORT = int(config['NodePort']) self.WS_PORT = config['WsPort'] self.URI_PREFIX = config['UriPrefix'] - self.ACCEPT_INCOMING_PEERS = config['AcceptIncomingPeers'] + self.ACCEPT_INCOMING_PEERS = config.get('AcceptIncomingPeers', False) self.BOOTSTRAP_FILE = config['BootstrapFile'] self.NOTIF_BOOTSTRAP_FILE = config['NotificationBootstrapFile']
Default self.ACCEPT_INCOMING_PEERS to False
CityOfZion_neo-python
train
py
d21a65737df6def081b3f845e3295b1ff22b3b39
diff --git a/public/js/vendor/jquery.bottomless.js b/public/js/vendor/jquery.bottomless.js index <HASH>..<HASH> 100644 --- a/public/js/vendor/jquery.bottomless.js +++ b/public/js/vendor/jquery.bottomless.js @@ -121,8 +121,8 @@ (options.success || function(data) { var $items = $.parseHTML(data); $el.append($items); - $el.data('page', page); })(data); + $el.data('page', page); stop(); $el.trigger('aposScrollLoaded'); },
Fix a very old bottomless bug: if you supply your own success function, the `page` jquery data attribute never gets set
apostrophecms_apostrophe
train
js
5f107edfadc86bad7343eeb0fd8636fd5d04903e
diff --git a/bingsearch.py b/bingsearch.py index <HASH>..<HASH> 100644 --- a/bingsearch.py +++ b/bingsearch.py @@ -32,7 +32,12 @@ class BingSearch(object): url = self.QUERY_URL.format(urllib2.quote("'{}'".format(query)), limit, offset, format) r = requests.get(url, auth=("", self.api_key)) json_results = r.json() - return [Result(single_result_json) for single_result_json in json_results['d']['results']], json_results['d']['__next'] + try: + next_link = json_results['d']['__next'] + except KeyError as kE: + print "KeyError: %s" % kE + next_link = '' + return [Result(single_result_json) for single_result_json in json_results['d']['results']], next_link class Result(object): '''
__next link is sometimes not returned
tristantao_py-bing-search
train
py
ba8f964b60f662933094e20526d8a74e0eba6556
diff --git a/grakn-kb/src/main/java/ai/grakn/kb/internal/concept/ThingImpl.java b/grakn-kb/src/main/java/ai/grakn/kb/internal/concept/ThingImpl.java index <HASH>..<HASH> 100644 --- a/grakn-kb/src/main/java/ai/grakn/kb/internal/concept/ThingImpl.java +++ b/grakn-kb/src/main/java/ai/grakn/kb/internal/concept/ThingImpl.java @@ -273,7 +273,7 @@ public abstract class ThingImpl<T extends Thing, V extends Type> extends Concept throw GraknTxOperationException.hasNotAllowed(this, attribute); } - EdgeElement attributeEdge = putEdge(AttributeImpl.from(attribute), Schema.EdgeLabel.ATTRIBUTE); + EdgeElement attributeEdge = addEdge(AttributeImpl.from(attribute), Schema.EdgeLabel.ATTRIBUTE); return vertex().tx().factory().buildRelation(attributeEdge, hasAttribute, hasAttributeOwner, hasAttributeValue); }
Adding resources now behave as adding relationships. I.e. duplicates are allowed (#<I>)
graknlabs_grakn
train
java
54c33e9f3799cf154c2bab4b769441057d26ff67
diff --git a/tests/CalendarTest.php b/tests/CalendarTest.php index <HASH>..<HASH> 100644 --- a/tests/CalendarTest.php +++ b/tests/CalendarTest.php @@ -30,6 +30,27 @@ class CalendarTest extends \PHPUnit_Framework_TestCase { } + public function testCalendarLastDayOfMonth() { + $u1 = new Unit(1,10,array()); + $u2 = new Unit(2,20,array()); + + $units = array($u1,$u2); + + $sd1 = new \DateTime('2016-03-31 12:12'); + $sd2 = new \DateTime('2016-03-31 13:12'); + + $e1 = new Event($sd1, $sd2, $u1, 11); + $e2 = new Event($sd1, $sd2, $u2, 22); + + $store = new SqlLiteDBStore($this->pdo, 'availability_event', SqlDBStore::BAT_STATE); + + $calendar = new Calendar($units, $store); + + $calendar->addEvents(array($e1, $e2), Event::BAT_HOURLY); + + $this->assertEquals($calendar->getStates($sd1, $sd2), array(1 => array(11 => 11), 2 => array(22 => 22))); + } + public function testCalendarAddSingleEvent2UnitsSameHours() { $u1 = new Unit(1,10,array());
Add Calendar test for last day of month
Roomify_bat
train
php
e36404cf2243d8de52062d834f0676a0f95966a7
diff --git a/src/you_get/extractors/youku.py b/src/you_get/extractors/youku.py index <HASH>..<HASH> 100644 --- a/src/you_get/extractors/youku.py +++ b/src/you_get/extractors/youku.py @@ -78,7 +78,7 @@ class Youku(VideoExtractor): self.api_error_code = None self.api_error_msg = None - self.ccode = '0511' + self.ccode = '0515' # Found in http://g.alicdn.com/player/ykplayer/0.5.64/youku-player.min.js # grep -oE '"[0-9a-zA-Z+/=]{256}"' youku-player.min.js self.ckey = 'DIl58SLFxFNndSV1GFNnMQVYkx1PP5tKe1siZu/86PR1u/Wh1Ptd+WOZsHHWxysSfAOhNJpdVWsdVJNsfJ8Sxd8WKVvNfAS8aS8fAOzYARzPyPc3JvtnPHjTdKfESTdnuTW6ZPvk2pNDh4uFzotgdMEFkzQ5wZVXl2Pf1/Y6hLK0OnCNxBj3+nb0v72gZ6b0td+WOZsHHWxysSo/0y9D2K42SaB8Y/+aD2K42SaB8Y/+ahU+WOZsHcrxysooUeND'
[youku] fire in the hole!
soimort_you-get
train
py
40533263b54301fb886752f8e2c45820a747174e
diff --git a/Kwf/Util/Fulltext/Backend/Solr.php b/Kwf/Util/Fulltext/Backend/Solr.php index <HASH>..<HASH> 100644 --- a/Kwf/Util/Fulltext/Backend/Solr.php +++ b/Kwf/Util/Fulltext/Backend/Solr.php @@ -24,7 +24,9 @@ class Kwf_Util_Fulltext_Backend_Solr extends Kwf_Util_Fulltext_Backend_Abstract if (!isset($i[$subrootId])) { $solr = Kwf_Config::getValueArray('fulltext.solr'); $path = $solr['path']; - $path = str_replace('%subroot%', $subrootId, $path); + $subrootPart = $subrootId; + if (!$subrootPart) $subrootPart = 'root'; + $path = str_replace('%subroot%', $subrootPart, $path); $path = str_replace('%appid%', Kwf_Config::getValue('application.id'), $path); $i[$subrootId] = new Kwf_Util_Fulltext_Solr_Service($solr['host'], $solr['port'], $path); }
Change solr default path if no subdomains defined If no subdomains are defined now root is used as value for %subdomain%. So it's not needed to set solr path explicitely in every web.
koala-framework_koala-framework
train
php
9fdd1dc50ac9002cf947db19f798baf7c276d3e7
diff --git a/stan.go b/stan.go index <HASH>..<HASH> 100644 --- a/stan.go +++ b/stan.go @@ -132,6 +132,8 @@ var DefaultOptions = Options{ type Option func(*Options) error // NatsURL is an Option to set the URL the client should connect to. +// The url can contain username/password semantics. e.g. nats://derek:pass@localhost:4222 +// Comma separated arrays are also supported, e.g. urlA, urlB. func NatsURL(u string) Option { return func(o *Options) error { o.NatsURL = u
[UPDATED] Doc of NatsURL [ci skip] Specify that one can pass a comma separated list of urls. Resolves #<I>
nats-io_go-nats-streaming
train
go
2e03ca047c1241f7c4784f6413173bdebaf4ecad
diff --git a/src/app-router.js b/src/app-router.js index <HASH>..<HASH> 100644 --- a/src/app-router.js +++ b/src/app-router.js @@ -58,8 +58,12 @@ export class AppRouter extends Router { if (!instructionCount) { this.events.publish('router:navigation:processing', { instruction }); + } else if (instructionCount === this.maxInstructionCount - 1) { + logger.error(`${instructionCount + 1} navigation instructions have been attempted without success. Restoring last known good location.`); + restorePreviousLocation(this); + return this.dequeueInstruction(instructionCount + 1); } else if (instructionCount > this.maxInstructionCount) { - throw new Error(`Maximum navigation attempts exceeded. ${this.maxInstructionCount} navigation instructions have been attempted without success. Giving up.`); + throw new Error(`Maximum navigation attempts exceeded. Giving up.`); } let context = this.createNavigationContext(instruction);
feat(router): restore previous location after exceeding max nav attempts
aurelia_router
train
js
c104ca89c23472b393e9fa80248d10e0319b6f02
diff --git a/store/ttl_key_heap.go b/store/ttl_key_heap.go index <HASH>..<HASH> 100644 --- a/store/ttl_key_heap.go +++ b/store/ttl_key_heap.go @@ -59,6 +59,10 @@ func (h *ttlKeyHeap) Pop() interface{} { old := h.array n := len(old) x := old[n-1] + // Set slice element to nil, so GC can recycle the node. + // This is due to golang GC doesn't support partial recycling: + // https://github.com/golang/go/issues/9618 + old[n-1] = nil h.array = old[0 : n-1] delete(h.keyMap, x) return x
store: optimize ttlKeyHeap GC It helps to recycle nodes in heap array, whose value can be unlimited long.
etcd-io_etcd
train
go
cd3bc6dd9a64e9b5cdc697f3daa9f155bd7f0a8c
diff --git a/src/Administration/Resources/app/administration/src/module/sw-settings-customer-group/page/sw-settings-customer-group-detail/index.js b/src/Administration/Resources/app/administration/src/module/sw-settings-customer-group/page/sw-settings-customer-group-detail/index.js index <HASH>..<HASH> 100644 --- a/src/Administration/Resources/app/administration/src/module/sw-settings-customer-group/page/sw-settings-customer-group-detail/index.js +++ b/src/Administration/Resources/app/administration/src/module/sw-settings-customer-group/page/sw-settings-customer-group-detail/index.js @@ -239,12 +239,12 @@ Component.register('sw-settings-customer-group-detail', { this.customerGroup = await this.createdComponent(); } catch (err) { + this.isLoading = false; + this.createNotificationError({ message: this.$tc('sw-settings-customer-group.detail.notificationErrorMessage'), }); } - - this.isLoading = false; }, }, });
NEXT-<I> - fix cannot read property of undefined error
shopware_platform
train
js
030bc0459751df57c328865cc7a1f6ebb3667b78
diff --git a/storio/src/main/java/com/pushtorefresh/storio/db/StorIODb.java b/storio/src/main/java/com/pushtorefresh/storio/db/StorIODb.java index <HASH>..<HASH> 100644 --- a/storio/src/main/java/com/pushtorefresh/storio/db/StorIODb.java +++ b/storio/src/main/java/com/pushtorefresh/storio/db/StorIODb.java @@ -32,7 +32,7 @@ public abstract class StorIODb { /** * Log wrapper. */ - private final Loggi loggi = new Loggi(); + @NonNull private final Loggi loggi = new Loggi(); /** * Prepares "execute sql" operation for {@link StorIODb}
Add @NonNull annotation for Loggi
pushtorefresh_storio
train
java
3064fe8ad995137fb6b714696c7ade5d3f662dc9
diff --git a/system/src/Grav/Console/Cli/SandboxCommand.php b/system/src/Grav/Console/Cli/SandboxCommand.php index <HASH>..<HASH> 100644 --- a/system/src/Grav/Console/Cli/SandboxCommand.php +++ b/system/src/Grav/Console/Cli/SandboxCommand.php @@ -47,7 +47,6 @@ class SandboxCommand extends ConsoleCommand * @var array */ protected $mappings = [ - '/.editorconfig' => '/.editorconfig', '/.gitignore' => '/.gitignore', '/CHANGELOG.md' => '/CHANGELOG.md', '/LICENSE.txt' => '/LICENSE.txt', @@ -59,7 +58,6 @@ class SandboxCommand extends ConsoleCommand '/system' => '/system', '/vendor' => '/vendor', '/webserver-configs' => '/webserver-configs', - '/codeception.yml' => '/codeception.yml', ]; /**
Fix #<I> Remove mappings missing if not cloned from github
getgrav_grav
train
php
70f404de9f3594960533fda56567443057b7209b
diff --git a/doc.go b/doc.go index <HASH>..<HASH> 100644 --- a/doc.go +++ b/doc.go @@ -31,6 +31,7 @@ use when creating the Iterator. ro.SetFillCache(false) it := db.NewIterator(ro) defer it.Close() + it.Seek(mykey) for it = it; it.Valid(); it.Next() { munge(it.Key(), it.Value()) }
forgotten Seek in iterator pattern
jmhodges_levigo
train
go
1f76301bfce182dd38526d8d9381a2d9d67e8eff
diff --git a/src/MySql/Wrapper/Wrapper.php b/src/MySql/Wrapper/Wrapper.php index <HASH>..<HASH> 100644 --- a/src/MySql/Wrapper/Wrapper.php +++ b/src/MySql/Wrapper/Wrapper.php @@ -712,7 +712,12 @@ abstract class Wrapper */ private function getWrapperRoutineName($theStoredRoutineName) { - return lcfirst(preg_replace('/(_)([a-z])/e', "strtoupper('\\2')", stristr($theStoredRoutineName, '_'))); + return lcfirst(preg_replace_callback('/(_)([a-z])/', + function ($matches) + { + return strtoupper($matches[2]); + }, + stristr($theStoredRoutineName, '_'))); } //--------------------------------------------------------------------------------------------------------------------
DL-<I>: PHP 7 issue: /e modifier is no longer supported.
SetBased_php-stratum
train
php
20bc0ad8585011d40e7b767e1f877285d8037b7c
diff --git a/tests/explainers/test_tree.py b/tests/explainers/test_tree.py index <HASH>..<HASH> 100644 --- a/tests/explainers/test_tree.py +++ b/tests/explainers/test_tree.py @@ -265,7 +265,7 @@ def test_pyspark_regression_decision_tree(): # validate values sum to the margin prediction of the model plus expected_value test = model.transform(iris).toPandas() predictions = model.transform(iris).select("prediction").toPandas() - diffs = expected_values + shap_values.sum() - predictions + diffs = expected_values + shap_values.sum(1) - predictions["prediction"] assert np.max(np.abs(diffs)) < 1e-6, "SHAP values don't sum to model output for class0!" assert (np.abs(expected_values - predictions.mean()) < 1e-6).all(), "Bad expected_value!" spark.stop()
add support for spark decision tree regressor
slundberg_shap
train
py
64baa2e0953b73c5a7b4bbb87d19d33fffa07cbf
diff --git a/src/message_receiver.js b/src/message_receiver.js index <HASH>..<HASH> 100644 --- a/src/message_receiver.js +++ b/src/message_receiver.js @@ -132,13 +132,12 @@ class MessageReceiver extends eventing.EventTarget { request.respond(400, 'Invalid Resource'); throw new Error('Invalid WebSocket resource received'); } + let envelope; try { const data = crypto.decryptWebsocketMessage(Buffer.from(request.body), this.signalingKey); - const envelopeProto = protobufs.Envelope.decode(data); - const envelope = protobufs.Envelope.toObject(envelopeProto); + envelope = protobufs.Envelope.toObject(protobufs.Envelope.decode(data)); envelope.timestamp = envelope.timestamp.toNumber(); - await this.handleEnvelope(envelope); } catch(e) { console.error("Error handling incoming message:", e); request.respond(500, 'Bad encrypted websocket message'); @@ -147,7 +146,11 @@ class MessageReceiver extends eventing.EventTarget { await this.dispatchEvent(ev); throw e; } - request.respond(200, 'OK'); + try { + await this.handleEnvelope(envelope); + } finally { + request.respond(200, 'OK'); + } } async handleEnvelope(envelope, reentrant) {
Restore old technique for handling new messages from websocket. Must return <I>, even if it's an error to avoid getting repeat deliveries.
ForstaLabs_librelay-node
train
js
b07c177a8e54d724d229780c45772288980c8dee
diff --git a/edisgo/grid/connect.py b/edisgo/grid/connect.py index <HASH>..<HASH> 100644 --- a/edisgo/grid/connect.py +++ b/edisgo/grid/connect.py @@ -247,7 +247,7 @@ def _connect_mv_node(network, node, target_obj): node_source=adj_node1, node_target=branch_tee) line = Line(id=random.randint(10 ** 8, 10 ** 9), - length=line_length, + length=line_length / 1e3, quantity=1, kind=line_kind, type=line_type) @@ -260,7 +260,7 @@ def _connect_mv_node(network, node, target_obj): node_source=adj_node2, node_target=branch_tee) line = Line(id=random.randint(10 ** 8, 10 ** 9), - length=line_length, + length=line_length / 1e3, quantity=1, kind=line_kind, type=line_type) @@ -275,7 +275,7 @@ def _connect_mv_node(network, node, target_obj): node_source=node, node_target=branch_tee) line = Line(id=random.randint(10 ** 8, 10 ** 9), - length=line_length, + length=line_length / 1e3, quantity=1, kind=std_line_kind, type=std_line_type)
fix line length bug in MV connect (m->km)
openego_eDisGo
train
py
6e7a3f7a8db8e0941a864f23bef3090f2de46d0a
diff --git a/lib/terminal_chess/version.rb b/lib/terminal_chess/version.rb index <HASH>..<HASH> 100644 --- a/lib/terminal_chess/version.rb +++ b/lib/terminal_chess/version.rb @@ -1,3 +1,3 @@ module TerminalChess - VERSION = "0.1.4" + VERSION = "0.2.0" end
Bump to version <I>
at1as_Terminal-Chess
train
rb
c384dd12fd783cfccddc194b556ebf907db67461
diff --git a/core-bundle/src/Resources/contao/library/Contao/Widget.php b/core-bundle/src/Resources/contao/library/Contao/Widget.php index <HASH>..<HASH> 100644 --- a/core-bundle/src/Resources/contao/library/Contao/Widget.php +++ b/core-bundle/src/Resources/contao/library/Contao/Widget.php @@ -967,7 +967,7 @@ abstract class Widget extends \BaseTemplate } break; - // Do not allow any characters that are usually encoded by class Input [=<>()#/]) + // Do not allow any characters that are usually encoded by class Input [#<>()\=]) case 'extnd': if (!\Validator::isExtendedAlphanumeric(html_entity_decode($varInput))) {
[Core] fix typo in Widget comment
contao_contao
train
php
0778972438895aeb16400b1d9caf47a3245e5d5c
diff --git a/server/container_create_linux.go b/server/container_create_linux.go index <HASH>..<HASH> 100644 --- a/server/container_create_linux.go +++ b/server/container_create_linux.go @@ -470,13 +470,13 @@ func (s *Server) createSandboxContainer(ctx context.Context, ctr ctrIface.Contai Destination: "/sys", Type: "sysfs", Source: "sysfs", - Options: []string{"nosuid", "noexec", "nodev", "rw"}, + Options: []string{"nosuid", "noexec", "nodev", "rw", "rslave"}, }) ctr.SpecAddMount(rspec.Mount{ Destination: "/sys/fs/cgroup", Type: "cgroup", Source: "cgroup", - Options: []string{"nosuid", "noexec", "nodev", "rw", "relatime"}, + Options: []string{"nosuid", "noexec", "nodev", "rw", "relatime", "rslave"}, }) }
server: mount cgroup with rslave even when running as privileged container, prevent cgroup mounts to be propagated to the host as it could cause errors when running with rshared and systemd inside of the container. Closes: <URL>
cri-o_cri-o
train
go
7edb310f6e126c4bbb6f185717f922f3a7ca7d8d
diff --git a/test/minitest_runner.rb b/test/minitest_runner.rb index <HASH>..<HASH> 100644 --- a/test/minitest_runner.rb +++ b/test/minitest_runner.rb @@ -26,22 +26,11 @@ module Byebug ["--name=/#{filtered_methods.join('|')}/"] end - run_with_timeout(flags) + Minitest.run(flags + $ARGV) end private - def max_running_time - 300 - end - - def run_with_timeout(flags) - Timeout.timeout(max_running_time) { Minitest.run(flags + $ARGV) } - rescue Timeout::Error - warn "Test suite timed out after #{max_running_time} seconds" - false - end - def runnables Minitest::Runnable.runnables end
Remove timeouts from test runner (#<I>) Use Ctrl-C locally, and rely on CI's handling in CI.
deivid-rodriguez_byebug
train
rb
c31a0fb9c8e72f19b33643499237389741a777ff
diff --git a/molgenis-omx-protocolviewer/src/main/java/org/molgenis/omx/study/StudyDefinitionService.java b/molgenis-omx-protocolviewer/src/main/java/org/molgenis/omx/study/StudyDefinitionService.java index <HASH>..<HASH> 100644 --- a/molgenis-omx-protocolviewer/src/main/java/org/molgenis/omx/study/StudyDefinitionService.java +++ b/molgenis-omx-protocolviewer/src/main/java/org/molgenis/omx/study/StudyDefinitionService.java @@ -2,6 +2,8 @@ package org.molgenis.omx.study; import java.util.List; +import org.springframework.scheduling.annotation.Async; + /** * Find, retrieve and persist study definitions * @@ -29,5 +31,6 @@ public interface StudyDefinitionService * * @param studyDefinition */ + @Async public void persistStudyDefinition(StudyDefinition studyDefinition); }
perform study definition persist async
molgenis_molgenis
train
java
88d84244744f9068ff570619132214fca0297fd5
diff --git a/telethon/client/chats.py b/telethon/client/chats.py index <HASH>..<HASH> 100644 --- a/telethon/client/chats.py +++ b/telethon/client/chats.py @@ -1085,18 +1085,17 @@ class ChatMethods: if isinstance(user, types.InputPeerSelf): await self(functions.channels.LeaveChannelRequest(entity)) else: - await self([ - functions.channels.EditBannedRequest( - channel=entity, - user_id=user, - banned_rights=types.ChatBannedRights(until_date=None, view_messages=True) - ), - functions.channels.EditBannedRequest( - channel=entity, - user_id=user, - banned_rights=types.ChatBannedRights(until_date=None) - ), - ], ordered=True) + await self(functions.channels.EditBannedRequest( + channel=entity, + user_id=user, + banned_rights=types.ChatBannedRights(until_date=None, view_messages=True) + )) + await asyncio.sleep(0.5) + await self(functions.channels.EditBannedRequest( + channel=entity, + user_id=user, + banned_rights=types.ChatBannedRights(until_date=None) + )) else: raise ValueError('You must pass either a channel or a chat')
Fix kick_participant in channels (#<I>) Presumably some server-side change made insta-unbanning no longer work.
LonamiWebs_Telethon
train
py
6cf14696c59d8b7522031b707a7760403605e23a
diff --git a/pkg/policy/rule.go b/pkg/policy/rule.go index <HASH>..<HASH> 100644 --- a/pkg/policy/rule.go +++ b/pkg/policy/rule.go @@ -43,12 +43,21 @@ func (r *rule) validate() error { func mergeL4Port(ctx *SearchContext, r api.PortRule, p api.PortProtocol, proto string, resMap L4PolicyMap) int { fmt := p.Port + "/" + proto - if _, ok := resMap[fmt]; !ok { + v, ok := resMap[fmt] + if !ok { resMap[fmt] = CreateL4Filter(r, p, proto) return 1 } - - return 0 + l4Filter := CreateL4Filter(r, p, proto) + if l4Filter.L7Parser != "" { + v.L7Parser = l4Filter.L7Parser + } + if l4Filter.L7RedirectPort != 0 { + v.L7RedirectPort = l4Filter.L7RedirectPort + } + v.L7Rules = append(v.L7Rules, l4Filter.L7Rules...) + resMap[fmt] = v + return 1 } func mergeL4(ctx *SearchContext, dir string, portRules []api.PortRule, resMap L4PolicyMap) int {
policy: adding a merger for l7 rules This commit fixes the order of policies when they are inserted. If a user adds policies with the same selector and a l7 rule, the l7 rule won't be merged causing the policy of the first rule inserted to be enforced. This commit attempts to merge the l7 http rules for all the policies with the same endpoint selector. Thus, all l7 rules will be enforced for the same endpoint selector.
cilium_cilium
train
go
b7c06687f109aba9c631ec51a1e8e5024403c4f1
diff --git a/generator/operation.go b/generator/operation.go index <HASH>..<HASH> 100644 --- a/generator/operation.go +++ b/generator/operation.go @@ -488,6 +488,7 @@ func (b *codeGenOpBuilder) MakeOperation() (GenOperation, error) { ExtraSchemes: extraSchemes, WithContext: b.WithContext, TimeoutName: timeoutName, + Extensions: operation.Extensions, }, nil } diff --git a/generator/structs.go b/generator/structs.go index <HASH>..<HASH> 100644 --- a/generator/structs.go +++ b/generator/structs.go @@ -355,6 +355,8 @@ type GenOperation struct { ConsumesMediaTypes []string WithContext bool TimeoutName string + + Extensions map[string]interface{} } // GenOperations represents a list of operations to generate
Add Swagger extensions to each Operation
go-swagger_go-swagger
train
go,go
c55b299e2b7ca5bcffffa3900699e25bc681a7a6
diff --git a/devices/miboxer.js b/devices/miboxer.js index <HASH>..<HASH> 100644 --- a/devices/miboxer.js +++ b/devices/miboxer.js @@ -27,4 +27,11 @@ module.exports = [ vendor: 'Miboxer', extend: extend.light_onoff_brightness(), }, + { + fingerprint: [{modelID: 'TS0502B', manufacturerName: '_TZ3210_frm6149r'}], + model: 'FUT035Z', + description: 'Dual white LED controller', + vendor: 'Miboxer', + extend: extend.light_onoff_brightness_colortemp({disableColorTempStartup: true, colorTempRange: [153, 500]}), + }, ];
Add FUT<I>Z (#<I>) * Added support for FUT<I>Z CCT Dimmer * Added Color-Temp range * Update miboxer.js
Koenkk_zigbee-shepherd-converters
train
js
8389a938abd0fc310ea7de3e603f40786db1f7f9
diff --git a/src/services/FileService.php b/src/services/FileService.php index <HASH>..<HASH> 100644 --- a/src/services/FileService.php +++ b/src/services/FileService.php @@ -63,7 +63,7 @@ class FileService protected function getFileByPath($filePath) { $file = $this->storage->getFiles()->getFileByName($filePath); - return new File($file); + return $file === null ? null : new File($file); } /** diff --git a/src/storage/storage/ImagesStorage.php b/src/storage/storage/ImagesStorage.php index <HASH>..<HASH> 100644 --- a/src/storage/storage/ImagesStorage.php +++ b/src/storage/storage/ImagesStorage.php @@ -103,7 +103,7 @@ class ImagesStorage extends AbstractStorage /** * @param $filename * - * @return null + * @return \stdClass|null */ public function getImageByName($filename) {
Minor refactor to fix two bugs
jenskooij_cloudcontrol
train
php,php
a2cb3478bfc476ad2a060f02403f6f4c02e02196
diff --git a/src/main/java/com/datumbox/common/utilities/RandomGenerator.java b/src/main/java/com/datumbox/common/utilities/RandomGenerator.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/datumbox/common/utilities/RandomGenerator.java +++ b/src/main/java/com/datumbox/common/utilities/RandomGenerator.java @@ -36,7 +36,7 @@ public class RandomGenerator { * * @return */ - public static Long getGlobalSeed() { + public static synchronized Long getGlobalSeed() { return globalSeed; } @@ -49,7 +49,7 @@ public class RandomGenerator { * * @param globalSeed */ - public static void setGlobalSeed(Long globalSeed) { + public static synchronized void setGlobalSeed(Long globalSeed) { RandomGenerator.globalSeed = globalSeed; } @@ -61,7 +61,7 @@ public class RandomGenerator { * * @return */ - public synchronized static Random getThreadLocalRandom() { + public static synchronized Random getThreadLocalRandom() { if(threadLocalRandom == null) { threadLocalRandom = new ThreadLocal<Random>() { @Override
Making public methods of RandomGenerator synchronized
datumbox_datumbox-framework
train
java
6ff9c1ae7d8dbd422beaf5c2d8044e521329f5f7
diff --git a/writer.js b/writer.js index <HASH>..<HASH> 100644 --- a/writer.js +++ b/writer.js @@ -13,6 +13,7 @@ var Definition = require("./definition.js"); var profiler = require('./profiler.js'); var count_writes = 0; +var count_units_in_prev_analyze = 0; function saveJoint(objJoint, objValidationState, preCommitCallback, onDone) { var objUnit = objJoint.unit; @@ -467,10 +468,16 @@ function saveJoint(objJoint, objValidationState, preCommitCallback, onDone) { function updateSqliteStats(){ if (count_writes % 100 !== 0) return; - console.log("will update sqlite stats"); - db.query("ANALYZE", function(){ - db.query("ANALYZE sqlite_master", function(){ - console.log("sqlite stats updated"); + db.query("SELECT COUNT(*) AS count_units FROM units", function(rows){ + var count_units = rows[0].count_units; + if (count_units < 2*count_units_in_prev_analyze) + return; + count_units_in_prev_analyze = count_units; + console.log("will update sqlite stats"); + db.query("ANALYZE", function(){ + db.query("ANALYZE sqlite_master", function(){ + console.log("sqlite stats updated"); + }); }); }); }
re-analyze only after each doubling
byteball_ocore
train
js
140b83942054f72f05ac97be5da95e16b628db93
diff --git a/lib/commands/general.js b/lib/commands/general.js index <HASH>..<HASH> 100644 --- a/lib/commands/general.js +++ b/lib/commands/general.js @@ -1,4 +1,5 @@ import _ from 'lodash'; +import util from 'appium-support'; let commands = {}, helpers = {}, extensions = {}; @@ -22,7 +23,7 @@ commands.mobilePerformEditorAction = async function (opts = {}) { commands.mobileSwipe = async function (opts = {}) { const {direction, element} = assertRequiredOptions(opts, ['direction', 'element']); - return await this.espresso.jwproxy.command(`/appium/execute_mobile/${element}/swipe`, 'POST', {direction}); + return await this.espresso.jwproxy.command(`/appium/execute_mobile/${util.unwrapElement(element)}/swipe`, 'POST', {direction}); }; commands.mobileGetDeviceInfo = async function () {
Accept element and elementId for mobile:swipe (#<I>)
appium_appium-espresso-driver
train
js
e63dfcb5140738e35a04471a1f20f19bbf18afa2
diff --git a/lib/KVCObject.js b/lib/KVCObject.js index <HASH>..<HASH> 100644 --- a/lib/KVCObject.js +++ b/lib/KVCObject.js @@ -11,7 +11,7 @@ var DEFAULT_PREFIX = ''; function KVCObject(options) { this._resetObject(); this._resetChanges(); - this._setOptions(options || {}); + this._setOptions(options); } inherits(KVCObject, EventEmitter); @@ -31,6 +31,7 @@ KVCObject.prototype._setOptions = function (options, defaultOptions) { this._options = {}; } + options = options || {}; defaultOptions = defaultOptions || DEFAULT_OPTIONS; for (var key in defaultOptions) {
Fixed issue with unitialized options
martinvl_KVCObject
train
js
d7aa17d643c6d10afdcc16da2eb6bcd844983a83
diff --git a/lib/transforms/buildProduction.js b/lib/transforms/buildProduction.js index <HASH>..<HASH> 100644 --- a/lib/transforms/buildProduction.js +++ b/lib/transforms/buildProduction.js @@ -131,7 +131,6 @@ module.exports = function (options) { // Remove orphan assets, except I18n which might originally have been referenced from the no longer existing bootstrapper: .inlineHtmlTemplates() .removeUnreferencedAssets({type: query.not('I18n'), isInitial: query.not(true)}) - .flattenStaticIncludes() .convertCssImportsToHtmlStyles() .removeDuplicateHtmlStyles({type: 'Html', isInitial: true}) .mergeIdenticalAssets({isLoaded: true, isInline: false, type: ['JavaScript', 'Css']})
buildProduction: Don't run flattenStaticIncludes anymore, it's no longer necessary.
assetgraph_assetgraph-builder
train
js
49c25d97be24b9a785592c0d44893ce0e2af18ee
diff --git a/jsoneditor/jsoneditor.js b/jsoneditor/jsoneditor.js index <HASH>..<HASH> 100644 --- a/jsoneditor/jsoneditor.js +++ b/jsoneditor/jsoneditor.js @@ -1107,6 +1107,19 @@ JSONEditor.Node.prototype.focus = function(field) { * Remove focus from the value or field of this node */ JSONEditor.Node.prototype.blur = function() { + if (this.dom.tr && this.dom.tr.parentNode) { + var domValue = this.dom.value; + if (domValue) { + domValue.blur(); + } + var domField = this.dom.field; + if (domField) { + domField.blur(); + } + } + + // retrieve the field and value from the DOM. A little redundant but + // it cannot do harm. this._getDomValue(true); this._getDomField(true); };
Fixed method Node.blur, which did not actually removed the focus from the node. Now it does.
josdejong_jsoneditor
train
js
7c39af0883830ac664151d8992b8acd56677c027
diff --git a/src/Projecting/AggregateProjector.php b/src/Projecting/AggregateProjector.php index <HASH>..<HASH> 100644 --- a/src/Projecting/AggregateProjector.php +++ b/src/Projecting/AggregateProjector.php @@ -15,7 +15,7 @@ use Prooph\EventMachine\Persistence\DocumentStore; * Example usage: * <code> * $eventMachine->watch(Stream::ofWriteModel()) - * ->with(AggregateProjector::generateProjectionNameForAggregateType('My.AR'), AggregateProjector::class) + * ->with(AggregateProjector::generateProjectionName('My.AR'), AggregateProjector::class) * ->filterAggregateType('My.AR') * ->storeDocuments(JsonSchema::object(...)) * </code>
Fix example doc block of AggregateProjector
proophsoftware_event-machine
train
php
82c977bb9af873a101bd27fa772593f920d8293c
diff --git a/tests/TestCase.php b/tests/TestCase.php index <HASH>..<HASH> 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -95,7 +95,10 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase $status = (int)$function(); exit(0); default: - pcntl_wait($status); + usleep(1e3); + if (pcntl_wait($status) === -1) { + $this->fail('Failed to fork process.'); + } return $status; } }
Fix test conflicts with forks not ready yet
amphp_parallel
train
php
c5775b831204e1e466eb0e4cca7981e6783db275
diff --git a/test/rfc_test.rb b/test/rfc_test.rb index <HASH>..<HASH> 100644 --- a/test/rfc_test.rb +++ b/test/rfc_test.rb @@ -218,4 +218,22 @@ describe "RFC Recurrence Rules" do # http://www.kanzaki.com/docs/ical/rrule.html dates.must_pair_with expected_dates dates.size.must_equal expected_dates.size end + + it "supports every other month on the 1st and last Sunday of the month for 10 occurrences" do + schedule = new_schedule( + every: :month, + day: { sunday: [1, -1] }, + interval: 2, + total: 10) + + expected_dates = cherry_pick( + 2015 => { 9 => [6, 27], 11 => [1, 29] }, + 2016 => { 1 => [3, 24], 3 => [6, 27], 5 => [1, 29] } + ).map { |t| t + 12.hours } + + dates = schedule.events.to_a + + dates.must_pair_with expected_dates + dates.size.must_equal expected_dates.size + end end
WIP failing test for first, last day of month
rossta_montrose
train
rb
288fad0bbba5021d689c1d1efd7edb40686986d8
diff --git a/lib/fs-tools.js b/lib/fs-tools.js index <HASH>..<HASH> 100644 --- a/lib/fs-tools.js +++ b/lib/fs-tools.js @@ -129,7 +129,7 @@ function copy_symlink(src, dst, callback) { function copy_directory(src, dst, callback) { - fs.mkdir(dst, '0755', function (err) { + fstools.mkdir(dst, '0755', function (err) { if (err) { callback(err); return;
Replaced fs.mkdir with fstools.mkdir since the latter checks for the existence of the destination before creating it.
Trott_fs-tools
train
js
bdc8d1c1dd2be3a89c8c73adb1acac539d431065
diff --git a/ariadne/contrib/tracing/opentracing.py b/ariadne/contrib/tracing/opentracing.py index <HASH>..<HASH> 100644 --- a/ariadne/contrib/tracing/opentracing.py +++ b/ariadne/contrib/tracing/opentracing.py @@ -27,9 +27,7 @@ class OpenTracingExtension(Extension): self._root_scope = self._tracer.start_active_span("GraphQL Query") self._root_scope.span.set_tag(tags.COMPONENT, "graphql") - def request_finished( - self, context: ContextValue, error: Optional[Exception] = None - ): + def request_finished(self, context: ContextValue): self._root_scope.close() async def resolve(
Fix request_finished signature in opentracing extension
mirumee_ariadne
train
py
2a6c260461297288982f7556ff0b6cb940dd8df5
diff --git a/lib/opal/cli_runners/nodejs.rb b/lib/opal/cli_runners/nodejs.rb index <HASH>..<HASH> 100644 --- a/lib/opal/cli_runners/nodejs.rb +++ b/lib/opal/cli_runners/nodejs.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +require 'shellwords' require 'opal/paths' require 'opal/cli_runners/system_runner' @@ -14,10 +15,13 @@ module Opal argv = data[:argv].dup.to_a argv.unshift('--') if argv.any? + opts = Shellwords.shellwords(ENV['NODE_OPTS'] || "") + SystemRunner.call(data) do |tempfile| [ 'node', '--require', "#{__dir__}/source-map-support-node", + *opts, tempfile.path, *argv ]
Parse the NODE_OPTS environment variable in the Node runner
opal_opal
train
rb
8d95409aa00391c1b1f2fcc218c3f4de5bc5254c
diff --git a/language.js b/language.js index <HASH>..<HASH> 100644 --- a/language.js +++ b/language.js @@ -163,6 +163,22 @@ module.exports = { ClientGoodbye: 4008, ServerGoodbye: 4009, + // EGCBaseMsg + SystemMessage: 4001, + ReplicateConVars: 4002, + ConVarUpdated: 4003, + InviteToParty: 4501, + InvitationCreated: 4502, + PartyInviteResponse: 4503, + KickFromParty: 4504, + LeaveParty: 4505, + ServerAvailable: 4506, + ClientConnectToServer: 4507, + GameServerInfo: 4508, + Error: 4509, + Replay_UploadedToYouTube: 4510, + LANServerAvailable: 4511, + // ETFGCMsg ReportWarKill: 5001, VoteKickBanPlayer: 5018,
Added EGCBaseMsg to language.js
DoctorMcKay_node-tf2
train
js
ca33c64b6c2c36ada5520be6817039e6be7ced93
diff --git a/src/Manager.php b/src/Manager.php index <HASH>..<HASH> 100644 --- a/src/Manager.php +++ b/src/Manager.php @@ -169,13 +169,16 @@ class Manager */ protected function buildRefreshClaims(Payload $payload) { - // assign the payload values as variables for use later - extract($payload->toArray()); + // Get the claims to be persisted from the payload + $persistentClaims = collect($payload->toArray()) + ->only($this->persistentClaims) + ->toArray(); // persist the relevant claims return array_merge( $this->customClaims, - compact($this->persistentClaims, 'sub', 'iat') + $persistentClaims, + $payload->get(['sub', 'iat']), ); }
fix(php): Dont use compact
tymondesigns_jwt-auth
train
php
ef0de40228024a80fdd0c3d5671d492c6c47f098
diff --git a/ghost/extract-api-key/test/extract-api-key.test.js b/ghost/extract-api-key/test/extract-api-key.test.js index <HASH>..<HASH> 100644 --- a/ghost/extract-api-key/test/extract-api-key.test.js +++ b/ghost/extract-api-key/test/extract-api-key.test.js @@ -2,6 +2,17 @@ const assert = require('assert'); const extractApiKey = require('../index'); describe('Extract API Key', function () { + it('returns nulls for a request without any key', function () { + const {key, type} = extractApiKey({ + query: { + filter: 'status:active' + } + }); + + assert.equal(key, null); + assert.equal(type, null); + }); + it('Extracts Content API key from the request', function () { const {key, type} = extractApiKey({ query: {
Added extra test for output when request has no keys refs <URL>
TryGhost_Ghost
train
js
de007610f6eb570447afb09371d70528e636672d
diff --git a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java index <HASH>..<HASH> 100644 --- a/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java +++ b/sharding-proxy/src/main/java/io/shardingsphere/shardingproxy/runtime/GlobalRegistry.java @@ -154,12 +154,6 @@ public final class GlobalRegistry { this.authentication = authentication; } - private void initShardingMetaData(final ShardingExecuteEngine executeEngine) { - for (ShardingSchema each : shardingSchemas.values()) { - each.initShardingMetaData(executeEngine); - } - } - /** * Check schema exists. *
delete initShardingMetaData
apache_incubator-shardingsphere
train
java
5d85b366d1ba0a46ec9cc587a4d7259142906b1e
diff --git a/lib/merge-sort.js b/lib/merge-sort.js index <HASH>..<HASH> 100644 --- a/lib/merge-sort.js +++ b/lib/merge-sort.js @@ -40,22 +40,21 @@ function sort(array, compare) { * @return The merged array. */ function merge(left, right, compare) { - var result = new Array(left.length + right.length); + var result = []; var leftIndex = 0; var rightIndex = 0; - var resultIndex = 0; while (leftIndex < left.length || rightIndex < right.length) { if (leftIndex < left.length && rightIndex < right.length) { if (compare(left[leftIndex], right[rightIndex]) <= 0) { - result[resultIndex++] = left[leftIndex++]; + result.push(left[leftIndex++]); } else { - result[resultIndex++] = right[rightIndex++]; + result.push(right[rightIndex++]); } } else if (leftIndex < left.length) { - result[resultIndex++] = left[leftIndex++]; + result.push(left[leftIndex++]); } else if (rightIndex < right.length) { - result[resultIndex++] = right[rightIndex++]; + result.push(right[rightIndex++]); } } return result;
Use push instead of resultIndex The time saved expanding the array is not worth it the additional complexity considering this is primarily for educational purposed.
gwtw_js-sorting
train
js
6233e8dd7eb5dedb81e3e113c40d174aeb6391c5
diff --git a/lib/xmpp/srv.js b/lib/xmpp/srv.js index <HASH>..<HASH> 100644 --- a/lib/xmpp/srv.js +++ b/lib/xmpp/srv.js @@ -73,20 +73,16 @@ function resolveSrv(name, cb) { // one of both A & AAAA, in case of broken tunnels function resolveHost(name, cb) { - var error, results = [], pending = 2; - var cb1 = function(e, addrs) { + var error, results = []; + var cb1 = function(e, addr) { error = error || e; - var addr = addrs && addrs[Math.floor(Math.random() * addrs.length)]; if (addr) results.push(addr); - pending--; - if (pending < 1) - cb((results.length > 0) ? null : error, results); + cb((results.length > 0) ? null : error, results); }; - dns.resolve4(name, cb1); - dns.resolve6(name, cb1); + dns.lookup(name, cb1); } // connection attempts to multiple addresses in a row
Use dns.lookup() rather than dns.resolve4/6(). Abandons parallelism but finds localhost.
xmppjs_xmpp.js
train
js
0c6b0b411148d71e892c2f7144288bca2e6910e0
diff --git a/lib/url.js b/lib/url.js index <HASH>..<HASH> 100644 --- a/lib/url.js +++ b/lib/url.js @@ -49,23 +49,8 @@ function parse(uri){ } // in absence of `protocol` - if (null == obj.secure) { - // node.js secure by default - if ('undefined' != typeof location) { - obj.secure = 'https:' == location.protocol; - } else { - obj.secure = true; - } - } if (!obj.protocol) obj.protocol = obj.secure ? 'https:' : 'http:'; - // in absence of `hostname` - if (!obj.hostname && obj.host) { - var pieces = obj.host.split(':'); - obj.hostname = pieces.shift(); - if (pieces.length) obj.port = pieces.pop(); - } - // make sure we treat `localhost:80` and `localhost` equally if ((/(http|ws):/.test(obj.protocol) && 80 == obj.port) || (/(http|ws)s:/.test(obj.protocol) && 443 == obj.port)) {
url: simplify by no longer accepting object
tsjing_socket.io-client
train
js
5850c3dcd705f5fee79e9fde9b4fb6806d7b270b
diff --git a/draggablepanel/src/main/java/com/github/pedrovgs/DraggableViewCallback.java b/draggablepanel/src/main/java/com/github/pedrovgs/DraggableViewCallback.java index <HASH>..<HASH> 100644 --- a/draggablepanel/src/main/java/com/github/pedrovgs/DraggableViewCallback.java +++ b/draggablepanel/src/main/java/com/github/pedrovgs/DraggableViewCallback.java @@ -165,7 +165,7 @@ class DraggableViewCallback extends ViewDragHelper.Callback { * @param xVel */ private void triggerOnReleaseActionsWhileHorizontalDrag(float xVel) { - if (xVel < 0 && xVel <= X_MIN_VELOCITY) { + if (xVel < 0 && xVel <= -X_MIN_VELOCITY) { draggableView.closeToLeft(); } else if (xVel > 0 && xVel >= X_MIN_VELOCITY) { draggableView.closeToRight();
Fix bug related with horizontal drag and x velocity when draggable view is released
pedrovgs_DraggablePanel
train
java
fdd10248333fdbc7b51c19fc691d16aef2f46387
diff --git a/hererocks.py b/hererocks.py index <HASH>..<HASH> 100755 --- a/hererocks.py +++ b/hererocks.py @@ -691,6 +691,10 @@ class Lua(Program): os.path.join(module_path, "?", "init.lua") ] module_path_parts.insert(0 if local_paths_first else 2, os.path.join(".", "?.lua")) + + if self.major_version in ["5.3", "5.4"]: + module_path_parts.append(os.path.join(".", "?", "init.lua")) + self.package_path = ";".join(module_path_parts) cmodule_path = os.path.join(opts.location, "lib", "lua", self.major_version)
Fix ./?/init.lua not being in package path for Lua <I>+
mpeterv_hererocks
train
py
dc3a5d0491bafdd6b3d993f592266c494c9d2def
diff --git a/spec/requests/preview_spec.rb b/spec/requests/preview_spec.rb index <HASH>..<HASH> 100644 --- a/spec/requests/preview_spec.rb +++ b/spec/requests/preview_spec.rb @@ -46,12 +46,13 @@ describe "preview" do click_on "Preview" page.should have_selector("[data-toggle='post-preview']", visible: true) - - page.within_frame "preview" do - wait_until(60) do - page.should have_content(@post_title) - end + + + page.driver.browser.switch_to.frame "preview" + wait_until(360) do + page.should have_content(@post_title) end + end it "Close Preview", :js=>true do
trying something different too see if capybara + ruby 2 will work appropriately with frames and page.should
jipiboily_monologue
train
rb
4cb2f84f2b3429e1402accf4cd7bf9db413332a4
diff --git a/src/main/resources/META-INF/resources/primefaces/datatable/datatable.js b/src/main/resources/META-INF/resources/primefaces/datatable/datatable.js index <HASH>..<HASH> 100644 --- a/src/main/resources/META-INF/resources/primefaces/datatable/datatable.js +++ b/src/main/resources/META-INF/resources/primefaces/datatable/datatable.js @@ -912,7 +912,7 @@ PrimeFaces.widget.DataTable = PrimeFaces.widget.DeferredWidget.extend({ reflowHeaderText = headerColumn.find('.ui-reflow-headertext:first').text(), colTitleEl = headerColumn.children('.ui-column-title'), title = (reflowHeaderText && reflowHeaderText.length) ? reflowHeaderText : colTitleEl.text(); - this.tbody.find('> tr:not(.ui-datatable-empty-message) > td:nth-child(' + (i + 1) + ')').prepend('<span class="ui-column-title">' + title + '</span>'); + this.tbody.find('> tr:not(.ui-datatable-empty-message) > td:nth-child(' + (i + 1) + ')').prepend('<span class="ui-column-title">' + PrimeFaces.escapeHTML(title) + '</span>'); } },
fix DOM based XSS in dataTable as well (part of #<I>)
primefaces_primefaces
train
js
fae3ce0fbd8f30b3e629b413b02ac8a73977e835
diff --git a/Vendor/Uploader.php b/Vendor/Uploader.php index <HASH>..<HASH> 100644 --- a/Vendor/Uploader.php +++ b/Vendor/Uploader.php @@ -1479,6 +1479,12 @@ class Uploader { if (isset($_FILES['data'])) { foreach ($_FILES['data'] as $key => $file) { $count = count($file); + $iterator = new RecursiveArrayIterator($file); + if (false === $iterator->hasChildren()) { + $file = array( + 'Fake' => $file + ); + } foreach ($file as $model => $fields) { foreach ($fields as $field => $value) {
Update Vendor/Uploader.php Model uses a false if there is no model.
milesj_uploader
train
php
a8e85e05bcafc9595eb156a29a7aea318a958855
diff --git a/enrol/paypal/lib.php b/enrol/paypal/lib.php index <HASH>..<HASH> 100644 --- a/enrol/paypal/lib.php +++ b/enrol/paypal/lib.php @@ -207,4 +207,23 @@ class enrol_paypal_plugin extends enrol_plugin { return $OUTPUT->box(ob_get_clean()); } + /** + * Gets an array of the user enrolment actions + * + * @param course_enrolment_manager $manager + * @param stdClass $ue A user enrolment object + * @return array An array of user_enrolment_actions + */ + public function get_user_enrolment_actions(course_enrolment_manager $manager, $ue) { + $actions = array(); + $context = $manager->get_context(); + $instance = $ue->enrolmentinstance; + $params = $manager->get_moodlepage()->url->params(); + $params['ue'] = $ue->id; + if ($this->allow_unenrol($instance) && has_capability("enrol/paypal:unenrol", $context)) { + $url = new moodle_url('/enrol/unenroluser.php', $params); + $actions[] = new user_enrolment_action(new pix_icon('t/delete', ''), get_string('unenrol', 'enrol'), $url, array('class'=>'unenrollink', 'rel'=>$ue->id)); + } + return $actions; + } }
MDL-<I> - paypal does not allow unenrol
moodle_moodle
train
php
fbcf38885164dfc38d77a3b4df8ff5b7b2d8c64d
diff --git a/troposphere/directoryservice.py b/troposphere/directoryservice.py index <HASH>..<HASH> 100644 --- a/troposphere/directoryservice.py +++ b/troposphere/directoryservice.py @@ -19,6 +19,7 @@ class MicrosoftAD(AWSObject): props = { 'CreateAlias': (boolean, False), + 'Edition': (basestring, False), 'EnableSso': (boolean, False), 'Name': (basestring, True), 'Password': (basestring, True),
Add Edition to DirectoryService::MicrosoftAD
cloudtools_troposphere
train
py
9bc2659f7062cc1be7c9d5719afadcdd46e5e7e1
diff --git a/test/test_Exceptions.py b/test/test_Exceptions.py index <HASH>..<HASH> 100644 --- a/test/test_Exceptions.py +++ b/test/test_Exceptions.py @@ -38,7 +38,7 @@ class TestUtil(unittest.TestCase): self.assertEqual(exc.hresult, SCARD_E_NO_SERVICE) text = str(exc) if get_platform().startswith('linux'): - self.assertEqual(text, "Failed to list readers: Service not available. (0x8010001D)") + self.assertEqual(text, "Failed to list readers: Service not available. (0x%08X)" % SCARD_E_NO_SERVICE) def test_NoReadersException(self): exc = NoReadersException()
test: fix Exception test on <I>-bits CPU Thanks to mnhauke for the bug report <URL>
LudovicRousseau_pyscard
train
py
445c2806e1f2a08779e8fa415aba8f82df5622a5
diff --git a/test/test_odict.py b/test/test_odict.py index <HASH>..<HASH> 100755 --- a/test/test_odict.py +++ b/test/test_odict.py @@ -70,6 +70,7 @@ logger.info('test interpolation source_domainDN and source_domain ... %s : %s' % assert source_domainDN == 'dc=%s' % ',dc='.join(source_domain.split('.')) # FIXME: yaml loader seems to have changed @3.11 (debian 8: python3.4 + yaml 3.11 but NOT python2.7 + yaml 3.11 ) +""" source_baseDN = conf['source']['baseDN'] logger.info('test interpolation source_baseDN ... %s' % source_baseDN) assert source_baseDN == 'ou=Users,%s' % "dc={{ source.domain.split('.')|join(',dc=') }}" @@ -77,6 +78,7 @@ assert source_baseDN == 'ou=Users,%s' % "dc={{ source.domain.split('.')|join(',d source_bindDN = conf['source']['bindDN'] logger.info('test interpolation source_bindDN ... %s' % source_bindDN) assert source_bindDN == 'cn=Administrator,%s' % 'ou=Users,{{ source.domainDN }}' +""" print('passed test %s' % __file__)
skip this test for now in order to allow a release
zerwes_hiyapyco
train
py
2ee52fa21245bc959279c8555882127e13cc2e08
diff --git a/src/RestGalleries/Auth/Auth.php b/src/RestGalleries/Auth/Auth.php index <HASH>..<HASH> 100644 --- a/src/RestGalleries/Auth/Auth.php +++ b/src/RestGalleries/Auth/Auth.php @@ -62,9 +62,10 @@ abstract class Auth implements AuthAdapter protected function filterTokens($tokenCredentials) { $credentials = array_merge($this->clientCredentials, $tokenCredentials); - var_dump($credentials); $keys = call_user_func_array([$this, 'getAuth'.$this->protocol.'DefaultKeys'], [null]); + var_dump($tokenCredentials, array_only($credentials, $keys['token_credentials']), $keys['token_credentials']); + return array_only($credentials, $keys['token_credentials']); }
AuthTest dump credentials :(
estebanmatias92_RestGalleries
train
php
2e49e97b3138f513ffa5b74c3bae0523cc27562f
diff --git a/Swat/SwatNoteBook.php b/Swat/SwatNoteBook.php index <HASH>..<HASH> 100644 --- a/Swat/SwatNoteBook.php +++ b/Swat/SwatNoteBook.php @@ -49,22 +49,6 @@ class SwatNoteBook extends SwatWidget implements SwatUIParent // {{{ public properties /** - * Visible - * - * Whether the widget is display. All widgets should respect this. - * - * @var boolean - */ - public $visible = true; - - /** - * A non-visible unique id for this widget, or null - * - * @var string - */ - public $id = null; - - /** * A value containing the desired position of the tabs * * @var integer @@ -81,13 +65,6 @@ class SwatNoteBook extends SwatWidget implements SwatUIParent */ protected $pages = array(); - /** - * Messages affixed to this widget - * - * @var array - */ - protected $messages = array(); - // }}} // {{{ public function __construct()
These properties are already defined in SwatWidget (the parent class). No need to redefine them here. svn commit r<I>
silverorange_swat
train
php
8c4f24fc03ee9a8f5d5d19eb2b44121bcacf7607
diff --git a/mappyfile/validator.py b/mappyfile/validator.py index <HASH>..<HASH> 100644 --- a/mappyfile/validator.py +++ b/mappyfile/validator.py @@ -99,6 +99,9 @@ class Validator(object): path is the path to the error object, it can be empty if the error is in the root object http://python-jsonschema.readthedocs.io/en/latest/errors/#jsonschema.exceptions.ValidationError.absolute_path It can also reference an object in a list e.g. [u'layers', 0] + + Unfortunately it is not currently possible to get the name of the failing property from the + JSONSchema error object, even though it is in the error message - see https://github.com/Julian/jsonschema/issues/119 """ if not path: @@ -113,7 +116,7 @@ class Validator(object): key = path[-1] d = utils.findkey(rootdict, *path[:-1]) - error_message = "ERROR: Invalid value for {}".format(key.upper()) + error_message = "ERROR: Invalid value in {}".format(key.upper()) # add a comment to the dict structure
Add comment on validation and getting the key name
geographika_mappyfile
train
py
09b5b3b05245394bbc4c9aa546da991262102d30
diff --git a/jqm-all/jqm-engine/src/main/java/com/enioka/jqm/tools/Helpers.java b/jqm-all/jqm-engine/src/main/java/com/enioka/jqm/tools/Helpers.java index <HASH>..<HASH> 100644 --- a/jqm-all/jqm-engine/src/main/java/com/enioka/jqm/tools/Helpers.java +++ b/jqm-all/jqm-engine/src/main/java/com/enioka/jqm/tools/Helpers.java @@ -220,6 +220,7 @@ public final class Helpers n.setPort(0); n.setRepo(System.getProperty("user.dir") + "/jobs/"); n.setExportRepo(System.getProperty("user.dir") + "/exports/"); + n.setRootLogLevel("INFO"); em.persist(n); }
Default new node log level is now INFO (was: DEBUG)
enioka_jqm
train
java
043c4b2a9838f99b22b2f360eff19fe273b46100
diff --git a/tests/Template/ClassTemplateTest.php b/tests/Template/ClassTemplateTest.php index <HASH>..<HASH> 100644 --- a/tests/Template/ClassTemplateTest.php +++ b/tests/Template/ClassTemplateTest.php @@ -2757,7 +2757,7 @@ class ClassTemplateTest extends TestCase /** @var Foo<Enum::TYPE_ONE> $foo */ $foo = new Foo();' ], - 'extendedPropertyTypeParameterised' => [ + 'SKIPPED-extendedPropertyTypeParameterised' => [ '<?php namespace App;
Skip test that requires ext-ds
vimeo_psalm
train
php
eaf676c02c3699e66201a5510e1dd635405d9e2c
diff --git a/easyargs/__init__.py b/easyargs/__init__.py index <HASH>..<HASH> 100644 --- a/easyargs/__init__.py +++ b/easyargs/__init__.py @@ -1,5 +1,10 @@ import decorators +import parsers import sys # This bit of magic allows us to use the module name as a decorator +decorators.make_easy_args.parsers = parsers +decorators.make_easy_args.decorators = decorators + sys.modules[__name__] = decorators.make_easy_args +
Added the package's modules as properties so that imports work better
stedmeister_easyargs
train
py
47e859fbea8dad5554963f4555eb85e3231e7ce8
diff --git a/src/python/dxpy/cli/org.py b/src/python/dxpy/cli/org.py index <HASH>..<HASH> 100644 --- a/src/python/dxpy/cli/org.py +++ b/src/python/dxpy/cli/org.py @@ -74,7 +74,7 @@ def add_membership(args): except: pass else: - raise DXCLIError("Cannot add a user who is already a member of the org") + raise DXCLIError("Cannot add a user who is already a member of the org. To update an existing member's permissions, use 'dx update member'") dxpy.api.org_invite(args.org_id, get_org_invite_args(user_id, args))
Add more informative error message for `dx add member`. Recommend that the user executes `dx update member` if the user executed `dx add member` on a user who is already a member.
dnanexus_dx-toolkit
train
py
0a53f2d8ceb237df65f3ac7851dcd82df8f61d7f
diff --git a/src/WsdlToClass/Wsdl/Method.php b/src/WsdlToClass/Wsdl/Method.php index <HASH>..<HASH> 100644 --- a/src/WsdlToClass/Wsdl/Method.php +++ b/src/WsdlToClass/Wsdl/Method.php @@ -29,13 +29,13 @@ class Method /** * - * @var Request + * @var string */ private $request; /** * - * @var Response + * @var string */ private $response; @@ -59,7 +59,7 @@ class Method /** * - * @return Request + * @return string */ public function getRequest() { @@ -67,17 +67,17 @@ class Method } /** - * @param Request $request + * @param string $request */ - public function setRequest(Request $request) + public function setRequest($request) { - $this->request = $request; + $this->request = (string) $request; return $this; } /** * - * @return Response + * @return string */ public function getResponse() { @@ -85,11 +85,11 @@ class Method } /** - * @param Response $response + * @param string $response */ - public function setResponse(Response $response) + public function setResponse($response) { - $this->response = $response; + $this->response = (string) $response; return $this; }
Corrected errors based on failing build
DannyvdSluijs_WsdlToClass
train
php
a92f91c1e07a2d20b28970223caaba1b53bf0d5d
diff --git a/jsonrpcclient/__init__.py b/jsonrpcclient/__init__.py index <HASH>..<HASH> 100644 --- a/jsonrpcclient/__init__.py +++ b/jsonrpcclient/__init__.py @@ -4,6 +4,5 @@ import logging logger = logging.getLogger('jsonrpcclient') logger.addHandler(logging.StreamHandler()) -logger.setLevel(logging.WARNING) from jsonrpcclient.server import Server
Dont bother setting the log level to WARNING, thats the default anyway
bcb_jsonrpcclient
train
py