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
28f57c76bb8d826c521b37464c7e48645e866fd3
diff --git a/Tone/component/Meter.js b/Tone/component/Meter.js index <HASH>..<HASH> 100644 --- a/Tone/component/Meter.js +++ b/Tone/component/Meter.js @@ -5,7 +5,7 @@ define(["Tone/core/Tone", "Tone/core/Master"], function(Tone){ /** * @class Get the rms of the input signal with some averaging. * can also just get the value of the signal - * or the value in dB. inspired by {@link https://github.com/cwilso/volume-meter/blob/master/volume-meter.js|cwilso's volume meter} + * or the value in dB. inspired by https://github.com/cwilso/volume-meter/blob/master/volume-meter.js * * @constructor * @extends {Tone} diff --git a/Tone/effect/BitCrusher.js b/Tone/effect/BitCrusher.js index <HASH>..<HASH> 100644 --- a/Tone/effect/BitCrusher.js +++ b/Tone/effect/BitCrusher.js @@ -4,7 +4,7 @@ define(["Tone/core/Tone", "Tone/effect/Effect"], function(Tone){ /** * @class downsample incoming signal. - * inspiration from {@link https://github.com/jaz303/bitcrusher/blob/master/index.js|jaz303} + * inspiration from https://github.com/jaz303/bitcrusher/blob/master/index.js * * @constructor * @extends {Tone.Effect}
removed doc links they were breaking jsdocs.
Tonejs_Tone.js
train
js,js
6e8e8ea2b76fec19dcb2f2769f2b24320b8a5ac4
diff --git a/src/Providers/DashboardServiceProvider.php b/src/Providers/DashboardServiceProvider.php index <HASH>..<HASH> 100644 --- a/src/Providers/DashboardServiceProvider.php +++ b/src/Providers/DashboardServiceProvider.php @@ -51,6 +51,9 @@ class DashboardServiceProvider extends ServiceProvider __DIR__ . '/../Resources/views' => base_path('resources/views/vendor/' . $namespace), ], 'views'); + // Load translations. + $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'dashboard'); + // Publish config. $config = realpath(__DIR__ . '/../config.php');
repaired missing translation include from upstream merge
laraflock_dashboard
train
php
8141b291a7da712213dfac6ea2109260781b74e9
diff --git a/daemon_windows.go b/daemon_windows.go index <HASH>..<HASH> 100644 --- a/daemon_windows.go +++ b/daemon_windows.go @@ -53,3 +53,8 @@ func (windows *windowsRecord) Status() (string, error) { return "Status could not defined", errors.New("windows daemon is not supported") } + +// Get executable path +func execPath() (string, error) { + return "", errors.New("windows daemon is not supported") +}
Stub execPath method to compile for windows
takama_daemon
train
go
8078bddc62302503c5ae149eec5011d5948587a7
diff --git a/src/components/Bootstrap.php b/src/components/Bootstrap.php index <HASH>..<HASH> 100644 --- a/src/components/Bootstrap.php +++ b/src/components/Bootstrap.php @@ -153,6 +153,8 @@ class Bootstrap extends CApplicationComponent * Each array key-value pair represents the initial options for a single plugin class, * with the array key being the plugin name, and array value being the initial options array. * @since 0.9.8 + * + * @deprecated 2.0.0 Along with `registerPackage` this option will be refactored out in 3.0.0 release. */ public $plugins = array();
Marked `Bootstrap.plugins` as deprecated starting from version <I>
clevertech_YiiBooster
train
php
eec85853dec08997c31d3a1301ac01043295b967
diff --git a/core-bundle/contao/classes/Pagination.php b/core-bundle/contao/classes/Pagination.php index <HASH>..<HASH> 100644 --- a/core-bundle/contao/classes/Pagination.php +++ b/core-bundle/contao/classes/Pagination.php @@ -209,7 +209,7 @@ class Pagination extends \Frontend // Prepare the URL foreach (preg_split('/&(amp;)?/', $_SERVER['QUERY_STRING'], -1, PREG_SPLIT_NO_EMPTY) as $fragment) { - if (strpos($fragment.'=', $this->strParameter) === false) + if (strpos($fragment, $this->strParameter . '=') === false) { $this->strUrl .= (!$blnQuery ? '?' : '&amp;') . $fragment; $blnQuery = true;
[Core] Fixed two remaining issues with the new unique pagination variables (see #<I>)
contao_contao
train
php
798021af9f7ab8078bd3d93ae0ade666fae3a0a1
diff --git a/libnetwork/drivers/macvlan/macvlan_network.go b/libnetwork/drivers/macvlan/macvlan_network.go index <HASH>..<HASH> 100644 --- a/libnetwork/drivers/macvlan/macvlan_network.go +++ b/libnetwork/drivers/macvlan/macvlan_network.go @@ -29,7 +29,6 @@ func (d *driver) CreateNetwork(nid string, option map[string]interface{}, nInfo if err != nil { return err } - config.ID = nid err = config.processIPAM(nid, ipV4Data, ipV6Data) if err != nil { return err @@ -193,7 +192,7 @@ func parseNetworkOptions(id string, option options.Generic) (*configuration, err config.Internal = true } } - + config.ID = id return config, nil }
libnetwork: macvlan: set network ID as part of parseNetworkOptions
moby_moby
train
go
f27c20dec9c4a3a371b584ae901373c3778d892d
diff --git a/parser/parser_test.go b/parser/parser_test.go index <HASH>..<HASH> 100644 --- a/parser/parser_test.go +++ b/parser/parser_test.go @@ -705,6 +705,10 @@ var bashTests = []struct { `1:7: ++ must be followed by a word`, }, { + "let a+\n", + `1:7: + must be followed by an expression`, + }, + { "let ))", `1:5: "let" must be followed by arithmetic expressions`, }, diff --git a/parser/tokenizer.go b/parser/tokenizer.go index <HASH>..<HASH> 100644 --- a/parser/tokenizer.go +++ b/parser/tokenizer.go @@ -43,6 +43,9 @@ func (p *parser) next() { if p.tok == token.EOF { return } + if p.newLine && p.quote == arithmExprLet { + p.npos++ + } if p.npos >= len(p.src) { p.tok = token.EOF return
parser: fix hang introduced by removing STOPPED
mvdan_sh
train
go,go
83a758cf679e13d6533236c705e2bdc1580639e8
diff --git a/tests/ClientTest.php b/tests/ClientTest.php index <HASH>..<HASH> 100644 --- a/tests/ClientTest.php +++ b/tests/ClientTest.php @@ -164,14 +164,22 @@ class ClientTest extends TestCase protected function createClient() { $client = null; + $exception = null; + self::$factory->createClient()->then(function ($c) use (&$client) { $client = $c; + }, function($error) use (&$exception) { + $exception = $error; }); - while ($client === null) { + while ($client === null && $exception === null) { self::$loop->tick(); } + if ($exception !== null) { + throw $exception; + } + return $client; }
Throw exception if redis is not running
clue_php-redis-server
train
php
3e9fd2a4844fb90b08492b494d3304e4aace78e4
diff --git a/ykman/cli/info.py b/ykman/cli/info.py index <HASH>..<HASH> 100644 --- a/ykman/cli/info.py +++ b/ykman/cli/info.py @@ -142,7 +142,8 @@ def _check_fips_status(pid, info): @click.option( "-c", "--check-fips", - help="Check if YubiKey is in FIPS Approved mode (YubiKey FIPS only).", + help="Check if YubiKey is in FIPS Approved mode (available on YubiKey 4 FIPS " + "only).", is_flag=True, ) @click.command() @@ -202,4 +203,4 @@ def info(ctx, check_fips): ctx.obj["conn"].close() _check_fips_status(pid, info) else: - cli_fail("Not a YubiKey FIPS") + cli_fail("Unable to check FIPS Approved mode - Not a YubiKey 4 FIPS")
Clarify that --check-fips/-c for info is YK4 only.
Yubico_yubikey-manager
train
py
139d6437c50d4e65b68f8175f55d747169b48a74
diff --git a/tests/test_mypolr.py b/tests/test_mypolr.py index <HASH>..<HASH> 100644 --- a/tests/test_mypolr.py +++ b/tests/test_mypolr.py @@ -1,9 +1,12 @@ import requests import responses import pytest +import sys from mypolr import PolrApi, DEFAULT_API_ROOT, exceptions as polr_errors -from mypolr.__main__ import get_args as _get_args + + +is_old = sys.version_info.major < 3 or sys.version_info.major == 3 and sys.version_info.minor <= 3 class ResponseErrorMap: @@ -196,12 +199,14 @@ class TestLookup: rmap.make_error_tests(api.lookup, short_url, url_key='a_secret') -def to_args(s): - return _get_args(s.split()) - - class TestCliArgs: def test_parser(self): + if is_old: + # Skip tests for old versions for which CLI usage is not supported + return + + from mypolr.__main__ import get_args as _get_args + none_kws = 'url server key custom'.split() bool_kws = 'version secret lookup save clear'.split() flags_true = ['--{}'.format(kw) for kw in bool_kws]
update CLI-test to only run on Python >=<I>
fauskanger_mypolr
train
py
f0cfc29bed30ca139ac88e589c8744f501ace03a
diff --git a/lib/reqres_rspec.rb b/lib/reqres_rspec.rb index <HASH>..<HASH> 100644 --- a/lib/reqres_rspec.rb +++ b/lib/reqres_rspec.rb @@ -15,19 +15,14 @@ if defined?(RSpec) && ENV['REQRES_RSPEC'] == '1' RSpec.configure do |config| config.after(:each) do |example| - if defined?(Rails) - meta_data = self.class.example.metadata - - if meta_data[:type] == :request && process_example?(meta_data, example) - begin + meta_data = self.class.example.metadata + if meta_data[:type] == :request && process_example?(meta_data, example) + begin + if defined?(Rails) collector.collect(self, example, self.request, self.response) - rescue NameError - raise $! + elsif defined?(Sinatra) + collector.collect(self, example, self.last_request, self.last_response) end - end - elsif defined?(Sinatra) - begin - collector.collect(self, self.last_request, self.last_response) rescue Rack::Test::Error # rescue NameError
fix regression with sinatra rspec
reqres-api_reqres_rspec
train
rb
cc537428028584e1f89935398fa4a72a3b03b671
diff --git a/hazelcast/src/test/java/com/hazelcast/cp/internal/CPLiteMemberTest.java b/hazelcast/src/test/java/com/hazelcast/cp/internal/CPLiteMemberTest.java index <HASH>..<HASH> 100644 --- a/hazelcast/src/test/java/com/hazelcast/cp/internal/CPLiteMemberTest.java +++ b/hazelcast/src/test/java/com/hazelcast/cp/internal/CPLiteMemberTest.java @@ -21,7 +21,7 @@ import com.hazelcast.core.HazelcastInstance; import com.hazelcast.cp.CPMember; import com.hazelcast.nio.Address; import com.hazelcast.test.HazelcastParallelClassRunner; -import com.hazelcast.test.annotation.ParallelTest; +import com.hazelcast.test.annotation.ParallelJVMTest; import com.hazelcast.test.annotation.QuickTest; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @RunWith(HazelcastParallelClassRunner.class) -@Category({QuickTest.class, ParallelTest.class}) +@Category({QuickTest.class, ParallelJVMTest.class}) public class CPLiteMemberTest extends HazelcastRaftTestSupport { @Test
Fix ParallelTest annotation for CPLiteMemberTest
hazelcast_hazelcast
train
java
44551a610519db3c17588577caad95b819344779
diff --git a/kernel/classes/datatypes/ezuser/ezuser.php b/kernel/classes/datatypes/ezuser/ezuser.php index <HASH>..<HASH> 100644 --- a/kernel/classes/datatypes/ezuser/ezuser.php +++ b/kernel/classes/datatypes/ezuser/ezuser.php @@ -625,18 +625,8 @@ WHERE user_id = '" . $userID . "' AND { $ini = eZINI::instance(); $type = strtolower( $ini->variable( 'UserSettings', 'HashType' ) ); - if ( $type == 'md5_site' ) - return self::PASSWORD_HASH_MD5_SITE; - else if ( $type == 'md5_user' ) - return self::PASSWORD_HASH_MD5_USER; - else if ( $type == 'plaintext' ) - return self::PASSWORD_HASH_PLAINTEXT; - else if ( $type == 'bcrypt' ) - return self::PASSWORD_HASH_BCRYPT; - else if ( $type == 'php_default' ) - return self::PASSWORD_HASH_PHP_DEFAULT; - else - return self::PASSWORD_HASH_MD5_PASSWORD; + + return self::passwordHashTypeID( $type ); } /*!
eZUser::hashType() lacks PASSWORD_HASH_MYSQL case Use passwordHashTypeID() instead which has the case, thereby also reducing redundancy.
ezsystems_ezpublish-legacy
train
php
4183044e960889423c8cb73b7129ec4ed9ae36bd
diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index <HASH>..<HASH> 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -712,11 +712,11 @@ func setupUPnP() { l.Warnln("Failed to create UPnP port mapping") } else { l.Infof("Created UPnP port mapping for external port %d on UPnP device %s.", externalPort, igd.FriendlyIdentifier()) - } - } - if opts.UPnPRenewal > 0 { - go renewUPnP(port) + if opts.UPnPRenewal > 0 { + go renewUPnP(port) + } + } } } } else {
Fix UPnP log spam on networks without UPnP IGDs (see #<I>) We should only run the UPnP port mapping renewal routine if the initial discovery and configuration succeed. This commit applies that logic.
syncthing_syncthing
train
go
cffad8ff6a230fca37551cb82ea32a4b8b8d9dd6
diff --git a/src/SALib/analyze/hdmr.py b/src/SALib/analyze/hdmr.py index <HASH>..<HASH> 100644 --- a/src/SALib/analyze/hdmr.py +++ b/src/SALib/analyze/hdmr.py @@ -352,8 +352,14 @@ def _init(X, Y, settings): def B_spline(X, m, d): - '''Generate cubic B-splines using scipy built-in basis_element - method. Knot points, t, are automatically determined. ''' + """Generate cubic B-splines using scipy basis_element method. + + Knot points (`t`) are automatically determined. + + References + ---------- + .. [1] https://docs.scipy.org/doc/scipy/reference/generated/scipy.interpolate.BSpline.basis_element.html + """ # Initialize B matrix B = np.zeros((X.shape[0], m+3, d)) # Cubic basis-spline settings
Added reference to further documentation in docstring
SALib_SALib
train
py
7170293536f1e303eed2e95bce6a44483cae074e
diff --git a/lib/sonos.js b/lib/sonos.js index <HASH>..<HASH> 100644 --- a/lib/sonos.js +++ b/lib/sonos.js @@ -118,7 +118,7 @@ Sonos.prototype.searchMusicLibrary = async function (searchType, searchTerm, req let searches = `${searchTypes[searchType]}${separator}` if (searchTerm && searchTerm !== '') { - searches = searches.concat(encodeURIComponent(searchTerm)) + searches = searches.concat(searchType === 'share' ? searchTerm : encodeURIComponent(searchTerm)) } var opts = {
fix: Stop encoding search term for shares. Fixed #<I>
bencevans_node-sonos
train
js
69cf8f31392c41e7de1e337edb7c33ff76f9d8cc
diff --git a/src/Kodeine/Acl/Traits/HasRole.php b/src/Kodeine/Acl/Traits/HasRole.php index <HASH>..<HASH> 100644 --- a/src/Kodeine/Acl/Traits/HasRole.php +++ b/src/Kodeine/Acl/Traits/HasRole.php @@ -1,7 +1,7 @@ <?php namespace Kodeine\Acl\Traits; -trait HasRole +trait HasRoleImplementation { use HasPermission; @@ -253,3 +253,18 @@ trait HasRole return parent::__call($method, $arguments); } } + +$laravel = app(); +if (version_compare($laravel::VERSION, '5.3', '<')) { + trait HasRole + { + use HasRoleImplementation { + hasRole as is; + } + } +} else { + trait HasRole + { + use HasRoleImplementation; + } +}
Preserved backwards compatibily for the HasRole trait without branching the codebase.
kodeine_laravel-acl
train
php
01774de7252b45d13cd6610f9a2a5f5cec30905c
diff --git a/main.go b/main.go index <HASH>..<HASH> 100644 --- a/main.go +++ b/main.go @@ -274,28 +274,28 @@ func (s *sortedIssues) Less(i, j int) bool { for _, key := range s.order { switch key { case "path": - if l.path < r.path { - return true + if l.path >= r.path { + return false } case "line": - if l.line < r.line { - return true + if l.line >= r.line { + return false } case "column": - if l.col < r.col { - return true + if l.col >= r.col { + return false } case "severity": - if l.severity < r.severity { - return true + if l.severity >= r.severity { + return false } case "message": - if l.message < r.message { - return true + if l.message >= r.message { + return false } } } - return false + return true } func maybeSortIssues(issues chan *Issue) chan *Issue {
Fix sorting. Smacks forehead.
alecthomas_gometalinter
train
go
317b26777f096ace3628fcb863ee41f86005e65c
diff --git a/jquery.maphilight.js b/jquery.maphilight.js index <HASH>..<HASH> 100755 --- a/jquery.maphilight.js +++ b/jquery.maphilight.js @@ -159,7 +159,7 @@ // jquery1.8 + ie7 var $html = $("<div>" + canvas.innerHTML + "</div>"); $html.children('[name=highlighted]').remove(); - canvas.innerHTML = $html.html(); + $(canvas).html($html.html()); }; }
Bugfix for "unknown runtime error" in IE 7/8
kemayo_maphilight
train
js
a89e36a0e73df141a486b8a151bb2cfb228a9f5d
diff --git a/lib/classes/plugin-manager.js b/lib/classes/plugin-manager.js index <HASH>..<HASH> 100644 --- a/lib/classes/plugin-manager.js +++ b/lib/classes/plugin-manager.js @@ -487,10 +487,10 @@ class PluginManager { // Invalid command, can happen only when Framework is used programmatically, // as otherwise command is validated in main script - throw new new ServerlessError( + throw new ServerlessError( `Unrecognized command "${commandsArray.join(' ')}"`, 'UNRECOGNIZED COMMAND' - )(); + ); }, { commands: this.commands } );
fix: Fix internal unrecognized command error processing
serverless_serverless
train
js
241dbcb8bb99d8c21fe65ca8e3cb232413cb6c5b
diff --git a/lib/cli.js b/lib/cli.js index <HASH>..<HASH> 100644 --- a/lib/cli.js +++ b/lib/cli.js @@ -14,7 +14,7 @@ module.exports = function (program) { } catch (e) { console.error('Something\'s wrong with the config file.'); - process.exit(1); + return; } lesshint.configure(config);
Don't exit (aborts tests), just return
lesshint_lesshint
train
js
4784775fae16f679b08de9cd0e29bd8a0f49fc28
diff --git a/spec/mashify_spec.rb b/spec/mashify_spec.rb index <HASH>..<HASH> 100644 --- a/spec/mashify_spec.rb +++ b/spec/mashify_spec.rb @@ -57,7 +57,7 @@ describe FaradayMiddleware::Mashify do me.class.should == MyMash end - it 'should allow for use of custom Mash subclasses at the instancel evel' do + it 'should allow for use of custom Mash subclasses at the instance level' do class MyMash < ::Hashie::Mash; end mashify = described_class.new(nil, mash_class: MyMash)
Fixes typo in spec description
lostisland_faraday_middleware
train
rb
c4b0e1f1d40b90c9408e4bcac50c5df363721f83
diff --git a/lib/assets/javascripts/autocomplete-rails-uncompressed.js b/lib/assets/javascripts/autocomplete-rails-uncompressed.js index <HASH>..<HASH> 100644 --- a/lib/assets/javascripts/autocomplete-rails-uncompressed.js +++ b/lib/assets/javascripts/autocomplete-rails-uncompressed.js @@ -81,7 +81,14 @@ return; } for (var key in update_elements) { - jQuery(update_elements[key]).val(ui.item ? data[key] : ""); + element = jQuery(update_elements[key]); + if (element.is(':checkbox')) { + if (data[key] != null) { + element.prop('checked', data[key]); + } + } else { + element.val(ui.item ? data[key] : ""); + } } } }, @@ -115,7 +122,14 @@ var data = jQuery(this).data(ui.item.id.toString()); var update_elements = jQuery.parseJSON(jQuery(this).attr("data-update-elements")); for (var key in update_elements) { - jQuery(update_elements[key]).val(data[key]); + element = jQuery(update_elements[key]); + if (element.is(':checkbox')) { + if (data[key] != null) { + element.prop('checked', data[key]); + } + } else { + element.val(data[key]); + } } } }
* Fixes crowdint/rails3-jquery-autocomplete#<I> Enable setting check boxes when an autocomplete entry is selected
crowdint_rails3-jquery-autocomplete
train
js
695a66f1962eb23606a80480d8bef2376dab09e7
diff --git a/core/src/main/java/jenkins/security/CallableDirectionChecker.java b/core/src/main/java/jenkins/security/CallableDirectionChecker.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/jenkins/security/CallableDirectionChecker.java +++ b/core/src/main/java/jenkins/security/CallableDirectionChecker.java @@ -120,9 +120,10 @@ public class CallableDirectionChecker extends RoleChecker { public void onChannelBuilding(ChannelBuilder builder, Object context) { // if the big red emergency button is pressed, then we need to disable the defense mechanism, // including enabling classloading. - if (BYPASS) return; - - builder.withRemoteClassLoadingAllowed(false); + if (!BYPASS && BYPASS_LOG == null) { + builder.withRemoteClassLoadingAllowed(false); + } + // In either of the above cases, the check method will return normally, but may log things. builder.withRoleChecker(new CallableDirectionChecker()); } }
1af<I>e8b7f<I>bca<I>d<I>b<I>e0fd<I>d3cb4e3 incorrectly disabled all logging. When we are allowing all callables through, we want to enable remote class loading (just in case someone is using it legitimately), but continue logging callable issues. Currently there is no remoting flag to allow remote class loading while logging it.
jenkinsci_jenkins
train
java
874bba43f8e946efa5a2737c139f3d8dcd3f8d9d
diff --git a/connection.go b/connection.go index <HASH>..<HASH> 100644 --- a/connection.go +++ b/connection.go @@ -408,7 +408,7 @@ func (cn *connection) writer(keepAliveTimeout time.Duration) { keepAliveTimer := time.NewTimer(keepAliveTimeout) for { cn.mu().Lock() - for cn.outgoingUnbufferedMessages.Len() != 0 { + for cn.outgoingUnbufferedMessages != nil && cn.outgoingUnbufferedMessages.Len() != 0 { msg := cn.outgoingUnbufferedMessages.Remove(cn.outgoingUnbufferedMessages.Front()).(pp.Message) cn.mu().Unlock() b, err := msg.MarshalBinary()
Fix crash causing deadlock in connection writer when no messages have been posted yet
anacrolix_torrent
train
go
620aebcf8bcb41d6c0f3d959f5c2f3c537efd7b1
diff --git a/spyder/utils/syntaxhighlighters.py b/spyder/utils/syntaxhighlighters.py index <HASH>..<HASH> 100644 --- a/spyder/utils/syntaxhighlighters.py +++ b/spyder/utils/syntaxhighlighters.py @@ -185,7 +185,6 @@ class BaseSH(QSyntaxHighlighter): self.setup_formats(font) self.cell_separators = None - self.request_folding = True self.editor = None self.patterns = DEFAULT_COMPILED_PATTERNS @@ -290,12 +289,6 @@ class BaseSH(QSyntaxHighlighter): :param text: text to highlight. """ self.highlight_block(text) - if self.request_folding: - if self.editor is not None: - if self.editor.folding_supported and self.editor.code_folding: - diff, _ = self.editor.text_diff - if len(diff) > 0: - self.editor.request_folding() def highlight_block(self, text): """ @@ -360,9 +353,7 @@ class BaseSH(QSyntaxHighlighter): def rehighlight(self): QApplication.setOverrideCursor(QCursor(Qt.WaitCursor)) - self.request_folding = False QSyntaxHighlighter.rehighlight(self) - self.request_folding = True QApplication.restoreOverrideCursor()
Editor: Don't request folding when highlighting blocks This is not necessary anymore.
spyder-ide_spyder
train
py
e1d0a0ada5baaa18784aede94a89510b9a547197
diff --git a/lib/Algorithm/AlgorithmMCF.php b/lib/Algorithm/AlgorithmMCF.php index <HASH>..<HASH> 100644 --- a/lib/Algorithm/AlgorithmMCF.php +++ b/lib/Algorithm/AlgorithmMCF.php @@ -7,7 +7,7 @@ abstract class AlgorithmMCF extends Algorithm { * * @var Graph */ - private $graph; + protected $graph; public function __construct(Graph $graph){ $this->graph = $graph;
change variablen visibility from private to protected
graphp_graph
train
php
5cee925a153f8050f09641e4977080d281093dd3
diff --git a/src/Dzangocart/OM/Sale.php b/src/Dzangocart/OM/Sale.php index <HASH>..<HASH> 100644 --- a/src/Dzangocart/OM/Sale.php +++ b/src/Dzangocart/OM/Sale.php @@ -130,6 +130,11 @@ class Sale extends DzangocartObject return sprintf('%s, %s', $this->data['customer']['surname'], $this->data['customer']['given_names']); } + public function getCustomerFullName() + { + return $this->data['customer']['name']; + } + public function getAffiliateId() { return $this->data['affiliate_id'];
getCustomerFullName method added
opichon_dzangocart-client
train
php
4c2724626e5e7a024d35522e321c15c99510dedb
diff --git a/includes/class-freemius.php b/includes/class-freemius.php index <HASH>..<HASH> 100644 --- a/includes/class-freemius.php +++ b/includes/class-freemius.php @@ -6305,6 +6305,9 @@ 'php_version' => phpversion(), 'language' => get_bloginfo( 'language' ), 'charset' => get_bloginfo( 'charset' ), + 'is_premium' => $this->is_premium(), + 'is_active' => true, + 'is_uninstalled' => false, ); if ( WP_FS__SKIP_EMAIL_ACTIVATION && $this->has_secret_key() ) {
[opt-in] Pass code type and the fact that the module is active on manual opt-in.
Freemius_wordpress-sdk
train
php
620157866e445411fab5388dc298de6be5924433
diff --git a/upload/catalog/controller/checkout/guest.php b/upload/catalog/controller/checkout/guest.php index <HASH>..<HASH> 100644 --- a/upload/catalog/controller/checkout/guest.php +++ b/upload/catalog/controller/checkout/guest.php @@ -326,7 +326,6 @@ class ControllerCheckoutGuest extends Controller { $this->session->data['guest']['shipping_address'] = false; } - // Default Payment Address if ($this->session->data['guest']['shipping_address']) { $this->session->data['shipping_address']['firstname'] = $this->request->post['firstname']; $this->session->data['shipping_address']['lastname'] = $this->request->post['lastname'];
[guest.php] wrong comment removed a wrong comment
opencart_opencart
train
php
240b7a81118ac99055d9311a3a0bf3ff8fddc256
diff --git a/src/you_get/extractors/youtube.py b/src/you_get/extractors/youtube.py index <HASH>..<HASH> 100644 --- a/src/you_get/extractors/youtube.py +++ b/src/you_get/extractors/youtube.py @@ -353,7 +353,10 @@ class YouTube(VideoExtractor): # Prepare caption tracks try: - caption_tracks = json.loads(ytplayer_config['args']['player_response'])['captions']['playerCaptionsTracklistRenderer']['captionTracks'] + try: + caption_tracks = json.loads(ytplayer_config['args']['player_response'])['captions']['playerCaptionsTracklistRenderer']['captionTracks'] + except: + caption_tracks = ytInitialPlayerResponse['captions']['playerCaptionsTracklistRenderer']['captionTracks'] for ct in caption_tracks: ttsurl, lang = ct['baseUrl'], ct['languageCode']
[youtube] fix extraction of caption tracks, close #<I>
soimort_you-get
train
py
7f3391665a6f6983ec439a744119124c236003a1
diff --git a/lib/togglv8/time_entries.rb b/lib/togglv8/time_entries.rb index <HASH>..<HASH> 100644 --- a/lib/togglv8/time_entries.rb +++ b/lib/togglv8/time_entries.rb @@ -38,7 +38,7 @@ module TogglV8 if !params.has_key?('wid') and !params.has_key?('pid') and !params.has_key?('tid') then raise ArgumentError, "one of params['wid'], params['pid'], params['tid'] is required" end - post "time_entries/start", {time_entry: params} + post "time_entries/start", { 'time_entry' => params } end def stop_time_entry(time_entry_id)
Make start_time_entry params hash consistent with other methods.
kanet77_togglv8
train
rb
22569179368fd93ddd8e464927cfda7a37b3cd34
diff --git a/client/allocrunner/taskrunner/task_runner.go b/client/allocrunner/taskrunner/task_runner.go index <HASH>..<HASH> 100644 --- a/client/allocrunner/taskrunner/task_runner.go +++ b/client/allocrunner/taskrunner/task_runner.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "strings" "sync" "time" @@ -277,6 +278,25 @@ func (tr *TaskRunner) initLabels() { Value: tr.taskName, }, } + + if tr.alloc.Job.ParentID != "" { + tr.baseLabels = append(tr.baseLabels, metrics.Label{ + Name: "parent_id", + Value: tr.alloc.Job.ParentID, + }) + if strings.Contains(tr.alloc.Job.Name, "/dispatch-") { + tr.baseLabels = append(tr.baseLabels, metrics.Label{ + Name: "dispatch_id", + Value: strings.Split(tr.alloc.Job.Name, "/dispatch-")[1], + }) + } + if strings.Contains(tr.alloc.Job.Name, "/periodic-") { + tr.baseLabels = append(tr.baseLabels, metrics.Label{ + Name: "periodic_id", + Value: strings.Split(tr.alloc.Job.Name, "/periodic-")[1], + }) + } + } } func (tr *TaskRunner) Run() {
Port client portion of #<I> to new taskrunner PR #<I> was merged to master *after* allocrunnerv2 was branched, so the client-specific portions must be ported from master to arv2.
hashicorp_nomad
train
go
d9cc0c08ed8a21d23c225c2bae665fc5203c2619
diff --git a/lib/OpenLayers/Control/Panel.js b/lib/OpenLayers/Control/Panel.js index <HASH>..<HASH> 100644 --- a/lib/OpenLayers/Control/Panel.js +++ b/lib/OpenLayers/Control/Panel.js @@ -169,11 +169,11 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, { */ draw: function() { OpenLayers.Control.prototype.draw.apply(this, arguments); - if (this.div.parentNode === this.map.viewPortDiv) { - this.map.events.register("buttonclick", this, this.onButtonClick); - } else { + if (this.outsideViewport) { this.events.element = this.div; this.events.register("buttonclick", this, this.onButtonClick); + } else { + this.map.events.register("buttonclick", this, this.onButtonClick); } this.addControlsToMap(this.controls); return this.div;
Check for outsideViewport - we may not have a parentNode yet.
openlayers_openlayers
train
js
504c5b183b42acff913ed3bc074791fa145abb6f
diff --git a/pyemma/_base/serialization/serialization.py b/pyemma/_base/serialization/serialization.py index <HASH>..<HASH> 100644 --- a/pyemma/_base/serialization/serialization.py +++ b/pyemma/_base/serialization/serialization.py @@ -201,9 +201,9 @@ class SerializableMixIn(object): ... self.x = x >>> inst = MyClass() - >>> with named_temporary_file() as file: - ... inst.save(file) - ... inst_restored = pyemma.load(file) + >>> with named_temporary_file() as file: # doctest: +SKIP + ... inst.save(file) # doctest: +SKIP + ... inst_restored = pyemma.load(file) # doctest: +SKIP >>> assert inst_restored.x == inst.x # doctest: +SKIP # skipped because MyClass is not importable.
disable doctest, because dynamically created classes can not be pickled.
markovmodel_PyEMMA
train
py
3e9733c608d23f0ef28cefb534ccf1c045b21595
diff --git a/src/lib/subgenerators/generate-swap-contribute/generator.js b/src/lib/subgenerators/generate-swap-contribute/generator.js index <HASH>..<HASH> 100644 --- a/src/lib/subgenerators/generate-swap-contribute/generator.js +++ b/src/lib/subgenerators/generate-swap-contribute/generator.js @@ -23,7 +23,7 @@ export default function (app) { * @name contribute * @api public */ - task(app, 'contribute', 'generate-swap-contribute/_contribute') + task(app, 'contribute', 'generate-swap-contribute/contribute.md') /** * Run the `default` task
fix typo in path of the contribute template
sirap-group_generate-swap-project
train
js
53d0a9d2c862796fea97d262c72d4e20855ee147
diff --git a/controllers/auth.php b/controllers/auth.php index <HASH>..<HASH> 100644 --- a/controllers/auth.php +++ b/controllers/auth.php @@ -122,7 +122,7 @@ class FluxBB_Auth_Controller extends Base ); $user = User::create($user_data); - return Redirect::to_action('fluxbb::user@profile', array($user->id))->with('message', __('fluxbb::register.reg_complete')); + return Redirect::to_action('fluxbb::home@index')->with('message', __('fluxbb::register.reg_complete')); } }
Redirect back to index after registering. No point to do otherwise as the user won't be logged in automatically.
fluxbb_core
train
php
813332ca391a48ab037fe2b1d3e3f1ac189a737a
diff --git a/resync/sitemap.py b/resync/sitemap.py index <HASH>..<HASH> 100644 --- a/resync/sitemap.py +++ b/resync/sitemap.py @@ -77,13 +77,13 @@ class Sitemap(object): root = Element(root_element, namespaces) if (self.pretty_xml): root.text="\n" - # <rs:md> - if (hasattr(resources,'md')): - self.add_md_to_etree(root,resources.md) # <rs:ln> if (hasattr(resources,'ln')): for ln in resources.ln: self.add_ln_to_etree(root,ln) + # <rs:md> + if (hasattr(resources,'md')): + self.add_md_to_etree(root,resources.md) # <url> entries from either an iterable or an iterator for r in resources: e=self.resource_etree_element(r, element_name=item_element)
Fix to have rs:ln elements before rs:md to match <I> spec
resync_resync
train
py
1b72d7625dfb8f17c1899a14668852ac957d2c11
diff --git a/stream-listener.js b/stream-listener.js index <HASH>..<HASH> 100644 --- a/stream-listener.js +++ b/stream-listener.js @@ -18,7 +18,7 @@ var StreamListener = function() { Events.EventEmitter.call(this); this.subscriptions = {}; - resetStream(); + this.resetStream(); } Util.inherits(StreamListener, Events.EventEmitter); @@ -95,6 +95,10 @@ StreamListener.prototype.onUnsubscribe = function(email, channel) { StreamListener.prototype.onTweet = function(tweet) { console.log(tweet.text); }; + +StreamListener.prototype.hasSubscriptions = function() { + return this.subscriptions.keys().length != 0; +}; StreamListener.prototype.isValidEmail = function(email) { try {
hasSubscriptions() did not exist
mstaessen_twailer
train
js
a57dd47c6b68e2a24d8b2f054139d4def01f76d4
diff --git a/src/Utils.php b/src/Utils.php index <HASH>..<HASH> 100644 --- a/src/Utils.php +++ b/src/Utils.php @@ -165,17 +165,7 @@ abstract class Utils */ protected static function saveXML(DOMDocument $dom) { - return preg_replace_callback( - '([\\xF0-\\xF4]...)', - function ($m) - { - $utf8 = $m[0]; - $cp = ((ord($utf8[0]) & 7) << 18) | ((ord($utf8[1]) & 63) << 12) | ((ord($utf8[2]) & 63) << 6) | (ord($utf8[3]) & 63); - - return '&#' . $cp . ';'; - }, - $dom->saveXML($dom->documentElement) - ); + return self::encodeUnicodeSupplementaryCharacters($dom->saveXML($dom->documentElement)); } /**
Utils: deduplicated code
s9e_TextFormatter
train
php
82c6eb3c969f1e1f6ad6e0b3df77ad95590a1686
diff --git a/src/Frozennode/Administrator/AdministratorServiceProvider.php b/src/Frozennode/Administrator/AdministratorServiceProvider.php index <HASH>..<HASH> 100644 --- a/src/Frozennode/Administrator/AdministratorServiceProvider.php +++ b/src/Frozennode/Administrator/AdministratorServiceProvider.php @@ -23,12 +23,6 @@ class AdministratorServiceProvider extends ServiceProvider { { $this->package('frozennode/administrator'); - //set the config items if a user has provided an application config - foreach (Config::get('administrator::administrator', array()) as $key => $option) - { - Config::set('administrator::administrator.'.$key, Config::get('administrator.'.$key, Config::get('administrator::administrator.'.$key))); - } - include __DIR__.'/../../filters.php'; include __DIR__.'/../../viewComposers.php'; include __DIR__.'/../../routes.php';
no need for this config overwrite stuff anymore
FrozenNode_Laravel-Administrator
train
php
2ed1d5c2cc639a5be51d9229a4e7358500d7acb6
diff --git a/test/utils/e2e-utils.js b/test/utils/e2e-utils.js index <HASH>..<HASH> 100644 --- a/test/utils/e2e-utils.js +++ b/test/utils/e2e-utils.js @@ -168,11 +168,6 @@ const freshModeGhostStart = async (options) => { await settingsService.init(); - // Reset the URL service generators - // @TODO: Prob B: why/how is this different to urlService.reset? - // @TODO: why would we do this on a fresh boot?! - urlService.resetGenerators(); - // Actually boot Ghost await bootGhost(options); @@ -239,6 +234,9 @@ const stopGhost = async () => { if (ghostServer && ghostServer.httpServer) { await ghostServer.stop(); delete require.cache[require.resolve('../../core/app')]; + // NOTE: similarly to urlService.reset() there doesn't seem to be a need for this call + // probable best location for this type of cleanup if it's needed is registering + // a hood during the "server cleanup" phase of the server stop urlService.resetGenerators(); } };
Removed unnecessary resetGenerators call no issue - This extra call doesn't seem to be necessary during a fresh boot. It only adds noise in code!
TryGhost_Ghost
train
js
16eaf7ed3519b3263f1a5066da465cbe56ab078f
diff --git a/lib/filterlib.php b/lib/filterlib.php index <HASH>..<HASH> 100644 --- a/lib/filterlib.php +++ b/lib/filterlib.php @@ -631,8 +631,7 @@ function filter_get_active_in_context($context) { GROUP BY filter HAVING MAX(f.active * ctx.depth) > -MIN(f.active * ctx.depth) ORDER BY MAX(f.sortorder)) active - LEFT JOIN {filter_config} fc ON fc.filter = active.filter - WHERE fc.contextid = $context->id OR fc.contextid IS NULL"); + LEFT JOIN {filter_config} fc ON fc.filter = active.filter AND fc.contextid = $context->id"); // Masssage the data into the specified format to return. $filters = array();
filters: MDL-<I> tweak to improve SQL performance
moodle_moodle
train
php
deaac49a77fe45f65165415705cd0dca6240905c
diff --git a/src/java/com/threerings/gwt/ui/Widgets.java b/src/java/com/threerings/gwt/ui/Widgets.java index <HASH>..<HASH> 100644 --- a/src/java/com/threerings/gwt/ui/Widgets.java +++ b/src/java/com/threerings/gwt/ui/Widgets.java @@ -309,9 +309,10 @@ public class Widgets * Creates a PushButton with default(up), mouseover and mousedown states. */ public static PushButton newPushButton (Image defaultImage, Image overImage, - Image downImage, ClickHandler onClick) + Image downImage, ClickHandler onClick) { - PushButton button = new PushButton(defaultImage, downImage, onClick); + PushButton button = new PushButton(defaultImage, downImage); + maybeAddClickHandler(button, onClick); button.getUpHoveringFace().setImage(overImage); return button; }
Don't require a click handler for our button.
threerings_gwt-utils
train
java
b4c92fb75b18d2e3037f9fe4e6585d72c540b713
diff --git a/course/format/singleactivity/lib.php b/course/format/singleactivity/lib.php index <HASH>..<HASH> 100644 --- a/course/format/singleactivity/lib.php +++ b/course/format/singleactivity/lib.php @@ -181,7 +181,7 @@ class format_singleactivity extends format_base { ), ); - if (!isset($availabletypes[$config->activitytype])) { + if (!empty($availabletypes) && !isset($availabletypes[$config->activitytype])) { $courseformatoptions['activitytype']['default'] = array_keys($availabletypes)[0]; } }
MDL-<I> format_singleactivity: Make sure available types is not empty
moodle_moodle
train
php
9fc3057c8c2e08c5a4ff611fc4c4fccd4201c306
diff --git a/dhooks/client.py b/dhooks/client.py index <HASH>..<HASH> 100644 --- a/dhooks/client.py +++ b/dhooks/client.py @@ -21,7 +21,7 @@ class Webhook: self.avatar_url = options.get('avatar_url') def close(self): - self.session.close() + return self.session.close() def send(self, content: str = None, embeds: list or Embed = [], tts: bool = False) -> bool: '''Sends a message to the payload url'''
Fix session closing for async mode
kyb3r_dhooks
train
py
a01e28f8a50891c92864c03326b27f44c89ec09e
diff --git a/message.go b/message.go index <HASH>..<HASH> 100644 --- a/message.go +++ b/message.go @@ -22,6 +22,13 @@ const ( // FlagNoAutoStart signals that the message bus should not automatically // start an application when handling this message. FlagNoAutoStart + // FlagAllowInteractiveAuthorization may be set on a method call + // message to inform the receiving side that the caller is prepared + // to wait for interactive authorization, which might take a + // considerable time to complete. For instance, if this flag is set, + // it would be appropriate to query the user for passwords or + // confirmation via Polkit or a similar framework. + FlagAllowInteractiveAuthorization ) // Type represents the possible types of a D-Bus message. @@ -248,7 +255,7 @@ func (msg *Message) EncodeTo(out io.Writer, order binary.ByteOrder) error { // IsValid checks whether msg is a valid message and returns an // InvalidMessageError if it is not. func (msg *Message) IsValid() error { - if msg.Flags & ^(FlagNoAutoStart|FlagNoReplyExpected) != 0 { + if msg.Flags & ^(FlagNoAutoStart|FlagNoReplyExpected|FlagAllowInteractiveAuthorization) != 0 { return InvalidMessageError("invalid flags") } if msg.Type == 0 || msg.Type >= typeMax {
Add support for the ALLOW_INTERACTIVE_AUTHORIZATION flag This adds support for the ALLOW_INTERACTIVE_AUTHORIZATION flag in the message parser. It doesn't do anything else with this flag but prevents failures from clients passing this option. Fixes #<I>
godbus_dbus
train
go
2a7fe45b22a4914b2db2b890657c2f5bcaef6b7e
diff --git a/DataPanel.py b/DataPanel.py index <HASH>..<HASH> 100644 --- a/DataPanel.py +++ b/DataPanel.py @@ -574,10 +574,8 @@ class DataPanel(Panel.Panel): items_per_row = 4 item_width = int(canvas_bounds.width / items_per_row) - item_rows = int(canvas_bounds.height / item_width) + 1 drawing_context.save() - try: max_index = len(self.__delegate.data_items) top_visible_row = visible_rect.top / item_width
Removed unused calculation/variable. svn r<I>
nion-software_nionswift
train
py
fa864331428595f6d43232c3c2043e626b79aa7b
diff --git a/callback_query.go b/callback_query.go index <HASH>..<HASH> 100644 --- a/callback_query.go +++ b/callback_query.go @@ -30,7 +30,7 @@ func Query(scope *Scope) { if kind := dest.Kind(); kind == reflect.Slice { isSlice = true destType = dest.Type().Elem() - dest.Set(reflect.Indirect(reflect.New(reflect.SliceOf(destType)))) + dest.Set(reflect.MakeSlice(dest.Type(), 0, 0)) if destType.Kind() == reflect.Ptr { isPtr = true
Overwrite initiliazed slices as empty slices
jinzhu_gorm
train
go
94cc60710dd81cc320c73d4c16bce441d982e615
diff --git a/classes/Gems/Default/RespondentExportAction.php b/classes/Gems/Default/RespondentExportAction.php index <HASH>..<HASH> 100644 --- a/classes/Gems/Default/RespondentExportAction.php +++ b/classes/Gems/Default/RespondentExportAction.php @@ -45,8 +45,11 @@ class Gems_Default_RespondentExportAction extends \Gems_Controller_Action if ($request->isPost()) { $respondents = preg_split('/[\s,;]+/', $request->getParam('id'), -1, PREG_SPLIT_NO_EMPTY); - - $export->render($respondents, $request->getParam('group'), $request->getParam('format')); + if (count($respondents)>0) { + $export->render($respondents, $request->getParam('group'), $request->getParam('format')); + } else { + $this->addMessage($this->_('Please select at least one respondent')); + } } } } \ No newline at end of file
Prevented error by not submitting any respondent number
GemsTracker_gemstracker-library
train
php
e1c84482303dafe8f5b136a3a20d365e9b46776f
diff --git a/bokeh/plotting.py b/bokeh/plotting.py index <HASH>..<HASH> 100644 --- a/bokeh/plotting.py +++ b/bokeh/plotting.py @@ -766,6 +766,11 @@ def scatter(*args, **kwargs): markertype = kwargs.get("type", "circle") x_name = names[0] + # TODO this won't be necessary when markers are made uniform + if markertype == "circle": + if "radius" not in kwargs: + kwargs["radius"] = kwargs.get("size")/2 + # TODO: How to handle this? Just call curplot()? if not len(color_fields.intersection(set(kwargs.keys()))): kwargs['color'] = get_default_color()
adapt size argmuent to circle scatter
bokeh_bokeh
train
py
f8c3cd669da9a7fe127245b4e606296192c208b0
diff --git a/GPy/examples/dimensionality_reduction.py b/GPy/examples/dimensionality_reduction.py index <HASH>..<HASH> 100644 --- a/GPy/examples/dimensionality_reduction.py +++ b/GPy/examples/dimensionality_reduction.py @@ -207,7 +207,7 @@ def bgplvm_simulation(burnin='scg', plot_sim=False, # cstr = 'X_variance' # m.unconstrain(cstr), m.constrain_bounded(cstr, 1e-3, 1.) - m.set('X_var', np.ones(N * Q) * .5 + np.random.randn(N * Q) * .01) + m['X_var'] = np.ones(N * Q) * .5 + np.random.randn(N * Q) * .01 # cstr = "iip" # m.unconstrain(cstr); m.constrain_fixed(cstr)
rewritten dim_reduction demo to match new style of getters and setters
SheffieldML_GPy
train
py
dbb7406e4ed56faa55a80857a0abd7bd997b3036
diff --git a/rules/order-in-components.js b/rules/order-in-components.js index <HASH>..<HASH> 100644 --- a/rules/order-in-components.js +++ b/rules/order-in-components.js @@ -35,6 +35,10 @@ module.exports = function(context) { return property.key.name === 'actions' && utils.isObjectExpression(property.value); }; + var isCustomFunction = function(property) { + return utils.isFunctionExpression(property.value); + }; + var getOrderValue = function(property) { var val = null; @@ -46,10 +50,12 @@ module.exports = function(context) { val = 30; } else if (isActionsProp(property)) { val = 40; + } else if (isCustomFunction(property)) { + val = 50; } return val; - } + }; var findUnorderedProperty = function(arr) { var len = arr.length - 1;
add custom functions to order-in-components rule
ember-cli_eslint-plugin-ember
train
js
c9b1b55bf88bf3aabeb3566be596e507efdb227a
diff --git a/lib/Wrapper.js b/lib/Wrapper.js index <HASH>..<HASH> 100644 --- a/lib/Wrapper.js +++ b/lib/Wrapper.js @@ -180,7 +180,7 @@ Wrapper.prototype.getCompiler = function getCompiler(cb) { }.bind(this)); } - if (this.opts.watch && this.opts.hmrRoot) { + if (this.opts.watch && this.opts.hmr && this.opts.hmrRoot) { hmr.bindCompiler(compiler, this.opts); }
Bug fix for an uncaught exception triggered by certain option combinations
markfinger_webpack-build
train
js
85692a6481cc11010141470e1c8d7fce250d127e
diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/LongTaskTimer.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/LongTaskTimer.java index <HASH>..<HASH> 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/LongTaskTimer.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/LongTaskTimer.java @@ -66,6 +66,7 @@ public interface LongTaskTimer extends Meter, HistogramSupport { * @return The return value of {@code f}. * @throws Exception Any exception bubbling up from the callable. */ + @Nullable default <T> T recordCallable(Callable<T> f) throws Exception { Sample sample = start(); try { @@ -82,6 +83,7 @@ public interface LongTaskTimer extends Meter, HistogramSupport { * @param <T> The return type of the {@link Supplier}. * @return The return value of {@code f}. */ + @Nullable default <T> T record(Supplier<T> f) { Sample sample = start(); try {
Mark supplier/callable record methods return value as nullable This was missed originally, but the return value is nullable and should be marked as such. Resolves gh-<I>
micrometer-metrics_micrometer
train
java
f352789b90882e4aad043456bdd67f5cb5b30e51
diff --git a/lib/parse/client.rb b/lib/parse/client.rb index <HASH>..<HASH> 100644 --- a/lib/parse/client.rb +++ b/lib/parse/client.rb @@ -186,10 +186,10 @@ module Parse if body.error? if body.code <= 100 puts "[ParseError] #{body}" - raise Parse::ServerError + raise Parse::ServerError, body elsif body.code == 155 puts "[ParseError] #{body}" - raise Parse::RequestLimitExceededError + raise Parse::RequestLimitExceededError, body end end
Return the body in additional exceptions.
modernistik_parse-stack
train
rb
e3cefd27c63c7c0902fcdd7165fe50a917f024f9
diff --git a/stagpy/stagyydata.py b/stagpy/stagyydata.py index <HASH>..<HASH> 100644 --- a/stagpy/stagyydata.py +++ b/stagpy/stagyydata.py @@ -453,7 +453,7 @@ class _EmptyStep(_Step): return False -class _Steps(Mapping): +class _Steps: """Collections of time steps.
_Steps no longer inherits Mapping The mixin methods offered by the Mapping interface aren't relevant to _Steps instances.
StagPython_StagPy
train
py
33682fcc51433a7660e107b7455d4885286c3b01
diff --git a/boot/logger.js b/boot/logger.js index <HASH>..<HASH> 100644 --- a/boot/logger.js +++ b/boot/logger.js @@ -53,7 +53,7 @@ function errorLogging () { module.exports = function (options) { var logger - var config = { name: 'request', streams: [], level: 'error' } + var config = { name: 'request', streams: [], level: 'info' } if (!env.match(/test/i)) { var logsPath = path.join(cwd, 'logs')
refactor(logger): default level is now at info level, matching bunyan's default
anvilresearch_connect
train
js
3a6ae80564aa6950799d4544d4050f6a9e2eee9e
diff --git a/src/Glyph.js b/src/Glyph.js index <HASH>..<HASH> 100644 --- a/src/Glyph.js +++ b/src/Glyph.js @@ -25,8 +25,10 @@ function Glyph( args ) { // each individual glyph must be explicitely made visible this.visible = false; - // required to display the glyph properly in a canvas - this.fillColor = this.strokeColor = new paper.Color(0, 0, 0); + // default colors required to display the glyph in a canvas + this.fillColor = new paper.Color(0, 0, 0); + // stroke won't be displayed unless strokeWidth is set to 1 + this.strokeColor = new paper.Color(0, 0, 0); this.strokeScaling = false; }
Set the stroke color to black by default
byte-foundry_plumin.js
train
js
4664df0820c9901e84f4b82d4371af9f574a8184
diff --git a/src/Model/User.php b/src/Model/User.php index <HASH>..<HASH> 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -1148,7 +1148,7 @@ class User extends Base // If the user's password was updated send them a notification if ($bPasswordUpdated) { - $oEmailer = Factory::service('Emailer'); + $oEmailer = Factory::service('Emailer', 'nailsapp/module-email'); $oEmail = new \stdClass(); $oEmail->type = 'password_updated'; @@ -1511,7 +1511,7 @@ class User extends Base // -------------------------------------------------------------------------- - $oEmailer = Factory::service('Emailer'); + $oEmailer = Factory::service('Emailer', 'nailsapp/module-email'); $oEmail = new \stdClass(); $oEmail->type = 'verify_email_' . $oEmailRow->group_id; $oEmail->to_id = $oEmailRow->user_id; @@ -2172,7 +2172,7 @@ class User extends Base // Send the user the welcome email if ($sendWelcome) { - $oEmailer = Factory::service('Emailer'); + $oEmailer = Factory::service('Emailer', 'nailsapp/module-email'); $oEmail = new \stdClass(); $oEmail->type = 'new_user_' . $oGroup->id; $oEmail->to_id = $iId;
Corrected badly loaded Emailer library
nails_module-auth
train
php
91393a525cdf17f49cda5e8ccde772bc7a842b4e
diff --git a/test/unexpectedMitm.js b/test/unexpectedMitm.js index <HASH>..<HASH> 100644 --- a/test/unexpectedMitm.js +++ b/test/unexpectedMitm.js @@ -1780,6 +1780,21 @@ describe('unexpectedMitm', function () { ] ); }); + + it('should output response headers preserving their original case', function () { + return expect('GET /', 'with http mocked out with extra info', { + response: { + statusCode: 200, + headers: { + 'X-Is-Test': 'yes' + } + } + }, 'to yield response', 200).spread(function (fulfilmentValue, httpConversation) { + var httpResponse = httpConversation.exchanges[0].response; + + expect(httpResponse.headers.getNames(), 'to contain', 'X-Is-Test'); + }); + }); }); it('should preserve the fulfilment value of the promise returned by the assertion being delegated to', function () {
Add test asserting the preservation of the original casing of headers.
unexpectedjs_unexpected-mitm
train
js
8f41523452e0845304415bf32c98990e47d96d9c
diff --git a/src/Controller/Api/AppController.php b/src/Controller/Api/AppController.php index <HASH>..<HASH> 100644 --- a/src/Controller/Api/AppController.php +++ b/src/Controller/Api/AppController.php @@ -21,16 +21,6 @@ class AppController extends Controller use ControllerTrait; use PanelUtilTrait; - /** - * Include menus identifier - */ - const FLAG_INCLUDE_MENUS = 'menus'; - - /** - * Property name for menu items - */ - const MENU_PROPERTY_NAME = '_Menus'; - public $components = [ 'RequestHandler', 'Crud.Crud' => [
Removing obsolete constants (task #<I>)
QoboLtd_cakephp-csv-migrations
train
php
50187fa5b7438afaa97a05e53e642527ed393ac8
diff --git a/src/pycdlib/utils.py b/src/pycdlib/utils.py index <HASH>..<HASH> 100644 --- a/src/pycdlib/utils.py +++ b/src/pycdlib/utils.py @@ -20,10 +20,14 @@ Various utilities for PyIso. import socket +use_sendfile = True try: from sendfile import sendfile except ImportError: - from os import sendfile + try: + from os import sendfile + except ImportError: + use_sendfile = False import pycdlibexception @@ -90,7 +94,7 @@ def copy_data(data_length, blocksize, infp, outfp): Returns: Nothing. ''' - if hasattr(infp, 'fileno') and hasattr(outfp, 'fileno'): + if use_sendfile and hasattr(infp, 'fileno') and hasattr(outfp, 'fileno'): # This is one of those instances where using the file object and the # file descriptor causes problems. The sendfile() call actually updates # the underlying file descriptor, but the file object does not know
Allow usage of pycdlib without sendfile installed.
clalancette_pycdlib
train
py
f0080de0fd444100099ed023d07ededb36b498bc
diff --git a/easy_thumbnails/files.py b/easy_thumbnails/files.py index <HASH>..<HASH> 100644 --- a/easy_thumbnails/files.py +++ b/easy_thumbnails/files.py @@ -83,7 +83,11 @@ class ThumbnailFile(ImageFieldFile): """ if not hasattr(self, '_image_cache'): + was_closed = self.closed + self.open() self.image = Image.open(self) + if was_closed: + self.close() return self._image_cache def _set_image(self, image): @@ -271,12 +275,16 @@ class Thumbnailer(File): def _image(self): if not hasattr(self, '_cached_image'): + was_closed = self.closed + self.open() # TODO: Use different methods of generating the file, rather than # just relying on PIL. self._cached_image = Image.open(self) # Image.open() is a lazy operation, so force the load so we # can close this file again if appropriate. self._cached_image.load() + if was_closed: + self.close() return self._cached_image image = property(_image)
Ensure the underlying file is open before attempting to read it.
SmileyChris_easy-thumbnails
train
py
d45cf2e5f42c46aefdea907d017ef10cd7dea072
diff --git a/lib/uirusu.rb b/lib/uirusu.rb index <HASH>..<HASH> 100644 --- a/lib/uirusu.rb +++ b/lib/uirusu.rb @@ -31,6 +31,7 @@ module Uirusu VERSION = "0.0.5" CONFIG_FILE = "~/.uirusu" VT_API = "https://www.virustotal.com/vtapi/v2" + RESULT_FIELDS = [ :hash, :scanner, :version, :detected, :result, :md5, :sha1, :sha256, :update, :permalink, ] end require 'json'
Maybe this time I'll actually have RESULT_FIELDS in the file.
hammackj_uirusu
train
rb
ee0e332776d9002bea07d328d49e90ed8c221795
diff --git a/kubernetes/client/models/v1_projected_volume_source.py b/kubernetes/client/models/v1_projected_volume_source.py index <HASH>..<HASH> 100644 --- a/kubernetes/client/models/v1_projected_volume_source.py +++ b/kubernetes/client/models/v1_projected_volume_source.py @@ -99,9 +99,6 @@ class V1ProjectedVolumeSource(object): :param sources: The sources of this V1ProjectedVolumeSource. # noqa: E501 :type: list[V1VolumeProjection] """ - if self.local_vars_configuration.client_side_validation and sources is None: # noqa: E501 - raise ValueError("Invalid value for `sources`, must not be `None`") # noqa: E501 - self._sources = sources def to_dict(self):
tolerate null sources on projected volumes See issue <I> Removes the false requirement that sources be a populated list
kubernetes-client_python
train
py
cde0972384fed5d6f724fd378d74447ee83e4b52
diff --git a/holoviews/core/spaces.py b/holoviews/core/spaces.py index <HASH>..<HASH> 100644 --- a/holoviews/core/spaces.py +++ b/holoviews/core/spaces.py @@ -808,13 +808,13 @@ class DynamicMap(HoloMap): """ Collation allows collapsing DynamicMaps with invalid nesting hierarchies. This is particularly useful when defining - DynamicMaps returning an (Nd)Layout. Collating will split the - DynamicMap into an (Nd)Layout of individual DynamicMaps. Note - that the Layout should be of consistent length and types for - this to work correctly. In order to attach a stream as a source - for a particular object in the Layout you may supply either - a dictionary or list of lists of streams corresponding to each - Element in the Layout. + DynamicMaps returning an (Nd)Layout or GridSpace + type. Collating will split the DynamicMap into of individual + DynamicMaps. Note that the composite object has to be of + consistent length and types for this to work + correctly. Associating streams with specific viewables in the + returned container declare a stream_mapping on the DynamicMap + Callable during instantiation. """ # Initialize if self.last is not None:
Updated DynamicMap.collate docstring
pyviz_holoviews
train
py
2dd104db01dba335ad92faa9b55768bc76a6911f
diff --git a/gwpy/timeseries/core.py b/gwpy/timeseries/core.py index <HASH>..<HASH> 100644 --- a/gwpy/timeseries/core.py +++ b/gwpy/timeseries/core.py @@ -790,6 +790,14 @@ class TimeSeriesBase(Series): out.name = '{0!s} {1!s} {2!s}'.format(oname, op_, vname) return out + # Quantity overrides __eq__ and __ne__ in a way that doesn't work for us, + # so we just undo that + def __eq__(self, other): + return numpy.ndarray.__eq__(self, other) + + def __ne__(self, other): + return numpy.ndarray.__ne__(self, other) + # -- TimeSeriesBaseDict -------------------------------------------------------
gwpy.timeseries: overwrite equality operators astropy overwrites them in a way that breaks the statetimeseries functionality, so we undo that
gwpy_gwpy
train
py
3f1464664027607fbff283c9115faeba91699828
diff --git a/public_html/profiles/social/modules/contrib/profile/src/ProfileHtmlRouteProvider.php b/public_html/profiles/social/modules/contrib/profile/src/ProfileHtmlRouteProvider.php index <HASH>..<HASH> 100644 --- a/public_html/profiles/social/modules/contrib/profile/src/ProfileHtmlRouteProvider.php +++ b/public_html/profiles/social/modules/contrib/profile/src/ProfileHtmlRouteProvider.php @@ -28,7 +28,8 @@ class ProfileHtmlRouteProvider extends DefaultHtmlRouteProvider { $route = (new Route( "/user/{user}/{profile_type}", ['_controller' => '\Drupal\profile\Controller\ProfileController::userProfileForm', - '_title_callback' => '\Drupal\profile\Controller\ProfileController::addPageTitle' + '_title_callback' => '\Drupal\profile\Controller\ProfileController::addPageTitle', + ], ['_profile_access_check' => 'add'], [ 'parameters' => [
DS-<I> by ronaldtebrake: faulty patched
goalgorilla_open_social
train
php
c0185d583d29be36416976a6843848cf9846e8cd
diff --git a/src/array/update.js b/src/array/update.js index <HASH>..<HASH> 100644 --- a/src/array/update.js +++ b/src/array/update.js @@ -4,8 +4,12 @@ //------------------------------------------------------------------------------ d3plus.array.update = function( arr , x ) { + if ( !(arr instanceof Array) ) { + var arr = [] + } + // If the user has passed an array, just use that. - if(x instanceof Array){ + if( x instanceof Array ){ arr = x; } // Otherwise remove it if it is present.
array update function now has a catch for undefined arrays
alexandersimoes_d3plus
train
js
71dae2c8a612da546a7b8f2193ecb2fa60a7cbb9
diff --git a/lib/fwapi.js b/lib/fwapi.js index <HASH>..<HASH> 100644 --- a/lib/fwapi.js +++ b/lib/fwapi.js @@ -109,5 +109,29 @@ FWAPI.prototype.deleteRule = function (uuid, params, callback) { }; +/** + * Gets VMs affected by a rule. + * + * @param {String} uuid : the rule UUID. + * @param {Function} callback : of the form f(err, res). + */ +FWAPI.prototype.getRuleVMs = function (uuid, params, callback) { + assert.string(uuid, 'uuid'); + return this.get(format('/rules/%s/vms', uuid), params, callback); +}; + + +/** + * Gets rules affecting a VM. + * + * @param {String} uuid : the rule UUID. + * @param {Function} callback : of the form f(err, res). + */ +FWAPI.prototype.getVMrules = function (uuid, params, callback) { + assert.string(uuid, 'uuid'); + return this.get(format('/firewalls/vms/%s', uuid), params, callback); +}; + + module.exports = FWAPI;
FWAPI-<I>: /rules/:uuid/vms endpoint for finding affected VMs
joyent_node-sdc-clients
train
js
8097e87abc4b17acc66fbc37c44e818c8c4f11bd
diff --git a/spec/support/database_helper.rb b/spec/support/database_helper.rb index <HASH>..<HASH> 100644 --- a/spec/support/database_helper.rb +++ b/spec/support/database_helper.rb @@ -17,7 +17,7 @@ module DatabaseHelper require "sqlite3" end - path = Tempfile.new("baza_test").path + path = Tempfile.new(["baza_test", ".sqlite3"]).path File.unlink(path) if File.exists?(path) @db = Baza::Db.new(type: :sqlite3, path: path, index_append_table_name: true, debug: false) @@ -90,7 +90,7 @@ module DatabaseHelper @db.close path = db.args[:path] - File.unlink(path) + File.unlink(path) if File.exists?(path) Thread.current[:baza] = nil @db = nil end
Only remove file if test didn't already. Ensure correct extension on temp db
kaspernj_baza_models
train
rb
d694c60501e9a5e7886b91ffd4d0c210814b68d4
diff --git a/spec/unit/object_properties_spec.rb b/spec/unit/object_properties_spec.rb index <HASH>..<HASH> 100644 --- a/spec/unit/object_properties_spec.rb +++ b/spec/unit/object_properties_spec.rb @@ -144,7 +144,7 @@ describe RestfulObjects::ObjectProperties do @object.bool_prop.should eq true @object.decimal_prop.should eq 333.33 @object.date_prop.should eq Date.new(2012, 2, 29) - @object.blob_prop.should eq "\xE5\xA5\xB4\x30\xF2\x8C\x71\xD9" + @object.blob_prop.should eq "\xE5\xA5\xB4\x30\xF2\x8C\x71\xD9".force_encoding('ASCII-8BIT') end it 'should process a property put with json' do
fixed test with encoding problem for ruby <I>
vizcay_RestfulObjectsRuby
train
rb
2377e4b8a2dcf3f67408b1517ad3dc97e2bac42a
diff --git a/lib/sinon-doublist-fs/index.js b/lib/sinon-doublist-fs/index.js index <HASH>..<HASH> 100644 --- a/lib/sinon-doublist-fs/index.js +++ b/lib/sinon-doublist-fs/index.js @@ -45,6 +45,8 @@ function sinonDoublistFs(test) { nodeConsole = requireNative('codeactual-node-console').create(); log = nodeConsole.set('time', false).set('traceDepth', true).create(null, console.log); nodeConsole.traceMethods('FileStub', FileStub.prototype, log, null, /^(get|set)$/); + nodeConsole.traceMethods('customFsStub', customFsStub, log); + nodeConsole.traceMethods('mixin', mixin, log); } else { log = function() {}; }
fix(tracing): Wrap customFsStub, mixin methods
codeactual_sinon-doublist-fs
train
js
d8a3fe3cba00f406ef9048b7846b346519903850
diff --git a/sark/code/function.py b/sark/code/function.py index <HASH>..<HASH> 100644 --- a/sark/code/function.py +++ b/sark/code/function.py @@ -84,6 +84,9 @@ class Function(object): raise ValueError("`None` is not a valid address. To use the current screen ea, " "use `Function(ea=Function.UseCurrentAddress)` or supply no `ea`.") + elif isinstance(ea, Line): + ea = ea.ea + self._func = get_func(ea) self._comments = Comments(self)
Function objects can now be created from line objects. Closes #<I>.
tmr232_Sark
train
py
dac4e0cb853b826cdded3f7b29eed403a4c86f9d
diff --git a/coconut/constants.py b/coconut/constants.py index <HASH>..<HASH> 100644 --- a/coconut/constants.py +++ b/coconut/constants.py @@ -115,7 +115,7 @@ all_reqs = { min_versions = { "pyparsing": (2, 2, 0), "cPyparsing": (2, 2, 0, 1, 1), - "pre-commit": (0, 15, 0), + "pre-commit": (0, 15, 2), "sphinx": (1, 6), "pygments": (2, 2), "recommonmark": (0, 4), @@ -140,7 +140,6 @@ version_strictly = [ "sphinx_bootstrap_theme", "ipython", "ipykernel", - "pre-commit", ] classifiers = [
Switch to new pre-commit version
evhub_coconut
train
py
e8f6318496ae8fa325a276d666e5c6e17c63763f
diff --git a/dashbuilder-backend/dashbuilder-dataset-core/src/main/java/org/dashbuilder/dataprovider/StaticDataSetProvider.java b/dashbuilder-backend/dashbuilder-dataset-core/src/main/java/org/dashbuilder/dataprovider/StaticDataSetProvider.java index <HASH>..<HASH> 100644 --- a/dashbuilder-backend/dashbuilder-dataset-core/src/main/java/org/dashbuilder/dataprovider/StaticDataSetProvider.java +++ b/dashbuilder-backend/dashbuilder-dataset-core/src/main/java/org/dashbuilder/dataprovider/StaticDataSetProvider.java @@ -38,6 +38,9 @@ public class StaticDataSetProvider implements DataSetProvider { private SharedDataSetOpEngine dataSetOpEngine; + public StaticDataSetProvider() { + } + public StaticDataSetProvider(SharedDataSetOpEngine dataSetOpEngine) { this.dataSetOpEngine = dataSetOpEngine; }
Add missing non-args constructor (required by some CDI impls)
dashbuilder_dashbuilder
train
java
aaf865edb5a10a4a5909100d4136b97c04c258f0
diff --git a/command/stack/deploy_bundlefile.go b/command/stack/deploy_bundlefile.go index <HASH>..<HASH> 100644 --- a/command/stack/deploy_bundlefile.go +++ b/command/stack/deploy_bundlefile.go @@ -54,7 +54,7 @@ func deployBundle(ctx context.Context, dockerCli *command.DockerCli, opts deploy for _, networkName := range service.Networks { nets = append(nets, swarm.NetworkAttachmentConfig{ Target: namespace.Scope(networkName), - Aliases: []string{networkName}, + Aliases: []string{internalName}, }) }
Set the alias to the service name instead of the network name This makes it work a little closer to compose part and it is more correct 👼
docker_cli
train
go
8448f03b45175092bcbc5173c9ba4ec05ed9f5ff
diff --git a/lib/ProMotion/screen/screen_module.rb b/lib/ProMotion/screen/screen_module.rb index <HASH>..<HASH> 100644 --- a/lib/ProMotion/screen/screen_module.rb +++ b/lib/ProMotion/screen/screen_module.rb @@ -5,7 +5,7 @@ module ProMotion include ProMotion::Styling include ProMotion::NavBarModule include ProMotion::Tabs - include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad + include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad || (UIDevice.currentDevice.systemVersion.to_i >= 8 ) attr_accessor :parent_screen, :first_screen, :modal, :split_screen
Fixed another location where `ProMotion::SplitScreen` should be included on iPhones with iOS 8.
infinitered_ProMotion
train
rb
38946a54520d327e213d26af9ceeb749b67a4ed5
diff --git a/asciimatics/widgets/layout.py b/asciimatics/widgets/layout.py index <HASH>..<HASH> 100644 --- a/asciimatics/widgets/layout.py +++ b/asciimatics/widgets/layout.py @@ -108,6 +108,8 @@ class Layout(object): if widget.name in self._frame.data: widget.value = self._frame.data[widget.name] + return widget + def clear_widgets(self): """ Clear all widgets from this Layout.
Add "return widget" to Layout's add_widget() method to make chaining easier
peterbrittain_asciimatics
train
py
cfb75d1063a8faa5a432d77f64cc5020a5f7e845
diff --git a/platform/nativescript/backend.js b/platform/nativescript/backend.js index <HASH>..<HASH> 100644 --- a/platform/nativescript/backend.js +++ b/platform/nativescript/backend.js @@ -97,6 +97,10 @@ exports.init = function(ctx) { page = nativeContext ctx.element = new Element(ctx, parentLayout) + + log('page size: ', page.getMeasuredWidth(), 'x', page.getMeasuredHeight()) + context.width = page.getMeasuredWidth() + context.height = page.getMeasuredHeight() } @@ -105,9 +109,6 @@ exports.run = function(ctx, callback) { } exports.finalize = function() { - log('page size: ', page.getMeasuredWidth(), 'x', page.getMeasuredHeight()) - context.width = page.getMeasuredWidth() - context.height = page.getMeasuredHeight() finalization_callback() finalization_callback = null }
moved page initialisation stuff into .init() again
pureqml_qmlcore
train
js
a2c14938ec473ad3549f6561822b5946a6e91833
diff --git a/internal/qtls/go117.go b/internal/qtls/go117.go index <HASH>..<HASH> 100644 --- a/internal/qtls/go117.go +++ b/internal/qtls/go117.go @@ -93,7 +93,7 @@ type cipherSuiteTLS13 struct { Hash crypto.Hash } -//go:linkname cipherSuiteTLS13ByID github.com/marten-seemann/qtls-go1-16.cipherSuiteTLS13ByID +//go:linkname cipherSuiteTLS13ByID github.com/marten-seemann/qtls-go1-17.cipherSuiteTLS13ByID func cipherSuiteTLS13ByID(id uint16) *cipherSuiteTLS13 // CipherSuiteTLS13ByID gets a TLS 1.3 cipher suite.
fix relocation target for cipherSuiteTLS<I>ByID in Go <I>
lucas-clemente_quic-go
train
go
138bdb8573688aa9ca7e3369e3e5fe0b79f9ec97
diff --git a/server.js b/server.js index <HASH>..<HASH> 100644 --- a/server.js +++ b/server.js @@ -36,9 +36,6 @@ function Server (opts) { EventEmitter.call(self) opts = opts || {} - if (opts.http === false && opts.udp === false) - throw new Error('must start at least one type of server (http or udp)') - self._intervalMs = opts.interval ? opts.interval : 10 * 60 * 1000 // 10 min
server: rm check for http/udp option my use-case brings its own http server, i just use onHttpRequest()
webtorrent_bittorrent-tracker
train
js
655b525a4de17850988a67f50bec331da7c2acbe
diff --git a/src/SupervisorOptions.php b/src/SupervisorOptions.php index <HASH>..<HASH> 100644 --- a/src/SupervisorOptions.php +++ b/src/SupervisorOptions.php @@ -137,7 +137,6 @@ class SupervisorOptions */ public $force; - /** * Create a new worker options instance. *
Apply fixes from StyleCI (#<I>)
laravel_horizon
train
php
4717afac46f159c0254fb1eeb887428512cb18fd
diff --git a/lib/utils.js b/lib/utils.js index <HASH>..<HASH> 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -157,7 +157,7 @@ DomUtils.removeElement = function(elem){ if(elem.next) elem.next.prev = elem.prev; if(elem.parent){ - elem.parent.children.splice(elem.parent.children.indexOf(elem), 1); + elem.parent.children.splice(elem.parent.children.lastIndexOf(elem), 1); } };
call Array#lastIndexOf in .removeElement leads to a speedup in `cornet` and doesn't hurt performance elsewhere
fb55_domhandler
train
js
266415f660585e55da6238cb3f8010826921978b
diff --git a/openquake/risklib/riskmodels.py b/openquake/risklib/riskmodels.py index <HASH>..<HASH> 100644 --- a/openquake/risklib/riskmodels.py +++ b/openquake/risklib/riskmodels.py @@ -331,7 +331,7 @@ class RiskModel(object): for i, asset in enumerate(assets)] return list(zip(eal_original, eal_retrofitted, bcr_results)) - def scenario_risk(self, loss_type, assets, gmvs, eids, epsilons): + def event_based_risk(self, loss_type, assets, gmvs, eids, epsilons): """ :returns: an array of shape (A, E) """ @@ -355,7 +355,7 @@ class RiskModel(object): loss_matrix[:, :] = (loss_ratio_matrix.T * values).T return loss_matrix - scenario = ebrisk = event_based_risk = scenario_risk + scenario = ebrisk = scenario_risk = event_based_risk def scenario_damage(self, loss_type, assets, gmvs, eids=None, eps=None): """
Renamed scenario_risk -> event_based_risk in the RiskModel
gem_oq-engine
train
py
ae672fafe59372c528e0fe2a74619958425ad6d5
diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb index <HASH>..<HASH> 100644 --- a/lib/chef/provider/package.rb +++ b/lib/chef/provider/package.rb @@ -25,8 +25,6 @@ require 'chef/platform' class Chef class Provider class Package < Chef::Provider - provides :package - include Chef::Mixin::Command include Chef::Mixin::ShellOut diff --git a/lib/chef/provider/service.rb b/lib/chef/provider/service.rb index <HASH>..<HASH> 100644 --- a/lib/chef/provider/service.rb +++ b/lib/chef/provider/service.rb @@ -23,8 +23,6 @@ class Chef class Provider class Service < Chef::Provider - provides :service - include Chef::Mixin::Command def initialize(new_resource, run_context)
Remove generic provides :package and provides :service from base classes
chef_chef
train
rb,rb
e51666bf210ac5b7881161e7445aa16ea3dc0013
diff --git a/php/commands/plugin.php b/php/commands/plugin.php index <HASH>..<HASH> 100644 --- a/php/commands/plugin.php +++ b/php/commands/plugin.php @@ -568,9 +568,16 @@ class Plugin_Command extends \WP_CLI\CommandWithUpgrade { if ( '.' == $plugin_dir ) $plugin_dir = $plugin->file; - $command = 'rm -rf ' . path_join( WP_PLUGIN_DIR, $plugin_dir ); + $path = path_join( WP_PLUGIN_DIR, $plugin_dir ); - return ! WP_CLI::launch( $command ); + if ( \WP_CLI\Utils\is_windows() ) { + $command = 'rd /s /q '; + $path = str_replace( "/", "\\", $path ); + } else { + $command = 'rm -rf '; + } + + return ! WP_CLI::launch( $command . $path ); } }
Fix wp plugin delete on Windows
wp-cli_export-command
train
php
e152b2eb59d1f5af0238051ccba14bbd3cce2a7c
diff --git a/embeddedassets/services/EmbeddedAssetsService.php b/embeddedassets/services/EmbeddedAssetsService.php index <HASH>..<HASH> 100644 --- a/embeddedassets/services/EmbeddedAssetsService.php +++ b/embeddedassets/services/EmbeddedAssetsService.php @@ -35,6 +35,8 @@ class EmbeddedAssetsService extends BaseApplicationComponent public function __construct() { + require_once Craft::getPathOfAlias('system.vendors.htmlpurifier') . '/HTMLPurifier.standalone.php'; + $whitelist = EmbeddedAssetsPlugin::getWhitelist(); foreach($whitelist as $i => $url)
#9 Fixed fatal issue with non-ASCII characters in entry slugs
spicywebau_craft-embedded-assets
train
php
edf6236239e3fb5c502915184a32366e11b46bbf
diff --git a/source/php/BulkImport.php b/source/php/BulkImport.php index <HASH>..<HASH> 100644 --- a/source/php/BulkImport.php +++ b/source/php/BulkImport.php @@ -164,7 +164,13 @@ class BulkImport //Sanity check, many users to remove? $maxDeleteLimit = (int) isset($_GET['maxDeletelimit']) ? $_GET['maxDeletelimit'] : 20; if (count($deleteAccounts) > $maxDeleteLimit) { - wp_mail(get_option('admin_email'), "Ad-integration plugin", "To many user deletions in queue (" . $maxDeleteLimit . ") add &maxDeleteLimit=number to your query to allow number of required deletions."); + if (is_main_site()) { + wp_mail( + get_option('admin_email'), + "Ad-integration plugin", + __("To many user deletions in queue (" . count($deleteAccounts) . "/" . $maxDeleteLimit . ") add https://test.dev/wp-admin/?adbulkimport&maxDeleteLimit=100 to your query to allow number of required deletions.", "adintegration") + ); + } } else { //Step 2: Delete these accounts if (is_array($deleteAccounts) && !empty($deleteAccounts)) {
Only send email on first blog. Better mail details too.
helsingborg-stad_active-directory-api-wp-integration
train
php
a7b9c78644a77d726edac6579614dfe8cd9b82bb
diff --git a/autolens/model/profiles/mass_profiles.py b/autolens/model/profiles/mass_profiles.py index <HASH>..<HASH> 100644 --- a/autolens/model/profiles/mass_profiles.py +++ b/autolens/model/profiles/mass_profiles.py @@ -702,7 +702,7 @@ class AbstractEllipticalGeneralizedNFW(EllipticalMassProfile, MassProfile): delta_concentration = self.delta_concentration( critical_surface_mass_density_arcsec=critical_surface_mass_density_arcsec, cosmic_average_mass_density_arcsec=cosmic_average_mass_density_arcsec) - return fsolve(func=self.concentration_func, x0=10.0, args=(delta_concentration,)) + return fsolve(func=self.concentration_func, x0=10.0, args=(delta_concentration,))[0] def concentration_func(self, concentration, delta_concentration): return 200.0 / 3.0 * (concentration * concentration * concentration / @@ -994,6 +994,7 @@ class SphericalTruncatedNFWChallenge(SphericalTruncatedNFW): super(SphericalTruncatedNFWChallenge, self).__init__(centre=centre, kappa_s=kappa_s, scale_radius=scale_radius, truncation_radius=truncation_radius) + class EllipticalNFW(AbstractEllipticalGeneralizedNFW): def __init__(self, centre=(0.0, 0.0), axis_ratio=1.0, phi=0.0, kappa_s=0.05, scale_radius=5.0):
Fixed visualization bug where plotting a mask leads the image to have white buffer surrounding it.
Jammy2211_PyAutoLens
train
py
8ebe9a855de4e91ab69989aa3d8a179de9f21ec2
diff --git a/mythril/analysis/solver.py b/mythril/analysis/solver.py index <HASH>..<HASH> 100644 --- a/mythril/analysis/solver.py +++ b/mythril/analysis/solver.py @@ -103,7 +103,7 @@ def get_transaction_sequence(global_state, constraints): concrete_transactions[tx_id]["calldata"] = "0x" + "".join( [ hex(b)[2:] if len(hex(b)) % 2 == 0 else "0" + hex(b)[2:] - for b in transaction.call_data.concretized(model) + for b in transaction.call_data.concrete(model) ] )
mythril/analysis/solver: Refactor to support changes in calldata
ConsenSys_mythril-classic
train
py
6551aa39cae16f868c89b8a6aa938a68f3a57e5b
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -22,7 +22,11 @@ let AlexandriaCore = (function(){ config: { Addresses: { Swarm: [ - '/ip4/163.172.37.165/tcp/4001/ipfs/QmRvfRjoCCwVLbVAiYWqJJCiQKqGqSuKckv4eDKEHZXxZu' + '/ip4/163.172.37.165/tcp/4001/ipfs/QmRvfRjoCCwVLbVAiYWqJJCiQKqGqSuKckv4eDKEHZXxZu', + "/ip4/69.172.212.23/tcp/4001/ipfs/QmXUcnxbsDkazGNvgf1kQya6YwVqNsLbVhzg3LHNTteqwz", + "/ip4/69.172.212.23/tcp/4002/ws/ipfs/QmXUcnxbsDkazGNvgf1kQya6YwVqNsLbVhzg3LHNTteqwz", + "/ip4/192.99.6.117/tcp/4001/ipfs/QmQ85u4dH4EPRpNxLxBMvUCHCUyuyZgBZsfW81rzh51FtY", + "/ip6/2607:5300:60:3775::/tcp/4001/ipfs/QmQ85u4dH4EPRpNxLxBMvUCHCUyuyZgBZsfW81rzh51FtY" ] } }
Add more Swarm servers to IPFS
oipwg_oip-js
train
js
75f9d6375379f07826cc7f25c743606dc24ac9cc
diff --git a/bigchaindb/version.py b/bigchaindb/version.py index <HASH>..<HASH> 100644 --- a/bigchaindb/version.py +++ b/bigchaindb/version.py @@ -1,2 +1,2 @@ -__version__ = '0.5.1' -__short_version__ = '0.5' +__version__ = '0.6.0' +__short_version__ = '0.6'
Bumped the version number to <I> in version.py
bigchaindb_bigchaindb
train
py
098eb99991fcff317612bed537904127b34e6c9a
diff --git a/java/server/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java b/java/server/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java index <HASH>..<HASH> 100644 --- a/java/server/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java +++ b/java/server/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java @@ -74,9 +74,7 @@ public class NodeOptionsTest { @Test public void canConfigureNodeWithDriverDetection() { assumeFalse("We don't have driver servers in PATH when we run unit tests", - Boolean.getBoolean("TRAVIS")); - System.out.println("Wonder why assumeFalse did not work, TRAVIS = " + Boolean.getBoolean("TRAVIS")); - System.getenv().forEach((k, v) -> System.out.println(String.format("%s=%s", k, v))); + Boolean.parseBoolean(System.getenv("TRAVIS"))); Config config = new MapConfig(ImmutableMap.of( "node", ImmutableMap.of("detect-drivers", "true")));
[java] Oh, I've mixed up system properties with env variables...
SeleniumHQ_selenium
train
java
e301eec0572ce66939f2137c52aa0824275f23b1
diff --git a/src/module/Tree.js b/src/module/Tree.js index <HASH>..<HASH> 100644 --- a/src/module/Tree.js +++ b/src/module/Tree.js @@ -109,10 +109,6 @@ class Tree extends Component { this.setCollapsible = this.setCollapsible.bind(this); this.populateData = this.populateData.bind(this); this.populateError = this.populateError.bind(this); - - if (this.props.tree) { - this.props.tree.root = translateSpans(assignNodeIds(this.props.tree.root)); - } } componentDidMount() { @@ -241,6 +237,9 @@ class Tree extends Component { this.fetchData(fetchPath, "get", {}, false); } else { // Load static data + if (this.props.tree) { + this.props.tree.root = translateSpans(assignNodeIds(this.props.tree.root)); + } const { fetchedData, selectedData } = this.sanitizeResponse(this.props.tree, false); this.populateData(fetchedData, "", selectedData); }
Translate the tree one very property change. This makes it possible to re-render the tree without remounting the component, which is required for embedding the application in a react application.
allenai_hierplane
train
js
28b40e917498e706254022d82bf137582c3c8b80
diff --git a/subliminal/services/bierdopje.py b/subliminal/services/bierdopje.py index <HASH>..<HASH> 100644 --- a/subliminal/services/bierdopje.py +++ b/subliminal/services/bierdopje.py @@ -19,7 +19,7 @@ from . import ServiceBase from ..cache import cachedmethod from ..exceptions import ServiceError from ..language import language_set -from ..subtitles import get_subtitle_path, ResultSubtitle +from ..subtitles import get_subtitle_path, ResultSubtitle, EXTENSIONS from ..utils import to_unicode from ..videos import Episode from bs4 import BeautifulSoup @@ -87,8 +87,11 @@ class BierDopje(ServiceBase): continue path = get_subtitle_path(filepath, language, self.config.multi) for result in soup.results('result'): + release = to_unicode(result.filename.contents[0]) + if not release.endswith(tuple(EXTENSIONS)): + release += '.srt' subtitle = ResultSubtitle(path, language, self.__class__.__name__.lower(), result.downloadlink.contents[0], - release=to_unicode(result.filename.contents[0])) + release=release) subtitles.append(subtitle) return subtitles
Fix subtitle release name in BierDopje Matching confidence could not be computed because of the missing extension
Diaoul_subliminal
train
py
d340f135124723fa9ef2d25e2f258ec037276670
diff --git a/ReText/window.py b/ReText/window.py index <HASH>..<HASH> 100644 --- a/ReText/window.py +++ b/ReText/window.py @@ -261,9 +261,9 @@ class ReTextWindow(QMainWindow): self.symbolBox.activated.connect(self.insertSymbol) self.updateStyleSheet() menubar = self.menuBar() - menuFile = menubar.addMenu(self.tr('File')) - menuEdit = menubar.addMenu(self.tr('Edit')) - menuHelp = menubar.addMenu(self.tr('Help')) + menuFile = menubar.addMenu(self.tr('&File')) + menuEdit = menubar.addMenu(self.tr('&Edit')) + menuHelp = menubar.addMenu(self.tr('&Help')) menuFile.addAction(self.actionNew) menuFile.addAction(self.actionOpen) self.menuRecentFiles = menuFile.addMenu(self.tr('Open recent'))
Underline character mnemonics. In order to indicate keyboard shortcuts for items in the menu bar.
retext-project_retext
train
py
8f04e4f920d6ba9e0f33e2a7376f859b31a134fc
diff --git a/spec/unit/compiler/text_processor_spec.rb b/spec/unit/compiler/text_processor_spec.rb index <HASH>..<HASH> 100644 --- a/spec/unit/compiler/text_processor_spec.rb +++ b/spec/unit/compiler/text_processor_spec.rb @@ -234,6 +234,20 @@ module Epuber XHTMLProcessor.resolved_link_to_file('', nil, 'root.txt', finder) }.to raise_error FileFinders::FileNotFoundError end + + it 'will not raise for valid path' do + FileUtils.mkdir_p('image') + FileUtils.touch('image/stan_mindsetbw.png') + + FileUtils.mkdir_p('text') + FileUtils.touch('text/root.txt') + + finder = FileFinders::Normal.new('/') + + expect { + XHTMLProcessor.resolved_link_to_file('image/stan_mindsetbw.png', nil, 'text/root.txt', finder) + }.to_not raise_error + end end context '.resolve_links_for' do
[Spec] add one test to text_processor_spec
epuber-io_epuber
train
rb
6cb0e9b89a624a953d51bede314529bfb113530c
diff --git a/Log/Logger.php b/Log/Logger.php index <HASH>..<HASH> 100644 --- a/Log/Logger.php +++ b/Log/Logger.php @@ -36,11 +36,11 @@ class Logger implements LoggerInterface $logMessage->setLevel($level); if ($context) { - if (isset($context['request'])) { + if (!empty($context['request'])) { $logMessage->setRequest(new LogRequest($context['request'])); } - if (isset($context['response'])) { + if (!empty($context['response'])) { $logMessage->setResponse(new LogResponse($context['response'])); } }
Check context response/request existence before logging it (#<I>)
8p_EightPointsGuzzleBundle
train
php