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
511dc4b423bc4dc2607818f8ef1e36848e7c03d6
diff --git a/jmetal-experimental/src/main/java/org/uma/jmetal/experimental/auto/algorithm/smpso/ComponentBasedSMPSO.java b/jmetal-experimental/src/main/java/org/uma/jmetal/experimental/auto/algorithm/smpso/ComponentBasedSMPSO.java index <HASH>..<HASH> 100644 --- a/jmetal-experimental/src/main/java/org/uma/jmetal/experimental/auto/algorithm/smpso/ComponentBasedSMPSO.java +++ b/jmetal-experimental/src/main/java/org/uma/jmetal/experimental/auto/algorithm/smpso/ComponentBasedSMPSO.java @@ -17,7 +17,6 @@ import org.uma.jmetal.experimental.componentbasedalgorithm.catalogue.pso.velocit import org.uma.jmetal.operator.mutation.MutationOperator; import org.uma.jmetal.operator.mutation.impl.PolynomialMutation; import org.uma.jmetal.problem.doubleproblem.DoubleProblem; -import org.uma.jmetal.problem.multiobjective.zdt.ZDT2; import org.uma.jmetal.problem.multiobjective.zdt.ZDT4; import org.uma.jmetal.solution.doublesolution.DoubleSolution; import org.uma.jmetal.util.archive.BoundedArchive;
Update class ComponentBasedSMPSO
jMetal_jMetal
train
java
2d8937c12223c888145caf52eeda5abeb6d0de4f
diff --git a/alignak/http/arbiter_interface.py b/alignak/http/arbiter_interface.py index <HASH>..<HASH> 100644 --- a/alignak/http/arbiter_interface.py +++ b/alignak/http/arbiter_interface.py @@ -165,7 +165,7 @@ class ArbiterInterface(GenericInterface): for prop in props: if not hasattr(daemon, prop): continue - if prop in ["realms", "conf", "con", "tags"]: + if prop in ["realms", "conf", "con", "tags", "modules", "conf_package"]: continue val = getattr(daemon, prop) # give a try to a json able object
Clean warning log for get_all_states
Alignak-monitoring_alignak
train
py
36001b73a7eaa650766bc93c04d8142490bcd9b6
diff --git a/php/wp-settings-cli.php b/php/wp-settings-cli.php index <HASH>..<HASH> 100644 --- a/php/wp-settings-cli.php +++ b/php/wp-settings-cli.php @@ -286,7 +286,7 @@ $GLOBALS['wp_the_query'] = new WP_Query(); * @global object $wp_query * @since 1.5.0 */ -$GLOBALS['wp_query'] = $wp_the_query; +$GLOBALS['wp_query'] = $GLOBALS['wp_the_query']; /** * Holds the WordPress Rewrite object for creating pretty URLs
Use global version of the variable because it doesn't exist in local scope
wp-cli_export-command
train
php
38ca948ef602822045dec32754b24ca9eda4049d
diff --git a/test/Select-test.js b/test/Select-test.js index <HASH>..<HASH> 100644 --- a/test/Select-test.js +++ b/test/Select-test.js @@ -2505,6 +2505,20 @@ describe('Select', () => { expect( instance.input.focus, 'was not called' ); } ); + + it( 'should set onBlurredState', () => { + instance = createControl({ + options: defaultOptions + }); + + var inputFocus = sinon.spy( instance.input, 'focus' ); + instance.handleInputBlur(); + + expect( instance.state.isFocused, 'to be false'); + expect( instance.state.isOpen, 'to be false'); + expect( instance.state.isPseudoFocused, 'to be false'); + + } ); }); describe('with onBlurResetsInput=true', () => {
Additional test coverage for onBlur
HubSpot_react-select-plus
train
js
fe8c3d4594f1afe316225069dcce3640c2654c37
diff --git a/java/src/com/google/template/soy/data/SanitizedContents.java b/java/src/com/google/template/soy/data/SanitizedContents.java index <HASH>..<HASH> 100644 --- a/java/src/com/google/template/soy/data/SanitizedContents.java +++ b/java/src/com/google/template/soy/data/SanitizedContents.java @@ -197,11 +197,12 @@ public final class SanitizedContents { } /** Wraps an assumed-safe constant string. */ + @SuppressWarnings("ReferenceEquality") // need to use a reference check to ensure it is a constant private static SanitizedContent fromConstant( String constant, ContentKind kind, @Nullable Dir dir) { // Extra runtime check in case the compile-time check doesn't work. Preconditions.checkArgument( - constant.intern().equals(constant), + constant.intern() == constant, "The provided argument does not look like a compile-time constant."); return SanitizedContent.create(constant, kind, dir); }
Fixed fromConstant call. .equals(..) is useless because a.intern().equals(a) will always be true. a.intern() == a is what you want. GITHUB_BREAKING_CHANGES=SanitizedConstants.fromConstant is now checked. ------------- Created by MOE: <URL>
google_closure-templates
train
java
c60ccb4196239d472feca9758e17dfb3b9cfa4b9
diff --git a/scheduler/main.go b/scheduler/main.go index <HASH>..<HASH> 100644 --- a/scheduler/main.go +++ b/scheduler/main.go @@ -549,7 +549,6 @@ func (f *Formation) remove(n int, name string) { // TODO: log/handle error } f.jobs.Remove(name, k.hostID, k.jobID) - f.c.jobs.Remove(k.hostID, k.jobID) if i++; i == n { break } diff --git a/scheduler/scheduler_test.go b/scheduler/scheduler_test.go index <HASH>..<HASH> 100644 --- a/scheduler/scheduler_test.go +++ b/scheduler/scheduler_test.go @@ -197,7 +197,6 @@ func (s *S) TestWatchFormations(c *C) { c.Assert(formation.Artifact, DeepEquals, f.Artifact) c.Assert(formation.Processes, DeepEquals, f.Processes) - c.Assert(cx.jobs.Len(), Equals, u.jobCount()+1) host := cl.GetHost(hostID) c.Assert(len(host.Jobs), Equals, u.jobCount()+1)
controller: Only remove jobs from the scheduler once they actually stop Previously when scaling down a formation, the job would be removed from the scheduler's known jobs during the formation's rectify routine, which would mean once the job actually stops and a stop event is emitted, the scheduler doesn't recognize the job id and so does not change it's state in the controller. With this change, the job is only removed from the known jobs once it has actually stopped (i.e. once a stop event has been received from the host)
flynn_flynn
train
go,go
34778aa501dc1acefaa298f005ac109795334118
diff --git a/great_expectations/data_context/store/tuple_store_backend.py b/great_expectations/data_context/store/tuple_store_backend.py index <HASH>..<HASH> 100644 --- a/great_expectations/data_context/store/tuple_store_backend.py +++ b/great_expectations/data_context/store/tuple_store_backend.py @@ -255,10 +255,8 @@ class TupleFilesystemStoreBackend(TupleStoreBackend): ) if self.filepath_prefix and not filepath.startswith(self.filepath_prefix): - logger.warning("skipping " + filepath + " because it does not start with " + self.filepath_prefix) continue elif self.filepath_suffix and not filepath.endswith(self.filepath_suffix): - logger.warning("skipping " + filepath + " because it does not end with " + self.filepath_prefix) continue else: key = self._convert_filepath_to_key(filepath)
Improve path support in TupleStoreBackend for better cross-platform compatibility
great-expectations_great_expectations
train
py
5128401ce54909885fdec1cb49fcdf093c7b1c06
diff --git a/go/mysql/replication_position.go b/go/mysql/replication_position.go index <HASH>..<HASH> 100644 --- a/go/mysql/replication_position.go +++ b/go/mysql/replication_position.go @@ -173,6 +173,12 @@ func (rp *Position) UnmarshalJSON(buf []byte) error { // Comparable returns whether the receiver is comparable to the supplied position, based on whether one // of the two positions contains the other. func (rp *Position) Comparable(other Position) bool { + if rp.GTIDSet == nil || other.GTIDSet == nil { + // If either set is nil, then we can't presume to know the flavor of the sets, and therefore + // can't compare them. + return false + } + return rp.GTIDSet.Contains(other.GTIDSet) || other.GTIDSet.Contains(rp.GTIDSet) }
Add nil bailout in case either incoming GTIDSet is nil.
vitessio_vitess
train
go
8d1e65b3b1e74bf0399dccf4652913304692c078
diff --git a/spec/unit/application/apply_spec.rb b/spec/unit/application/apply_spec.rb index <HASH>..<HASH> 100644 --- a/spec/unit/application/apply_spec.rb +++ b/spec/unit/application/apply_spec.rb @@ -189,16 +189,8 @@ describe Puppet::Application::Apply do Puppet.expects(:notice).with(regexp_matches /Run of Puppet already in progress; skipping (.+ exists)/) end - it "should exit" do - expect { @apply.run_command }.to raise_error(SystemExit) - end - it "should return an exit code of 1" do - begin - @apply.run_command - rescue SystemExit => e - expect(e.status).to eq(1) - end + expect { @apply.run_command }.to exit_with(1) end end
(PUP-<I>) Use helper for exit code test
puppetlabs_puppet
train
rb
54e1a1d10730c68c188351b96fc3eee38e35a9eb
diff --git a/idispatch_windows_test.go b/idispatch_windows_test.go index <HASH>..<HASH> 100644 --- a/idispatch_windows_test.go +++ b/idispatch_windows_test.go @@ -32,7 +32,7 @@ func wrapDispatch(t *testing.T, ClassID, UnknownInterfaceID, DispatchInterfaceID } defer unknown.Release() - dispatch, err = unknown.QueryInterface(DispatchInterfaceID) + dispatch, err = unknown.QueryInterface(IID_IDispatch) if err != nil { t.Error(err) return
Attempt to query IDispatch interface.
go-ole_go-ole
train
go
7753bd8931a0b3f8cd8b5e7bbd8286c604fa1977
diff --git a/src/utils/popup/index.js b/src/utils/popup/index.js index <HASH>..<HASH> 100644 --- a/src/utils/popup/index.js +++ b/src/utils/popup/index.js @@ -2,6 +2,7 @@ import Vue from 'vue'; import merge from 'element-ui/src/utils/merge'; import PopupManager from 'element-ui/src/utils/popup/popup-manager'; import getScrollBarWidth from '../scrollbar-width'; +import { getStyle } from '../dom'; let idSeed = 1; const transitions = []; @@ -198,7 +199,8 @@ export default { } scrollBarWidth = getScrollBarWidth(); let bodyHasOverflow = document.documentElement.clientHeight < document.body.scrollHeight; - if (scrollBarWidth > 0 && bodyHasOverflow) { + let bodyOverflowY = getStyle(document.body, 'overflowY'); + if (scrollBarWidth > 0 && (bodyHasOverflow || bodyOverflowY === 'scroll')) { document.body.style.paddingRight = scrollBarWidth + 'px'; } document.body.style.overflow = 'hidden';
Popup: fix missing padding-right when overflow-y is scroll
ElemeFE_element
train
js
7e867e5db98b596fa6c36dbdc0febfbc502ccb67
diff --git a/tests/source/core/datastore/types/database/MIntegrationTestMysql.php b/tests/source/core/datastore/types/database/MIntegrationTestMysql.php index <HASH>..<HASH> 100644 --- a/tests/source/core/datastore/types/database/MIntegrationTestMysql.php +++ b/tests/source/core/datastore/types/database/MIntegrationTestMysql.php @@ -48,7 +48,7 @@ class MIntegrationTestMysql extends PHPUnit_Framework_TestCase "sql11153903", "prefix_", "sql11153903", - "saTTMEYWt4"); // yes i know it's the password of the database... ;) + "saTTMEYWt4"); // yes i know it's the password of the database... ;) - please don't make any jokes. $databaseDatastore = new \simpleserv\webfilesframework\core\datastore\types\database\MDatabaseDatastore($connection); return $databaseDatastore; }
throw exception if datastore contains a webfile with same id twice
sebastianmonzel_webfiles-framework-php
train
php
0d812b531c7a0ba505ac288b3f979f510aa3a848
diff --git a/tests/test_lib.py b/tests/test_lib.py index <HASH>..<HASH> 100755 --- a/tests/test_lib.py +++ b/tests/test_lib.py @@ -23,6 +23,13 @@ class TestFunctionsFail(object): "" ) + def test_hash(self): + with pytest.raises(TypeError): + ssdeep.hash(None) + + with pytest.raises(TypeError): + ssdeep.hash(1234) + class TestFunctions(object): def test_compare(self): @@ -46,6 +53,10 @@ class TestFunctions(object): res = ssdeep.hash("Also called fuzzy hashes, CTPH can match inputs that have homologies.") assert res == "3:AXGBicFlIHBGcL6wCrFQEv:AXGH6xLsr2C" + def test_hash_3(self): + res = ssdeep.hash(b"Also called fuzzy hashes, CTPH can match inputs that have homologies.") + assert res == "3:AXGBicFlIHBGcL6wCrFQEv:AXGH6xLsr2C" + def test_hash_from_file(self): with pytest.raises(IOError): ssdeep.hash_from_file("tests/files/")
test - Tests for hash()
DinoTools_python-ssdeep
train
py
390f87eaa82d065beba5d8d3e3391f95c77fb62c
diff --git a/cli/valet.php b/cli/valet.php index <HASH>..<HASH> 100755 --- a/cli/valet.php +++ b/cli/valet.php @@ -518,7 +518,7 @@ You might also want to investigate your global Composer configs. Helpful command return info("Valet is already using {$linkedVersion}."); } - info("Found '{$site}' specifying version: {$phpVersion}"); + info("Found '{$site}/.valetphprc' specifying version: {$phpVersion}"); } PhpFpm::useVersion($phpVersion, $force);
Update cli/valet.php
laravel_valet
train
php
da73225348b15839b395840127fd18df625c3cbe
diff --git a/molgenis-data-mysql/src/test/java/org/molgenis/data/importer/EmxImportServiceTest.java b/molgenis-data-mysql/src/test/java/org/molgenis/data/importer/EmxImportServiceTest.java index <HASH>..<HASH> 100644 --- a/molgenis-data-mysql/src/test/java/org/molgenis/data/importer/EmxImportServiceTest.java +++ b/molgenis-data-mysql/src/test/java/org/molgenis/data/importer/EmxImportServiceTest.java @@ -124,11 +124,6 @@ public class EmxImportServiceTest extends AbstractTestNGSpringContextTests @Test public void testImportReport() throws IOException, InvalidFormatException, InterruptedException { - // cleanup - store.dropEntityMetaData("import_person"); - store.dropEntityMetaData("import_city"); - store.dropEntityMetaData("import_country"); - // create test excel File f = ResourceUtils.getFile(getClass(), "/example.xlsx"); ExcelRepositoryCollection source = new ExcelRepositoryCollection(f);
Don't need to explicitly clean up, refreshRepositories already does that.
molgenis_molgenis
train
java
574030d19cf2f2d0417c23207e93beef8920b87a
diff --git a/moderator/admin.py b/moderator/admin.py index <HASH>..<HASH> 100644 --- a/moderator/admin.py +++ b/moderator/admin.py @@ -74,7 +74,7 @@ class CommentAdmin(DjangoCommentsAdmin): For proxy models with cls apptribute limit comments to those classified as cls. """ qs = super(CommentAdmin, self).queryset(request) - qs = qs.filter(user__is_staff=False, is_removed=False) + qs = qs.filter(Q(user__is_staff=False) | Q(user__isnull=True), is_removed=False) cls = getattr(self, 'cls', None) if cls: qs = qs.filter(classifiedcomment__cls=self.cls)
also show comments where user is not set
praekelt_django-moderator
train
py
682fd1d40b6f2191e4b4d46b827d78ba6acf2686
diff --git a/resources/views/partials/example-requests/php.blade.php b/resources/views/partials/example-requests/php.blade.php index <HASH>..<HASH> 100644 --- a/resources/views/partials/example-requests/php.blade.php +++ b/resources/views/partials/example-requests/php.blade.php @@ -1,7 +1,7 @@ ```php $client = new \GuzzleHttp\Client(); -$response = $client->{{ strtolower($route['methods'][0]) }}("{{ rtrim($baseUrl, '/') . '/' . $route['boundUri'] }}", [ +$response = $client->{{ strtolower($route['methods'][0]) }}("{{ rtrim($baseUrl, '/') . '/' . ltrim($route['boundUri'], '/') }}", [ @if(!empty($route['headers'])) 'headers' => [ @foreach($route['headers'] as $header => $value)
Correct URI in example request for PHP
mpociot_laravel-apidoc-generator
train
php
55f6faeb81b5a55b9ec382cbb4fcd70ab02333b0
diff --git a/test/test.js b/test/test.js index <HASH>..<HASH> 100644 --- a/test/test.js +++ b/test/test.js @@ -132,6 +132,20 @@ test('special characters in node values', t => { '{(B,C)}', '\\end{tikzcd}' ].join('\n')) + + t.is(render( + <Diagram> + <Node key="a" value="" position={[0, 0]} /> + <Node key="b" position={[0, 2]} /> + <Edge from="a" to="b" value="\xi" alt /> + </Diagram> + ), [ + '\\begin{tikzcd}', + '{} \\arrow[dd, "\\xi"\'] \\\\', + ' \\\\', + '{}', + '\\end{tikzcd}' + ].join('\n')) }) test('inside arrow label position', t => {
Add test for empty nodes as edge anchors
yishn_jsx-tikzcd
train
js
5b558ba548182a560ceeb2c1f8701c905f9e7018
diff --git a/pkg/kvstore/events_tests.go b/pkg/kvstore/events_tests.go index <HASH>..<HASH> 100644 --- a/pkg/kvstore/events_tests.go +++ b/pkg/kvstore/events_tests.go @@ -48,7 +48,7 @@ func expectEvent(c *C, w *Watcher, typ EventType, key string, val []byte) { if backend == "consul" { c.Assert(event.Value, DeepEquals, val) } - case <-time.After(10 * time.Second): + case <-time.After(30 * time.Second): c.Fatal("timeout while waiting for kvstore watcher event") } }
kvstore: Bump watch test timeout to <I> seconds
cilium_cilium
train
go
2ab7932ae24ab9bbc1090a245dc6e8a3ee4acf37
diff --git a/adafruit_seesaw/seesaw.py b/adafruit_seesaw/seesaw.py index <HASH>..<HASH> 100644 --- a/adafruit_seesaw/seesaw.py +++ b/adafruit_seesaw/seesaw.py @@ -222,6 +222,12 @@ class Seesaw: else: self.write(_GPIO_BASE, _GPIO_INTENCLR, cmd) + def get_GPIO_interrupt_flag(self, delay=0.008): + """Read and clear GPIO interrupts that have fired""" + buf = bytearray(4) + self.read(_GPIO_BASE, _GPIO_INTFLAG, buf, delay=delay) + return struct.unpack(">I", buf)[0] + def analog_read(self, pin): """Read the value of an analog pin by number""" buf = bytearray(2)
Add method for reading GPIO Interrupt flag
adafruit_Adafruit_CircuitPython_seesaw
train
py
963dee3856dd58b7afe0e4c375140acfe57edcb7
diff --git a/pmxbot/core.py b/pmxbot/core.py index <HASH>..<HASH> 100644 --- a/pmxbot/core.py +++ b/pmxbot/core.py @@ -226,7 +226,6 @@ class LoggingCommandBot(irc.bot.SingleServerIRCBot): def handle_action(self, c, e, channel, nick, msg): """Core message parser and dispatcher""" - lc_msg = msg.lower() cmd, _, cmd_args = msg.partition(' ') messages = () @@ -247,8 +246,9 @@ class LoggingCommandBot(irc.bot.SingleServerIRCBot): ) break elif (handler.type_ in ('contains', '#') - and handler.name in lc_msg): - f = functools.partial(handler.func, c, e, channel, nick, msg) + and handler.match(msg)): + f = functools.partial(handler.func, c, e, channel, nick, + handler.process(msg)) if ( not handler.channels and not handler.exclude or channel in handler.channels @@ -330,6 +330,15 @@ class ContainsHandler(Handler): class_priority = 1 allow_chain = False + def match(self, message): + """ + Return True if the message is matched by this handler. + """ + return self.name in message.lower() + + def process(self, message): + return message + class CommandHandler(Handler): type_ = 'command' class_priority = 3
Moved contains matching and processing into the ContainsHandler
yougov_pmxbot
train
py
687390791a25cc8da37fe63add7b05a5e069a770
diff --git a/KafNafParserMod.py b/KafNafParserMod.py index <HASH>..<HASH> 100644 --- a/KafNafParserMod.py +++ b/KafNafParserMod.py @@ -969,11 +969,11 @@ class KafNafParser: def add_coreference(self, coreference): """ Adds an coreference to the coreference layer - @type entity: L{Ccoreference} - @param entity: the coreference object + @type coreference: L{Ccoreference} + @param coreference: the coreference object """ if self.coreference_layer is None: - self.coreference_layer = Ccorefernces(type=self.type) + self.coreference_layer = Ccoreferences(type=self.type) self.root.append(self.coreference_layer.get_node()) self.coreference_layer.add_coreference(coreference)
Added functions for adding coreference information to NAF
cltl_KafNafParserPy
train
py
ee00dc1526f6f36705e8211ecd734844bd1c7e87
diff --git a/src/Krizalys/Onedrive/File.php b/src/Krizalys/Onedrive/File.php index <HASH>..<HASH> 100644 --- a/src/Krizalys/Onedrive/File.php +++ b/src/Krizalys/Onedrive/File.php @@ -32,13 +32,15 @@ class File extends Object { /** * Fetches the content of the OneDrive file referenced by this File instance. * + * @param (array) - Extra curl options to pass. + * * @return (string) The content of the OneDrive file referenced by this File * instance. */ // TODO: should somewhat return the content-type as well; this information is // not disclosed by OneDrive - public function fetchContent() { - return $this->_client->apiGet($this->_id . '/content'); + public function fetchContent($options = array()) { + return $this->_client->apiGet($this->_id . '/content', $options); } /**
Tweak File::fetchContent() to pass arbitrary curl options This patch tweaks the fetchContent() method to allow curl arbitrary options to be passed through to apiGet(). I am using this to fetch enormous files in chunks, via the HTTP Range: header. (Otherwise, the data may exhaust <I>% of available memory in PHP).
krizalys_onedrive-php-sdk
train
php
f3bc26e62d1e65839990aeb553bb6f32bbe04452
diff --git a/slugid/__init__.py b/slugid/__init__.py index <HASH>..<HASH> 100644 --- a/slugid/__init__.py +++ b/slugid/__init__.py @@ -36,7 +36,7 @@ Usage: """ __title__ = 'slugid' -__version__ = '1.0.5' +__version__ = '1.0.6' __author__ = 'Peter Moore' __license__ = 'MPL 2.0'
Bumped version <I> -> <I>
taskcluster_slugid.py
train
py
f66bcbb131e20cbd13fba5a239319127b66fabfe
diff --git a/ariadne/executable_schema.py b/ariadne/executable_schema.py index <HASH>..<HASH> 100644 --- a/ariadne/executable_schema.py +++ b/ariadne/executable_schema.py @@ -55,8 +55,3 @@ EXTENSION_KINDS = [ "enum_type_extension", "input_object_type_extension", ] - - -def extract_extensions(ast: DocumentNode) -> DocumentNode: - extensions = [node for node in ast.definitions if node.kind in EXTENSION_KINDS] - return DocumentNode(definitions=extensions)
removed unused extract_extensions
mirumee_ariadne
train
py
54f1a51a102ee17cb371510846f15beec6a5677a
diff --git a/lib/express/core.js b/lib/express/core.js index <HASH>..<HASH> 100644 --- a/lib/express/core.js +++ b/lib/express/core.js @@ -201,6 +201,7 @@ Server = Class({ run: function(port, host, backlog){ var self = this + this.running = true if (host !== undefined) this.host = host if (port !== undefined) this.port = port if (backlog !== undefined) this.backlog = backlog diff --git a/lib/express/dsl.js b/lib/express/dsl.js index <HASH>..<HASH> 100644 --- a/lib/express/dsl.js +++ b/lib/express/dsl.js @@ -21,8 +21,10 @@ function route(method) { fn = options, options = {} if (path.indexOf('http://') === 0) return http[method].apply(this, arguments) - else + else if (!Express.server.running) Express.routes.push(new Route(method, path, fn, options)) + else + throw new Error('cannot create route ' + method.toUpperCase() + " `" + path + "' at runtime") } }
Throwing error when routes are added at runtime Since it doubles as an http client, without this someone could arbitrarily create routes.. haha not good!
expressjs_express
train
js,js
24443469b5dd0afd5a6fa52687a8ea1d205acf38
diff --git a/web/src/main/java/uk/ac/ebi/atlas/geneindex/SolrClient.java b/web/src/main/java/uk/ac/ebi/atlas/geneindex/SolrClient.java index <HASH>..<HASH> 100644 --- a/web/src/main/java/uk/ac/ebi/atlas/geneindex/SolrClient.java +++ b/web/src/main/java/uk/ac/ebi/atlas/geneindex/SolrClient.java @@ -99,7 +99,7 @@ public class SolrClient { JsonArray suggestionEntry = suggestionElement.getAsJsonArray(); - if (term.equals(suggestionEntry.get(0).getAsString())){ + if (term.equalsIgnoreCase(suggestionEntry.get(0).getAsString())){ JsonArray suggestions = suggestionEntry.get(1).getAsJsonObject().getAsJsonArray("suggestion"); Gson gson = new Gson(); return gson.fromJson(suggestions, List.class);
now single term matching in genename suggestion is case insensitive
ebi-gene-expression-group_atlas
train
java
f56e61ebed9d3bcc9e5b84bfc4c56fcdd7684690
diff --git a/tests/unit/phpDocumentor/Transformer/Router/RuleTest.php b/tests/unit/phpDocumentor/Transformer/Router/RuleTest.php index <HASH>..<HASH> 100644 --- a/tests/unit/phpDocumentor/Transformer/Router/RuleTest.php +++ b/tests/unit/phpDocumentor/Transformer/Router/RuleTest.php @@ -70,10 +70,10 @@ class RuleTest extends \PHPUnit_Framework_TestCase return true; }, function () { - return 'httö://www.exämple.örg/foo.html#bär'; + return 'httö://www.€xample.org/foo.html#bär'; } ); - $this->assertSame('httö://www.ex%22ample.%22org/foo.html#bär', $fixture->generate('test')); + $this->assertSame('httö://www.EURxample.org/foo.html#bär', $fixture->generate('test')); } }
change in RuleTest Used different test string because of problems character encoding
phpDocumentor_phpDocumentor2
train
php
76db057c384249f0b45eceee742092c0b8159731
diff --git a/spec/acts_as_approvable_spec.rb b/spec/acts_as_approvable_spec.rb index <HASH>..<HASH> 100644 --- a/spec/acts_as_approvable_spec.rb +++ b/spec/acts_as_approvable_spec.rb @@ -1,6 +1,11 @@ require 'spec_helper' describe ActsAsApprovable do + it { should respond_to(:owner_class) } + it { should respond_to(:owner_class=) } + it { should respond_to(:view_language) } + it { should respond_to(:view_language=) } + describe '.enabled?' do it 'returns true by default' do subject.enabled?.should be_true @@ -21,8 +26,4 @@ describe ActsAsApprovable do end end - it { should respond_to(:owner_class) } - it { should respond_to(:owner_class=) } - it { should respond_to(:view_language) } - it { should respond_to(:view_language=) } end
Move responds_to to top of spec
Tapjoy_acts_as_approvable
train
rb
f93bfac68ec1da22f96a3239dab5851bbd753fb4
diff --git a/src/Client.php b/src/Client.php index <HASH>..<HASH> 100644 --- a/src/Client.php +++ b/src/Client.php @@ -104,7 +104,7 @@ abstract class Client if ($metadata != '' && $ob === null) { throw new InvalidJSONException(); } - if (!in_array($audio_channel, array('left', 'right', 'split'))) { + if (!in_array($audio_channel, array('left', 'right', 'split', ''))) { throw new InvalidEnumTypeException(); }
adding the null as a valid value for the input
Clarify_clarify-php
train
php
48e9987dc11713319932f88d24beec6df0d41cc9
diff --git a/mintapi/api.py b/mintapi/api.py index <HASH>..<HASH> 100644 --- a/mintapi/api.py +++ b/mintapi/api.py @@ -592,7 +592,7 @@ ISO8601_FMT = '%Y-%m-%dT%H:%M:%SZ' EXCEL_FMT = '%Y-%m-%d %H:%M:%S' -def make_accounts_presentable(accounts, presentable_format = EXCEL_FMT): +def make_accounts_presentable(accounts, presentable_format=EXCEL_FMT): for account in accounts: for k, v in account.items(): if isinstance(v, datetime):
More PEP8 clean up Trying to be a good coding citizen
mrooney_mintapi
train
py
fdcafcdd2bb05d667284ae247be252c99ed62637
diff --git a/src/components/ButtonGroup.js b/src/components/ButtonGroup.js index <HASH>..<HASH> 100644 --- a/src/components/ButtonGroup.js +++ b/src/components/ButtonGroup.js @@ -1,4 +1,5 @@ const React = require('react'); +const Radium = require('radium'); const Button = require('./Button'); @@ -89,4 +90,4 @@ const ButtonGroup = React.createClass({ } }); -module.exports = ButtonGroup; +module.exports = Radium(ButtonGroup);
readds Radium to button group
mxenabled_mx-react-components
train
js
6291171d65012eebbaaeb1e3e5bbdac93a32c285
diff --git a/app/models/event.rb b/app/models/event.rb index <HASH>..<HASH> 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -1,5 +1,5 @@ class Event < ActiveRecord::Base - scope :closing_days, -> { includes(:event_category).where('event_categories.name' => 'closed') } + scope :closing_days, -> { joins(:event_category).where('event_categories.name' => 'closed') } scope :on, ->(datetime) { where('start_at >= ? AND start_at < ?', datetime.beginning_of_day, datetime.tomorrow.beginning_of_day + 1) } scope :past, ->(datetime) { where('end_at <= ?', Time.zone.parse(datetime).beginning_of_day) } scope :upcoming, ->(datetime) { where('start_at >= ?', Time.zone.parse(datetime).beginning_of_day) }
use joins in closing_days scope
next-l_enju_event
train
rb
82a2a2e85ccd9f83455b211ac2a7c7c887ffb9bd
diff --git a/pkg/action/action.go b/pkg/action/action.go index <HASH>..<HASH> 100644 --- a/pkg/action/action.go +++ b/pkg/action/action.go @@ -272,6 +272,7 @@ func (cfg *Configuration) getCapabilities() (*chartutil.Capabilities, error) { Major: kubeVersion.Major, Minor: kubeVersion.Minor, }, + HelmVersion: chartutil.DefaultCapabilities.HelmVersion, } return cfg.Capabilities, nil }
Populate Capabilities.HelmVersion during install
helm_helm
train
go
d65a9f5ad0cebb2ddfaefd148165a9c05e48dc17
diff --git a/examples/qr/app.py b/examples/qr/app.py index <HASH>..<HASH> 100755 --- a/examples/qr/app.py +++ b/examples/qr/app.py @@ -9,6 +9,15 @@ from cocaine.server.worker import Worker __author__ = 'Evgeny Safronov <[email protected]>' +""" +This example shows how to make simple HTTP Cocaine application using Cocaine Python Framework. + +After waiting for http request, we read it and get some message from query string (?message=...). Then QR code +generation comes into. +Generated image is sending back via `response` stream. +""" + + @http def generate(request, response): request = yield request.read()
A bit documentation has been written for QR HTTP example.
cocaine_cocaine-framework-python
train
py
4e324884fc4b7d0f6bd659feea74dc040a581b7d
diff --git a/src/Codeception/Util/Stub.php b/src/Codeception/Util/Stub.php index <HASH>..<HASH> 100644 --- a/src/Codeception/Util/Stub.php +++ b/src/Codeception/Util/Stub.php @@ -247,7 +247,7 @@ class Stub * ?> * ``` * - * To replace method provide it's name as a key in second parameter and it's return value or callback function as parameter + * To replace method provide it's name as a key in third parameter and it's return value or callback function as parameter * * ``` php * <?php @@ -297,7 +297,7 @@ class Stub * ?> * ``` * - * To replace method provide it's name as a key in second parameter and it's return value or callback function as parameter + * To replace method provide it's name as a key in third parameter and it's return value or callback function as parameter * * ``` php * <?php @@ -351,7 +351,7 @@ class Stub * ?> * ``` * - * To replace method provide it's name as a key in second parameter and it's return value or callback function as parameter + * To replace method provide it's name as a key in third parameter and it's return value or callback function as parameter * * ``` php * <?php @@ -726,4 +726,4 @@ class ConsecutiveMap { return $this->consecutiveMap; } -} \ No newline at end of file +}
Fix Stub construct* method docstring
Codeception_base
train
php
07d11e1b242a0f25f1c4c5119c25dcb5eaceabf9
diff --git a/lib/bcx/client.rb b/lib/bcx/client.rb index <HASH>..<HASH> 100644 --- a/lib/bcx/client.rb +++ b/lib/bcx/client.rb @@ -2,6 +2,11 @@ module Bcx class Client < Rapidash::Client extension :json + raise_errors + # Add error handling with Faraday + # https://github.com/pengwynn/octokit/blob/master/lib/octokit/error.rb + # https://github.com/pengwynn/octokit/blob/master/spec/helper.rb + resource :projects, class_name: 'Bcx::Resources::Project' resource :todolists, class_name: 'Bcx::Resources::Todolist'
Raise error on failure. Add notes about error handling
paulspringett_bcx
train
rb
71edbdb044ee48acf0b87782877fe9ffc654da4f
diff --git a/Classes/Mvc/Controller/CommandController.php b/Classes/Mvc/Controller/CommandController.php index <HASH>..<HASH> 100644 --- a/Classes/Mvc/Controller/CommandController.php +++ b/Classes/Mvc/Controller/CommandController.php @@ -11,6 +11,10 @@ namespace Helhum\Typo3Console\Mvc\Controller; * The TYPO3 project - inspiring people to share! * * */ +use Helhum\Typo3Console\Log\Writer\ConsoleWriter; +use Psr\Log\LoggerInterface; +use TYPO3\CMS\Core\Log\Logger; +use TYPO3\CMS\Core\Log\LogLevel; use TYPO3\CMS\Extbase\Mvc\Cli\Request; use TYPO3\CMS\Extbase\Mvc\Cli\Response; use TYPO3\CMS\Extbase\Mvc\Controller\CommandControllerInterface; @@ -522,4 +526,19 @@ class CommandController implements CommandControllerInterface { return $this->tableHelper; } + /** + * Creates a logger which outputs to the console + * + * @param int $minimumLevel Minimum log level that should trigger output + * @param array $options Additional options for the console writer + * @return LoggerInterface + */ + protected function createDefaultLogger($minimumLevel = LogLevel::DEBUG, $options = array()) { + $options['output'] = $this->output; + $logger = new Logger(get_class($this)); + $logger->addWriter($minimumLevel, new ConsoleWriter($options)); + + return $logger; + } + }
[FEATURE] Add logger creation to API
TYPO3-Console_TYPO3-Console
train
php
e967eb5e9c8a74c15bea8d4e225b68113bd6b96d
diff --git a/lib/jsdom/level2/core.js b/lib/jsdom/level2/core.js index <HASH>..<HASH> 100644 --- a/lib/jsdom/level2/core.js +++ b/lib/jsdom/level2/core.js @@ -116,6 +116,10 @@ core.Node.prototype.__defineSetter__("prefix", function(value) { ns.validate(value, this._namespaceURI); + if (this._localName) { + this._nodeName = value + ':' + this._localName; + } + this._prefix = value; }); @@ -210,8 +214,8 @@ core.Node.prototype.__defineSetter__("qualifiedName", function(qualifiedName) { ns.validate(qualifiedName, this._namespaceURI); qualifiedName = qualifiedName || ""; this._localName = qualifiedName.split(":")[1] || null; - this.prefix = qualifiedName.split(":")[0] || null; - this._qualifiedName = qualifiedName; + this.prefix = qualifiedName.split(":")[0] || null; + this._nodeName = qualifiedName; }); core.NamedNodeMap.prototype._map = function(fn) { @@ -463,7 +467,7 @@ core.Document.prototype.createElementNS = function(/* string */ namespaceURI, element = this.createElement(qualifiedName), element._namespaceURI = namespaceURI; - element._qualifiedName = qualifiedName; + element._nodeName = qualifiedName; element._localName = parts.pop();
FIXED: qualifiedName/prefix calculation (now uses nodeName)
jsdom_jsdom
train
js
041f5e3ea4e22a8697e063c9d34e6297eb63cb39
diff --git a/lib/discordrb/webhooks/embeds.rb b/lib/discordrb/webhooks/embeds.rb index <HASH>..<HASH> 100644 --- a/lib/discordrb/webhooks/embeds.rb +++ b/lib/discordrb/webhooks/embeds.rb @@ -111,7 +111,7 @@ module Discordrb::Webhooks @icon_url = icon_url end - # @return A has representation of this embed footer, to be converted to JSON. + # @return A hash representation of this embed footer, to be converted to JSON. def to_hash { text: @text,
:anchor: Fix a typo
meew0_discordrb
train
rb
f73b7a83e8ec9864ca482aa338f7f17f4ef00061
diff --git a/dist/lity.js b/dist/lity.js index <HASH>..<HASH> 100644 --- a/dist/lity.js +++ b/dist/lity.js @@ -134,7 +134,7 @@ } function error(msg) { - return $('<span class="lity-error"/>').append(msg); + return $('<span class="lity-error"></span>').append(msg); } function imageHandler(target, instance) { @@ -176,7 +176,7 @@ return false; } - placeholder = $('<i style="display:none !important"/>'); + placeholder = $('<i style="display:none !important"></i>'); hasHideClass = el.hasClass('lity-hide'); instance diff --git a/src/lity.js b/src/lity.js index <HASH>..<HASH> 100644 --- a/src/lity.js +++ b/src/lity.js @@ -131,7 +131,7 @@ } function error(msg) { - return $('<span class="lity-error"/>').append(msg); + return $('<span class="lity-error"></span>').append(msg); } function imageHandler(target, instance) { @@ -173,7 +173,7 @@ return false; } - placeholder = $('<i style="display:none !important"/>'); + placeholder = $('<i style="display:none !important"></i>'); hasHideClass = el.hasClass('lity-hide'); instance
Compatibility with jQuery <I>
jsor_lity
train
js,js
1d13193480aee0b731bff65c558059c06cf2ea6f
diff --git a/src/Asana/Resources/Gen/ProjectsBase.php b/src/Asana/Resources/Gen/ProjectsBase.php index <HASH>..<HASH> 100644 --- a/src/Asana/Resources/Gen/ProjectsBase.php +++ b/src/Asana/Resources/Gen/ProjectsBase.php @@ -67,7 +67,7 @@ class ProjectsBase return $this->client->getCollection($path, $params, $options); } - public function getTasksInProject($project, $params = array(), $options = array()) + public function tasks($project, $params = array(), $options = array()) { $path = sprintf("/projects/%d/tasks", $project); return $this->client->getCollection($path, $params, $options);
Deploy from asana-api-meta <I>
Asana_php-asana
train
php
bfc14e86fc3d24dda70e1cb72b828f14b979fd1c
diff --git a/jquery.datetimepicker.js b/jquery.datetimepicker.js index <HASH>..<HASH> 100644 --- a/jquery.datetimepicker.js +++ b/jquery.datetimepicker.js @@ -1453,6 +1453,9 @@ } } var onejan = new Date(datetime.getFullYear(), 0, 1); + //First week of the year is th one with the first Thursday according to ISO8601 + if(onejan.getDay()!=4) + onejan.setMonth(0, 1 + ((4 - onejan.getDay()+ 7) % 7)); return Math.ceil((((datetime - onejan) / 86400000) + onejan.getDay() + 1) / 7); };
Adjust getWeekOfYear to ISO<I> standard First week of the year is th one with the first Thursday according to ISO<I>
xdan_datetimepicker
train
js
12150fbfb47a517e9ddf78813bf355a03b80d8e8
diff --git a/lib/ezsession/classes/ezpsessionhandlerdb.php b/lib/ezsession/classes/ezpsessionhandlerdb.php index <HASH>..<HASH> 100644 --- a/lib/ezsession/classes/ezpsessionhandlerdb.php +++ b/lib/ezsession/classes/ezpsessionhandlerdb.php @@ -156,9 +156,9 @@ class ezpSessionHandlerDB extends ezpSessionHandler { $oldSessionId = session_id(); session_regenerate_id(); - $sessionId = session_id(); + $newSessionId = session_id(); - ezpEvent::getInstance()->notify( 'session/regenerate', array( $oldSessionId, $sessionId ) ); + ezpEvent::getInstance()->notify( 'session/regenerate', array( $oldSessionId, $newSessionId ) ); if ( $updateBackendData ) { @@ -169,7 +169,7 @@ class ezpSessionHandlerDB extends ezpSessionHandler } $escOldKey = $db->escapeString( $oldSessionId ); - $escNewKey = $db->escapeString( $sessionId ); + $escNewKey = $db->escapeString( $newSessionId ); $escUserID = $db->escapeString( eZSession::userID() ); eZSession::triggerCallback( 'regenerate_pre', array( $db, $escNewKey, $escOldKey, $escUserID ) );
Sync session/regenerate event call in db session with php one
ezsystems_ezpublish-legacy
train
php
60c7c928d5aad76506d19eac85d310478c63c44f
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index <HASH>..<HASH> 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -63,7 +63,7 @@ end # simplicity tail for logfile # @result (Array) chomped element -def tail_logfile(n = 10, file = fake_file.path) +def tail_logfile(file = fake_file.path, n = 10) result = File.read(file) result.split("\n").last(n).map(&:chomp) end
[modify] #tail_logfile argument order changed.
k-ta-yamada_tee_logger
train
rb
3842cb16ba795c01f3cb4a7f70101097c7cc306e
diff --git a/src/Query/ReadQuery.php b/src/Query/ReadQuery.php index <HASH>..<HASH> 100644 --- a/src/Query/ReadQuery.php +++ b/src/Query/ReadQuery.php @@ -24,4 +24,14 @@ class ReadQuery extends Query { return $this->get()->first(); } + + /** + * Count the records matching the query conditions + * + * @return int + */ + public function count() + { + return $this->get()->count(); + } } \ No newline at end of file diff --git a/tests/ReadTest.php b/tests/ReadTest.php index <HASH>..<HASH> 100644 --- a/tests/ReadTest.php +++ b/tests/ReadTest.php @@ -98,7 +98,6 @@ class ReadTest extends FlatbaseTestCase ->where('age', '==', 24) ->where('name', '==', 'Adam') ->get()->count(); - $this->assertEquals($count, 1); } @@ -117,6 +116,12 @@ class ReadTest extends FlatbaseTestCase $this->assertEquals($collection->count(), 4); } + public function testSelfExecutionWithCount() + { + $flatbase = $this->getFlatbaseWithSampleData(); + $this->assertEquals($flatbase->read()->in('users')->count(), 4); + } + public function testSelfExecutionWithGet() { $flatbase = $this->getFlatbaseWithSampleData();
Added ReadQuery::count()
adamnicholson_flatbase
train
php,php
f956462585c2c07c8541e4daa1353ab0a6341c53
diff --git a/src/layout/layout.js b/src/layout/layout.js index <HASH>..<HASH> 100644 --- a/src/layout/layout.js +++ b/src/layout/layout.js @@ -281,14 +281,6 @@ } } - /** - * Prevents an event from triggering the default behaviour. - * @param {Event} ev the event to eat. - */ - var eatEvent = function(ev) { - ev.preventDefault(); - }; - // Add drawer toggling button to our layout, if we have an openable drawer. if (this.drawer_) { var drawerButton = this.element_.querySelector('.' + @@ -319,8 +311,6 @@ // not be present. this.element_.classList.add(this.CssClasses_.HAS_DRAWER); - this.drawer_.addEventListener('mousewheel', eatEvent); - // If we have a fixed header, add the button to the header rather than // the layout. if (this.element_.classList.contains(this.CssClasses_.FIXED_HEADER)) { @@ -334,7 +324,6 @@ this.element_.appendChild(obfuscator); obfuscator.addEventListener('click', this.drawerToggleHandler_.bind(this)); - obfuscator.addEventListener('mousewheel', eatEvent); this.obfuscator_ = obfuscator; }
Remove eat function from layout (Closes #<I>)
material-components_material-components-web
train
js
7a7ffd349213ff671db49b277c259204e1ebf1f4
diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php index <HASH>..<HASH> 100644 --- a/system/src/Grav/Common/Language/Language.php +++ b/system/src/Grav/Common/Language/Language.php @@ -374,6 +374,7 @@ class Language { if (is_array($args)) { $lookup = array_shift($args); + $languages = array_shift($args); } else { $lookup = $args; $args = [];
fix Twig dynamic translation (#<I>) * fix Twig dynamic translation * fix Twig dynamic translation
getgrav_grav
train
php
f6d6ca5da3349c1cddba665809775d8bb27fea8c
diff --git a/root.go b/root.go index <HASH>..<HASH> 100644 --- a/root.go +++ b/root.go @@ -12,8 +12,8 @@ var root = ` ; on server FTP.INTERNIC.NET ; -OR- RS.INTERNIC.NET ; -; last update: November 05, 2014 -; related version of root zone: 2014110501 +; last update: May 23, 2015 +; related version of root zone: 2015052300 ; ; formerly NS.INTERNIC.NET ;
latest root zone file (no changes)
domainr_dnsr
train
go
bfb6974460b2629f5b384205b2830c56bde1e326
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -282,7 +282,7 @@ function runBrowsers(options, emitter, done) { if (error) errors.push(error); numDone = numDone + 1; if (numDone === options.browsers.length) { - done(errors.length > 0 ? errors.join(' '): null); + done(errors.length > 0 ? _.unique(errors).join(', '): null); } }); });
Only show unique errors, so things are less confusing
Polymer_web-component-tester
train
js
fefbf343f5569bd81594d49ace5dc14c709503d8
diff --git a/api-remove.go b/api-remove.go index <HASH>..<HASH> 100644 --- a/api-remove.go +++ b/api-remove.go @@ -71,6 +71,13 @@ func (c Client) RemoveObject(bucketName, objectName string) error { if err != nil { return err } + if resp != nil { + // if some unexpected error happened and max retry is reached, we want to let client know + if resp.StatusCode != http.StatusNoContent { + return httpRespToErrorResponse(resp, bucketName, objectName) + } + } + // DeleteObject always responds with http '204' even for // objects which do not exist. So no need to handle them // specifically.
fix max retry issue in RemoveObject() (#<I>)
minio_minio-go
train
go
198c49a1dbda25bd725d3f7499dc71da20b30bb7
diff --git a/src/Console/Shell.php b/src/Console/Shell.php index <HASH>..<HASH> 100644 --- a/src/Console/Shell.php +++ b/src/Console/Shell.php @@ -137,7 +137,7 @@ class Shell * Contains tasks to load and instantiate * * @var array|bool - * @link https://book.cakephp.org/4/en/console-and-shells.html#Shell::$tasks + * @link https://book.cakephp.org/4/en/console-commands/shells.html#shell-tasks */ public $tasks = []; @@ -181,7 +181,7 @@ class Shell * * @param \Cake\Console\ConsoleIo|null $io An io instance. * @param \Cake\ORM\Locator\LocatorInterface|null $locator Table locator instance. - * @link https://book.cakephp.org/4/en/console-and-shells.html#Shell + * @link https://book.cakephp.org/4/en/console-commands/shells.html */ public function __construct(?ConsoleIo $io = null, ?LocatorInterface $locator = null) {
Use correct link to doc page The link to the doc is not correct. I was checking the class to upgrade my code to use command class and noticed this.
cakephp_cakephp
train
php
8ffac5b92b5947b6c15540a7ebb61ac4c7f0d50f
diff --git a/raven/scripts/runner.py b/raven/scripts/runner.py index <HASH>..<HASH> 100644 --- a/raven/scripts/runner.py +++ b/raven/scripts/runner.py @@ -8,6 +8,7 @@ raven.scripts.runner from __future__ import absolute_import +import getpass import logging import os import sys @@ -30,7 +31,7 @@ def main(): print " ", dsn print - client = Client(dsn) + client = Client(dsn, include_paths=['raven']) print "Client configuration:" for k in ('servers', 'project', 'public_key', 'secret_key'): @@ -42,7 +43,18 @@ def main(): sys.exit(1) print 'Sending a test message...', - ident = client.get_ident(client.captureMessage('This is a test message generated using ``raven test``')) + ident = client.get_ident(client.captureMessage( + message='This is a test message generated using ``raven test``', + data={ + 'culprit': 'raven.scripts.runner', + 'logger': 'raven.test', + }, + stack=True, + extra={ + 'user': os.getlogin(), + 'loadavg': os.getloadavg(), + } + )) print 'success!' print print 'The test message can be viewed at the following URL:'
Make raven test a bit more useful (for examples)
elastic_apm-agent-python
train
py
3a277dcb4645caba1ca13a3759e269c968438513
diff --git a/src/ZfcRbac/Provider/AbstractProvider.php b/src/ZfcRbac/Provider/AbstractProvider.php index <HASH>..<HASH> 100644 --- a/src/ZfcRbac/Provider/AbstractProvider.php +++ b/src/ZfcRbac/Provider/AbstractProvider.php @@ -21,7 +21,8 @@ abstract class AbstractProvider implements ProviderInterface } foreach ((array) $roles[$parentName] as $role) { if ($parentName) { - $rbac->getRole($parentName)->addChild($role); + $childRole = $rbac->hasRole($role) ? $rbac->getRole($role) : $role; + $rbac->getRole($parentName)->addChild($childRole); } else { $rbac->addRole($role); }
Fixed AbstractProvider, add a child role as an instance from the rbac, if it has that role
ZF-Commons_zfc-rbac
train
php
51f8ee0e9071695ef909077d3b51081225a4bda9
diff --git a/bakery/project/models.py b/bakery/project/models.py index <HASH>..<HASH> 100644 --- a/bakery/project/models.py +++ b/bakery/project/models.py @@ -20,7 +20,6 @@ import os from flask import current_app, json from ..decorators import lazy_property from ..extensions import db -from ..tasks import sync_and_process from ..tasks import sync_and_process, prun import magic @@ -242,6 +241,11 @@ class Project(db.Model): revision = self.current_revision() sync_and_process.ctx_delay(self, process = True, sync = True) + + def pull(self): + project_git_sync.ctx_delay(self, ) + + class ProjectBuild(db.Model): __tablename__ = 'project_build' __table_args__ = {'sqlite_autoincrement': True} @@ -253,3 +257,4 @@ class ProjectBuild(db.Model): is_success = db.Column(db.Boolean()) created = db.Column(db.DateTime, default=datetime.now) +
Moved out pull method, isn't connected to anything in the code
googlefonts_fontbakery
train
py
220dd330306d76b7ff13baa07abf461688c92fc1
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java index <HASH>..<HASH> 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/resources/Resource.java @@ -205,13 +205,19 @@ public abstract class Resource<PARENT extends Resource> { return this; } + /** + * @deprecated since 2.6 should use SensorContext#isExcluded(resource). It will make inheritance of Resource easier. + */ + @Deprecated public final boolean isExcluded() { return isExcluded; } /** * Internal use only + * @deprecated since 2.6 should use SensorContext#isExcluded(resource). It will make inheritance of Resource easier. */ + @Deprecated public final Resource setExcluded(boolean b) { isExcluded = b; return this;
Deprecate Resource#isExcluded(), replaced by SensorContext#isExcluded(Resource). It makes inheritance of Resource easier.
SonarSource_sonarqube
train
java
8e69bbd92e940867557e5fb70c73807d910ea579
diff --git a/src/rinoh/backend/pdf/cos.py b/src/rinoh/backend/pdf/cos.py index <HASH>..<HASH> 100644 --- a/src/rinoh/backend/pdf/cos.py +++ b/src/rinoh/backend/pdf/cos.py @@ -358,7 +358,7 @@ class Dictionary(Container, OrderedDict): get = convert_key_to_name(OrderedDict.get) - setdefault = convert_key_to_name(OrderedDict.setdefault) + setdefault = convert_key_to_name(OrderedDict.setdefault) # PyPy def _bytes(self, document): return b' '.join(key.bytes(document) + b' ' + value.bytes(document)
This is an issue for PyPy<I>-<I>, not CPython <I>
brechtm_rinohtype
train
py
03f0bbe836b7430981575397c6471f3f8a8611ac
diff --git a/test/test.js b/test/test.js index <HASH>..<HASH> 100644 --- a/test/test.js +++ b/test/test.js @@ -1,5 +1,5 @@ var assert = require('assert'); -var tjs = require('../TeslaJS.min'); +var tjs = require('../TeslaJS'); require('sepia'); // be sure to set these to fake values in your environment before testing
switch tests back to non-minified version
mseminatore_TeslaJS
train
js
3976b399973e1fba6d435d5b65cd195e1b644d44
diff --git a/src/Middleware/Request/RequestedFields.php b/src/Middleware/Request/RequestedFields.php index <HASH>..<HASH> 100644 --- a/src/Middleware/Request/RequestedFields.php +++ b/src/Middleware/Request/RequestedFields.php @@ -40,7 +40,11 @@ class RequestedFields implements StageInterface } if (!empty($fields)) { - $request->setRequestedFields((array) $fields); + $payload = new Payload( + $payload->getSubject(), + $request->withRequestedFields((array)$fields), + $payload->getResponse() + ); } return $payload;
Construct Payload with new fields, if supplied
refinery29_piston
train
php
414f5749e65f6636de53b79347c099bf050c01df
diff --git a/blockstack_cli_0.14.1/blockstore_client/blockstore_cli.py b/blockstack_cli_0.14.1/blockstore_client/blockstore_cli.py index <HASH>..<HASH> 100644 --- a/blockstack_cli_0.14.1/blockstore_client/blockstore_cli.py +++ b/blockstack_cli_0.14.1/blockstore_client/blockstore_cli.py @@ -759,8 +759,8 @@ def run_cli(): result['server'] = conf['server'] + ':' + str(conf['port']) result['server_version'] = resp['blockstore_version'] result['cli_version'] = config.VERSION - result['blocks'] = "(%s, %s)" % (resp['last_block'], resp['bitcoind_blocks']) - result['consensus'] = resp['consensus'] + result['blocks'] = str([resp['last_block'], resp['bitcoind_blocks']]) + result['consensus_hash'] = resp['consensus'] if advanced_mode == 'on': result['testset'] = resp['testset']
changed to consensys_hash and blocks is a list (str encoded on purpose because otherwise it takes too much space in the output and breaks to multiple lines)
blockstack_blockstack-core
train
py
98252668333e85476dfcc7c351fdc928cfdf295a
diff --git a/test/flows.spec.js b/test/flows.spec.js index <HASH>..<HASH> 100644 --- a/test/flows.spec.js +++ b/test/flows.spec.js @@ -407,19 +407,6 @@ describe('Flows', function() { }); }); - describe('Creating a ThreeDSecure object', function() { - it('Allows me to do so', function() { - return expect( - stripe.threeDSecure.create({ - card: 'tok_visa', - amount: 1500, - currency: 'usd', - return_url: 'https://example.org/3d-secure-result', - }) - ).to.eventually.have.property('object', 'three_d_secure'); - }); - }); - describe('Request/Response Events', function() { var connectedAccountId;
Remove old 3DS test to ensure test suite keep working
stripe_stripe-node
train
js
1313cf93c9c620c560208aa75fe0f09185e1c101
diff --git a/api/src/test/java/com/messagebird/SpyService.java b/api/src/test/java/com/messagebird/SpyService.java index <HASH>..<HASH> 100644 --- a/api/src/test/java/com/messagebird/SpyService.java +++ b/api/src/test/java/com/messagebird/SpyService.java @@ -108,7 +108,7 @@ class SpyService<P> { * @return Intermediate SpyService that can be finalized through * andReturns(). */ - public SpyService withRestAPIBaseURL() { + SpyService withRestAPIBaseURL() { return withBaseURL(REST_API_BASE_URL); }
Change withRestAPIBaseURL() access to package-private
messagebird_java-rest-api
train
java
739ca770bbfc3dc58709bf3d7e6acbd8cc0655dd
diff --git a/src/rezplugins/release_vcs/hg.py b/src/rezplugins/release_vcs/hg.py index <HASH>..<HASH> 100644 --- a/src/rezplugins/release_vcs/hg.py +++ b/src/rezplugins/release_vcs/hg.py @@ -212,7 +212,15 @@ class HgReleaseVCS(ReleaseVCS): if prev_commit: # git behavior is to simply print the log from the last common # ancsestor... which is apparently desired. so we'll mimic that - commit_range = "ancestor(%s, .)::." % prev_commit + + # however, we want to print in order from most recent to oldest, + # because: + # a) if the log gets truncated, we want to cut off the + # oldest commits, not the current one, and + # b) this mimics the order they're printed in git + # c) this mimics the order they're printed if you have no + # previous_revision, and just do "hg log" + commit_range = "reverse(ancestor(%s, .)::.)" % prev_commit stdout = self.hg("log", "-r", commit_range) else: stdout = self.hg("log")
hg: print log from most recent to oldest, so don't truncate current commit
nerdvegas_rez
train
py
79f347a8109aa606cdc5a1596ab01fd1a606a32d
diff --git a/clonevirtualenv.py b/clonevirtualenv.py index <HASH>..<HASH> 100644 --- a/clonevirtualenv.py +++ b/clonevirtualenv.py @@ -46,11 +46,12 @@ def _dirmatch(path, matchwith): def _virtualenv_sys(venv_path): "obtain version and path info from a virtualenv." executable = os.path.join(venv_path, 'bin', 'python') - p = subprocess.Popen(['python', + # Must use "executable" as the first argument rather than as the + # keyword argument "executable" to get correct value from sys.path + p = subprocess.Popen([executable, '-c', 'import sys;' 'print (sys.version[:3]);' 'print ("\\n".join(sys.path));'], - executable=executable, env={}, stdout=subprocess.PIPE) stdout, err = p.communicate()
Use executable as the first argument in _virtualenv_sys
edwardgeorge_virtualenv-clone
train
py
bd3bf361391d07fcaa4b938ed3a8dbdbe13419a4
diff --git a/test/conformist/definition_test.rb b/test/conformist/definition_test.rb index <HASH>..<HASH> 100644 --- a/test/conformist/definition_test.rb +++ b/test/conformist/definition_test.rb @@ -2,7 +2,7 @@ require 'helper' class DefinitionTest < MiniTest::Unit::TestCase def test_initialize - definition = Conformist::Definition.new + definition = Definition.new assert_empty definition.columns end end diff --git a/test/helper.rb b/test/helper.rb index <HASH>..<HASH> 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -4,6 +4,8 @@ require 'conformist' require 'definitions/acma' require 'definitions/fcc' +include Conformist + def stub_row ('a'..'d').to_a end
Don't need to be explicit about the namespace
tatey_conformist
train
rb,rb
81560a139b0b07def52dd8af9bab71019ccc7743
diff --git a/lib/topsy/page.rb b/lib/topsy/page.rb index <HASH>..<HASH> 100755 --- a/lib/topsy/page.rb +++ b/lib/topsy/page.rb @@ -13,6 +13,7 @@ module Topsy class Page < Hashie::Dash property :total + property :trackback_total property :list property :page property :perpage diff --git a/test/fixtures/trackbacks.json b/test/fixtures/trackbacks.json index <HASH>..<HASH> 100644 --- a/test/fixtures/trackbacks.json +++ b/test/fixtures/trackbacks.json @@ -9,6 +9,7 @@ }, "response": { "page": 1, + "trackback_total": 3, "total": 3, "perpage": 10, "topsy_trackback_url": "http://topsy.com/tb/orrka.com/", diff --git a/test/test_topsy.rb b/test/test_topsy.rb index <HASH>..<HASH> 100644 --- a/test/test_topsy.rb +++ b/test/test_topsy.rb @@ -182,6 +182,7 @@ class TestTopsy < Test::Unit::TestCase results = Topsy.trackbacks("http://orrka.com") results.class.should == Topsy::Page results.total.should == 3 + results.trackback_total.should == 3 results.list.first.date.year.should == 2009 results.list.first.permalink_url.should == "http://twitter.com/orrka/status/6435248067" results.list.first.date.should == Time.at(1260204073)
Added trackback_total property to Page
pengwynn_topsy
train
rb,json,rb
abca271c2fea22ffef8f476d3e006f059ebdbe8c
diff --git a/src/Viserio/Component/Contracts/Cron/Cron.php b/src/Viserio/Component/Contracts/Cron/Cron.php index <HASH>..<HASH> 100644 --- a/src/Viserio/Component/Contracts/Cron/Cron.php +++ b/src/Viserio/Component/Contracts/Cron/Cron.php @@ -223,8 +223,8 @@ interface Cron /** * Schedule the event to run twice monthly. * - * @param int $first - * @param int $second + * @param int $first + * @param int $second * * @return $this */ diff --git a/src/Viserio/Component/Cron/Cron.php b/src/Viserio/Component/Cron/Cron.php index <HASH>..<HASH> 100644 --- a/src/Viserio/Component/Cron/Cron.php +++ b/src/Viserio/Component/Cron/Cron.php @@ -473,7 +473,7 @@ class Cron implements CronContract */ public function twiceMonthly(int $first = 1, int $second = 16): CronContract { - $days = $first.','.$second; + $days = $first . ',' . $second; return $this->spliceIntoPosition(1, 0) ->spliceIntoPosition(2, 0)
Apply fixes from StyleCI (#<I>)
narrowspark_framework
train
php,php
2b72a3225510641cbbbbd39ef06a9936035e0345
diff --git a/lib/ronin/wordlist.rb b/lib/ronin/wordlist.rb index <HASH>..<HASH> 100644 --- a/lib/ronin/wordlist.rb +++ b/lib/ronin/wordlist.rb @@ -87,8 +87,7 @@ module Ronin raise(TypeError,"wordlist must be a path or Enumerable") end - @mutations = {} - @mutations.merge!(mutations) + @mutations = mutations yield self if block_given? end
Removed unnecessary Hash#merge!.
ronin-ruby_ronin-support
train
rb
67574bdae4173adb69243d4ea6e98b6d5e81c390
diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestSubscription.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestSubscription.java index <HASH>..<HASH> 100644 --- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestSubscription.java +++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/TestSubscription.java @@ -298,7 +298,7 @@ public class TestSubscription extends TestIntegrationBase { // No CREATE event as this is set in the future final Entitlement createdEntitlement = entitlementApi.createBaseEntitlement(account.getId(), spec, account.getExternalKey(), null, futureDate, ImmutableList.<PluginProperty>of(), callContext); - assertEquals(createdEntitlement.getState(), EntitlementState.ACTIVE); + assertEquals(createdEntitlement.getState(), EntitlementState.PENDING); assertEquals(createdEntitlement.getEffectiveStartDate().compareTo(futureDate), 0); assertEquals(createdEntitlement.getEffectiveEndDate(), null); assertListenerStatus();
Fix beatrix test tied to change in <I>b<I>d<I>bf2d<I>a<I>c<I>e0f<I>dbd6
killbill_killbill
train
java
af718aae83ced2278aa2e1c6152c778a2b1ac144
diff --git a/test/youtube-dl/runner_test.rb b/test/youtube-dl/runner_test.rb index <HASH>..<HASH> 100644 --- a/test/youtube-dl/runner_test.rb +++ b/test/youtube-dl/runner_test.rb @@ -21,6 +21,21 @@ describe YoutubeDL::Runner do assert_match 'youtube-dl', @runner.executable_path end + it 'should detect system youtube-dl' do + vendor_bin = File.join(Dir.pwd, 'vendor', 'bin', 'youtube-dl') + Dir.mktmpdir do |tmpdir| + FileUtils.cp vendor_bin, tmpdir + + old_path = ENV["PATH"] + ENV["PATH"] = "#{tmpdir}:#{old_path}" + + runner_usable_path = @runner.send(:usable_executable_path) + assert_match runner_usable_path, "#{tmpdir}/youtube-dl" + + ENV["PATH"] = old_path + end + end + it 'should not have a newline char in the executable_path' do assert_match /youtube-dl\z/, @runner.executable_path end
Added test to detect system youtube-dl
layer8x_youtube-dl.rb
train
rb
0b9c0877c2b5c9787436b0d9a2f881a7ffb91026
diff --git a/billy/web/public/viewdata/blurbs.py b/billy/web/public/viewdata/blurbs.py index <HASH>..<HASH> 100644 --- a/billy/web/public/viewdata/blurbs.py +++ b/billy/web/public/viewdata/blurbs.py @@ -6,6 +6,7 @@ def bio_blurb(legislator): return render_to_string('billy/web/public/bio_blurb.html', dict(legislator=legislator)) else: + raise NotImplementedError('Bio blurbs for inactive legislators don\t work yet.') for role in legislator.old_roles_manager(): import pdb;pdb.set_trace() return render_to_string('billy/web/public/bio_blurb_inactive.html',
public: temporarily throw error for inactive leg bio blurbs
openstates_billy
train
py
d5fae8ff26ff9a5cc0def88e663e9bd12418b5a0
diff --git a/test/unit/test_utils.py b/test/unit/test_utils.py index <HASH>..<HASH> 100644 --- a/test/unit/test_utils.py +++ b/test/unit/test_utils.py @@ -159,6 +159,15 @@ class RedirectUrlResolverTest(unittest.TestCase): self._test_get_locations(history[0], expected) @parameterized.expand([ + [ConnectionError], + [InvalidSchema], + [Timeout], + ]) + def test_get_locations_arg_raising(self, exception_type): + self.head_mock.side_effect = exception_type + self._test_get_locations('http://error_source', []) + + @parameterized.expand([ ( 'initial_url_causing_timeout', no_redirect_url_chain,
Add missing test method to RedirectUrlResolver tests The new parameterized test method tests RedirectUrlResolver.get_locations method for its argument causing ConnectionError, InvalidSchema or Timeout errors.
piotr-rusin_spam-lists
train
py
42081549401259dd6f7113c02fe70b0f0c7140f8
diff --git a/flask_pusher.py b/flask_pusher.py index <HASH>..<HASH> 100644 --- a/flask_pusher.py +++ b/flask_pusher.py @@ -53,6 +53,7 @@ class Pusher(object): app.config.setdefault("PUSHER_HOST", '') app.config.setdefault("PUSHER_PORT", '') app.config.setdefault("PUSHER_AUTH", '/auth') + app.config.setdefault("PUSHER_SSL", False) pusher_kwargs = dict( app_id=app.config["PUSHER_APP_ID"], @@ -60,6 +61,7 @@ class Pusher(object): secret=app.config["PUSHER_SECRET"], host=app.config["PUSHER_HOST"], port=app.config["PUSHER_PORT"], + ssl=app.config["PUSHER_SSL"], ) if __v1__:
Update flask_pusher.py Added SSL config option.
iurisilvio_Flask-Pusher
train
py
848037b13cc0b44b8a41255093ea09e572577fbc
diff --git a/src/js/pannellum.js b/src/js/pannellum.js index <HASH>..<HASH> 100644 --- a/src/js/pannellum.js +++ b/src/js/pannellum.js @@ -236,7 +236,7 @@ function init() { // From http://stackoverflow.com/a/19709846 var absoluteURL = function(url) { - return new RegExp('^(?:[a-z]+:)?//', 'i').test(url); + return new RegExp('^(?:[a-z]+:)?//', 'i').test(url) | url[0] == '/'; }; // Configure image loading
Fix handling of protocol relative and site relative URLs.
mpetroff_pannellum
train
js
7e7a8f3d4eb540a70e735a4468269850a2a4be0e
diff --git a/languagetool-language-modules/fr/src/main/java/org/languagetool/language/French.java b/languagetool-language-modules/fr/src/main/java/org/languagetool/language/French.java index <HASH>..<HASH> 100644 --- a/languagetool-language-modules/fr/src/main/java/org/languagetool/language/French.java +++ b/languagetool-language-modules/fr/src/main/java/org/languagetool/language/French.java @@ -100,9 +100,9 @@ public class French extends Language { final Contributor hVoisard = new Contributor("Hugo Voisard"); hVoisard.setRemark("2006-2007"); return new Contributor[] { - new Contributor("Agnes Souque"), - hVoisard, Contributors.DOMINIQUE_PELLE, + new Contributor("Agnes Souque"), + hVoisard }; }
[fr] change order of contributors to reflect reality
languagetool-org_languagetool
train
java
cf3ee4bb926ec71b716c7d358c688a8575e631c6
diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v85/DeleteProjectAlmSettingsOrphans.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v85/DeleteProjectAlmSettingsOrphans.java index <HASH>..<HASH> 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v85/DeleteProjectAlmSettingsOrphans.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v85/DeleteProjectAlmSettingsOrphans.java @@ -34,7 +34,7 @@ public class DeleteProjectAlmSettingsOrphans extends DataChange { protected void execute(Context context) throws SQLException { MassUpdate massUpdate = context.prepareMassUpdate(); massUpdate.select("select pas.uuid from project_alm_settings pas left join " - + "projects p on pas.project_uuid = p.uuid where p.uuid is null;"); + + "projects p on pas.project_uuid = p.uuid where p.uuid is null"); massUpdate.update("delete from project_alm_settings where uuid = ?"); massUpdate.execute((row, update) -> {
SONAR-<I> Remove comma from SQL query
SonarSource_sonarqube
train
java
10751be9403d2d23d26f080184c37c6614f1f989
diff --git a/oauthutil/http_client.go b/oauthutil/http_client.go index <HASH>..<HASH> 100644 --- a/oauthutil/http_client.go +++ b/oauthutil/http_client.go @@ -15,13 +15,6 @@ import ( "golang.org/x/oauth2/google" ) -const authCodeFlagName = "oauthutil.auth_code" - -var fAuthCode = flag.String( - authCodeFlagName, - "", - "Auth code from Google developer console.") - var fDebugHttp = flag.Bool( "oauthutil.debug_http", false,
Deleted an unused flag.
jacobsa_gcloud
train
go
1a0af6d0f18990206ca976325aa6dae1073fbc18
diff --git a/gosu-core/src/main/java/gw/internal/gosu/parser/expressions/FeatureLiteral.java b/gosu-core/src/main/java/gw/internal/gosu/parser/expressions/FeatureLiteral.java index <HASH>..<HASH> 100644 --- a/gosu-core/src/main/java/gw/internal/gosu/parser/expressions/FeatureLiteral.java +++ b/gosu-core/src/main/java/gw/internal/gosu/parser/expressions/FeatureLiteral.java @@ -398,7 +398,7 @@ public class FeatureLiteral extends Expression implements IFeatureLiteralExpress if( getRoot() instanceof TypeLiteral ) { Class<ConstructorReference> clazz = ConstructorReference.class; - IType parameterizedType = TypeSystem.get( clazz ).getParameterizedType( getFinalRootType(), makeBlockType( getFinalRootType(), getParameterTypes() ) ); + IType parameterizedType = TypeSystem.get( clazz ).getParameterizedType( getFinalRootType(), makeBlockType( getFinalRootType(), getFeatureReferenceParameters() ) ); return parameterizedType; } else @@ -434,14 +434,7 @@ public class FeatureLiteral extends Expression implements IFeatureLiteralExpress { return ((IPropertyInfo)_feature).isStatic(); } - else if( _feature instanceof IConstructorInfo ) - { - return true; - } - else - { - return false; - } + else return _feature instanceof IConstructorInfo; } public IType[] getFeatureReferenceParameters() {
Properly resolve argument types for constructors.
gosu-lang_gosu-lang
train
java
170daedc5ad095eba86dcdc71657f6c04e466dc1
diff --git a/gdbgui/server/sessionmanager.py b/gdbgui/server/sessionmanager.py index <HASH>..<HASH> 100644 --- a/gdbgui/server/sessionmanager.py +++ b/gdbgui/server/sessionmanager.py @@ -89,11 +89,12 @@ class SessionManager(object): gdbgui_startup_cmds = [ f"new-ui {mi_version} {pty_for_gdbgui.name}", f"set inferior-tty {pty_for_debugged_program.name}", + "set pagination off", ] # instead of writing to the pty after it starts, add startup # commands to gdb. This allows gdb to be run as sudo and prompt for a # password, for example. - gdbgui_startup_cmds_str = " ".join([f"-ex='{c}'" for c in gdbgui_startup_cmds]) + gdbgui_startup_cmds_str = " ".join([f"-iex='{c}'" for c in gdbgui_startup_cmds]) pty_for_gdb = Pty(cmd=f"{gdb_command} {gdbgui_startup_cmds_str}") pid = pty_for_gdb.pid
Disable pagination on gdb startup (#<I>) * Disable pagination as the gdb interface freezes while it waits for the user to press 'enter' to continue. Use '-iex' rather '-ex' for the gdb startup arguments so they execute before .gdbinit is executed, in case the .gdbinit generates any output requiring paging.
cs01_gdbgui
train
py
959ee10b250169808a28b6511b85c54c0c503313
diff --git a/commands/pull_request.go b/commands/pull_request.go index <HASH>..<HASH> 100644 --- a/commands/pull_request.go +++ b/commands/pull_request.go @@ -286,7 +286,7 @@ of text is the title and the rest is the description.`, fullBase, fullHead)) message, err = git.Show(commits[0]) utils.Check(err) - re := regexp.MustCompile(`\n(Co-authored|Signed-off)-by:\s[^\n]*$`) + re := regexp.MustCompile(`\n(Co-authored|Signed-off)-by:\s[^\n]*`) message = re.ReplaceAllString(message, "") } else if len(commits) > 1 { commitLogs, err := git.Log(baseTracking, headForMessage)
Don't match end of line You can't hafe EOL multiple times on the same line...
github_hub
train
go
97278192ad8f5c440d28d5c10d6679fe521b28d5
diff --git a/resources/db/update/45.php b/resources/db/update/45.php index <HASH>..<HASH> 100644 --- a/resources/db/update/45.php +++ b/resources/db/update/45.php @@ -5,3 +5,13 @@ if (!CM_Db_Db::existsColumn('cm_ipBlocked', 'expirationStamp')) { ADD `expirationStamp` int(10) unsigned NOT NULL, ADD KEY `expirationStamp` (`expirationStamp`);"); } + +$config = CM_Config::get(); +$IpsWithoutExpirationStamp = CM_Db_Db::select('cm_ipBlocked', '*', ['expirationStamp' => 0])->fetchAll(); + +foreach ($IpsWithoutExpirationStamp as $row) { + if ($row['expirationStamp'] == 0) { + $expirationStamp = $row['createStamp'] + $config->CM_Paging_Ip_Blocked->maxAge; + CM_Db_Db::update('cm_ipBlocked', ['expirationStamp' => $expirationStamp], ['ip' => $row['ip']]); + } +}
add migration to update script to set expiration stamps
cargomedia_cm
train
php
3560211ab59eef16d3e6bdf8f71af99ff80dca01
diff --git a/release/.buildkite/build_pipeline.py b/release/.buildkite/build_pipeline.py index <HASH>..<HASH> 100644 --- a/release/.buildkite/build_pipeline.py +++ b/release/.buildkite/build_pipeline.py @@ -151,8 +151,9 @@ CORE_SCALABILITY_TESTS_DAILY = { "many_nodes", "scheduling_test_many_0s_tasks_single_node", "scheduling_test_many_0s_tasks_many_nodes", - "scheduling_test_many_5s_tasks_single_node", - "scheduling_test_many_5s_tasks_many_nodes", + # Reenable these two once we got right setup + # "scheduling_test_many_5s_tasks_single_node", + # "scheduling_test_many_5s_tasks_many_nodes", ], }
[nightly] Temporarily stops the two pipelines for scheduling until with good setup. (#<I>) Right now these two tests always run out-of-time. We disable them for now and after solid test, we'll reenable them with good parameters.
ray-project_ray
train
py
e9417be9dfa17873ce3d16ae09187d5bfffda168
diff --git a/src/_pytest/warnings.py b/src/_pytest/warnings.py index <HASH>..<HASH> 100644 --- a/src/_pytest/warnings.py +++ b/src/_pytest/warnings.py @@ -85,6 +85,7 @@ def catch_warnings_for_item(config, ihook, item): filters_configured = True if not filters_configured: + # if user is not explicitly configuring warning filters, show deprecation warnings by default (#2908) warnings.filterwarnings("always", category=DeprecationWarning) warnings.filterwarnings("always", category=PendingDeprecationWarning)
Add comment about deprecation warnings being shown by default
pytest-dev_pytest
train
py
9c0b884df78dddbd95f7bdec8890e43a752cde98
diff --git a/saltcloud/clouds/ec2.py b/saltcloud/clouds/ec2.py index <HASH>..<HASH> 100644 --- a/saltcloud/clouds/ec2.py +++ b/saltcloud/clouds/ec2.py @@ -645,9 +645,9 @@ def destroy(name, call=None): call='action', quiet=True) if protected == 'true': - print('This instance has been protected from being destroyed. Use the ' - 'following command to disable protection:\n\n' - 'salt-cloud -a disable_term_protect {0}'.format(name)) + log.error('This instance has been protected from being destroyed. ' + 'Use the following command to disable protection:\n\n' + 'salt-cloud -a disable_term_protect {0}'.format(name)) exit(1) params = {'Action': 'TerminateInstances',
Destroy error should use log, not print
saltstack_salt
train
py
e1db2a4cfd43758bc8fec574afaafd84388e6468
diff --git a/lib/motion/project/cocoapods.rb b/lib/motion/project/cocoapods.rb index <HASH>..<HASH> 100644 --- a/lib/motion/project/cocoapods.rb +++ b/lib/motion/project/cocoapods.rb @@ -239,9 +239,9 @@ module Motion::Project end namespace :pod do - desc "Update outdated pods and clear build objects" + desc "Update outdated pods and build objects" task :update do ENV['COCOCAPODS_UPDATE'] = "true" - Rake::Task["clean"].invoke + Rake::Task["build"].invoke end end \ No newline at end of file
replace invoking task to "build" in order to upgrade outdated pods Need to run `pods.install!' to upgrade outdated pods. Now, its method is called by `build' task only.
HipByte_motion-cocoapods
train
rb
af19aa4b9d391ddbe525a90e65754f3f0d157858
diff --git a/src/main/java/water/api/GLMGrid.java b/src/main/java/water/api/GLMGrid.java index <HASH>..<HASH> 100644 --- a/src/main/java/water/api/GLMGrid.java +++ b/src/main/java/water/api/GLMGrid.java @@ -63,7 +63,7 @@ public class GLMGrid extends Request { protected final RSeq _thresholds = new RSeq(Constants.DTHRESHOLDS, false, new NumberSequence("0:1:0.01",false,0.1),false); protected final Bool _parallel = new Bool(PARALLEL, true, "Build models in parallel"); - protected final Int _parallelism = new Int(JSON_PARALLELISM, 1, 256); + protected final Int _parallelism = new Int(JSON_PARALLELISM, 1, 1, 256); public GLMGrid(){ _requestHelp = "Perform grid search over GLM parameters. Calls glm with all parameter combination from user-defined parameter range. Results are ordered according to AUC. For more details see <a href='GLM.help'>GLM help</a>.";
Set default parallelism to 1 for GLM grid search. Lots of tests were failing, and forcing the user to enter a value was not needed.
h2oai_h2o-2
train
java
c3ac3104c9943255ed863fe545bb85a3db63552d
diff --git a/wallet_general.js b/wallet_general.js index <HASH>..<HASH> 100644 --- a/wallet_general.js +++ b/wallet_general.js @@ -62,6 +62,14 @@ function readMyPersonalAddresses(handleAddresses){ }); } +function readMyPersonalAndSharedAddresses(handleAddresses){ + db.query("SELECT address FROM my_addresses \n\ + UNION SELECT shared_address AS address FROM shared_addresses", function(rows){ + var arrAddresses = rows.map(function(row){ return row.address; }); + handleAddresses(arrAddresses); + }); +} + function addWatchedAddress(address, handle){ if (!handle) handle = function () { }; @@ -83,4 +91,5 @@ exports.forwardPrivateChainsToDevices = forwardPrivateChainsToDevices; exports.sendPaymentNotification = sendPaymentNotification; exports.readMyAddresses = readMyAddresses; exports.readMyPersonalAddresses = readMyPersonalAddresses; +exports.readMyPersonalAndSharedAddresses = readMyPersonalAndSharedAddresses; exports.addWatchedAddress = addWatchedAddress;
my addresses without watched addresses (#<I>)
byteball_ocore
train
js
a4f1f016831d35344ce7196e54371f8ee1569313
diff --git a/src/shorthands/position.js b/src/shorthands/position.js index <HASH>..<HASH> 100644 --- a/src/shorthands/position.js +++ b/src/shorthands/position.js @@ -53,8 +53,8 @@ export default function position( ): Styles { if (positionMap.indexOf(positionKeyword) >= 0) { return { - position: positionKeyword, ...directionalProperty('', ...values), + position: positionKeyword, } } else { const firstValue = positionKeyword // in this case position is actually the first value
Fix spread operator usage (#<I>) * Delete newfile.md * Spread first, then overwrite with position * Build(deps): Bump npm from <I> to <I> Bumps [npm](<URL>) from <I> to <I>. - [Release notes](<URL>) - [Changelog](<URL>) - [Commits](<URL>)
styled-components_polished
train
js
984d7b06e696e6c5362bd100ff48e2fe7dae17cd
diff --git a/src/Adldap/Adldap.php b/src/Adldap/Adldap.php index <HASH>..<HASH> 100644 --- a/src/Adldap/Adldap.php +++ b/src/Adldap/Adldap.php @@ -2,9 +2,9 @@ namespace Adldap; -use Adldap\Classes\AdldapSearch; use Adldap\Exceptions\AdldapException; use Adldap\Interfaces\ConnectionInterface; +use Adldap\Classes\AdldapSearch; use Adldap\Classes\AdldapUtils; use Adldap\Classes\AdldapFolders; use Adldap\Classes\AdldapExchange; @@ -13,7 +13,6 @@ use Adldap\Classes\AdldapContacts; use Adldap\Classes\AdldapUsers; use Adldap\Classes\AdldapGroups; use Adldap\Objects\Configuration; -use Adldap\Objects\LdapEntry; use Adldap\Objects\LdapSchema; use Adldap\Objects\Schema;
Organized and removed unused use statement
Adldap2_Adldap2
train
php
f622c76696ce371cc6b5c47baa9c41aa575e58cc
diff --git a/com/linuxense/javadbf/DBFReader.java b/com/linuxense/javadbf/DBFReader.java index <HASH>..<HASH> 100644 --- a/com/linuxense/javadbf/DBFReader.java +++ b/com/linuxense/javadbf/DBFReader.java @@ -101,7 +101,7 @@ public class DBFReader extends DBFBase { @Override public String toString() { - StringBuffer sb = new StringBuffer( this.header.year + "/" + this.header.month + "/" + this.header.day + "\n" + StringBuilder sb = new StringBuilder( this.header.year + "/" + this.header.month + "/" + this.header.day + "\n" + "Total records: " + this.header.numberOfRecords + "\nHeader length: " + this.header.headerLength + "");
replaces StringBuffer with StringBuilder to avoid obsolete sychronisation in a single thread
albfernandez_javadbf
train
java
fc64d80abb32775e168174c9e8b4d265fbd71861
diff --git a/dist/leaflet.canvaslayer.field.js b/dist/leaflet.canvaslayer.field.js index <HASH>..<HASH> 100644 --- a/dist/leaflet.canvaslayer.field.js +++ b/dist/leaflet.canvaslayer.field.js @@ -1276,6 +1276,7 @@ console.log('_onLayerDidMove'); var topLeft = this._map.containerPointToLayerPoint([0, 0]); L.DomUtil.setPosition(this._canvas, topLeft); + console.log(this.visibility); this.drawLayer(); }, //------------------------------------------------------------- diff --git a/src/layer/L.CanvasLayer.js b/src/layer/L.CanvasLayer.js index <HASH>..<HASH> 100644 --- a/src/layer/L.CanvasLayer.js +++ b/src/layer/L.CanvasLayer.js @@ -40,6 +40,7 @@ L.CanvasLayer = L.Layer.extend({ console.log('_onLayerDidMove'); var topLeft = this._map.containerPointToLayerPoint([0, 0]); L.DomUtil.setPosition(this._canvas, topLeft); + console.log(this.visibility); this.drawLayer(); }, //-------------------------------------------------------------
TODO. It breaks... but this can be the way, just drawing if visible (but setPosition always)
IHCantabria_Leaflet.CanvasLayer.Field
train
js,js
84976a690b5e1d8f7f0d150e36eabd3293b60525
diff --git a/contrib/externs/chrome_extensions.js b/contrib/externs/chrome_extensions.js index <HASH>..<HASH> 100644 --- a/contrib/externs/chrome_extensions.js +++ b/contrib/externs/chrome_extensions.js @@ -1360,6 +1360,19 @@ chrome.pageAction.show = function(tabId) {}; /** @type {ChromeEvent} */ chrome.pageAction.onClicked; +/** + * @const + */ +chrome.browser = {}; + + +/** + * @param {{url: string}} details An object with a single 'url' key. + * @param {function(): void} callback The callback function. If an error occurs + * opening the URL, chrome.runtime.lastError will be set to the error message. + */ +chrome.browser.openTab = function(details, callback) {}; + /** * @const
Add chrome.browser.openTab extern declaration. This API is being added in Chrome <I> (currently enabled only in dev channel). It only works in packaged apps and requires the "browser" permission. See <URL>
google_closure-compiler
train
js
18d603e72795677f9be28e33318d70e784e9b69f
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup import os -__version__ = '0.2.0' +__version__ = '0.2.1beta' def read(*paths):
Bumped version Update setup.py in an efford to make install_requires select it over PYPI
codebynumbers_ftpretty
train
py
548a585762f732b2b29418ba8106ef67d61d12fb
diff --git a/terraform/transform_resource.go b/terraform/transform_resource.go index <HASH>..<HASH> 100644 --- a/terraform/transform_resource.go +++ b/terraform/transform_resource.go @@ -862,6 +862,7 @@ func (n *graphNodeExpandedResourceDestroy) ConfigType() GraphNodeConfigType { // GraphNodeEvalable impl. func (n *graphNodeExpandedResourceDestroy) EvalTree() EvalNode { info := n.instanceInfo() + info.Id += " (destroy)" var diffApply *InstanceDiff var provider ResourceProvider
terraform: unique ID for destroying resources
hashicorp_terraform
train
go
1202f83a9cdddd2aee5da00b56d5ba4d3068cb42
diff --git a/tests/test_memcache.py b/tests/test_memcache.py index <HASH>..<HASH> 100644 --- a/tests/test_memcache.py +++ b/tests/test_memcache.py @@ -30,13 +30,13 @@ class TestMemcacheStore(BasicStore): def test_keys_throws_io_error(self, store): with pytest.raises(IOError): - self.store.keys() + store.keys() with pytest.raises(IOError): - self.store.iter_keys() + store.iter_keys() with pytest.raises(IOError): - iter(self.store) + iter(store) def test_contains_throws_io_error_or_succeeds(self, store): try:
Fixed leftover cruft from porting of memcached tests.
mbr_simplekv
train
py
d3dae8d77f8be0800dc261c7982c53a34c9fb744
diff --git a/middleware/auto/walk.go b/middleware/auto/walk.go index <HASH>..<HASH> 100644 --- a/middleware/auto/walk.go +++ b/middleware/auto/walk.go @@ -23,7 +23,7 @@ func (a Auto) Walk() error { } filepath.Walk(a.loader.directory, func(path string, info os.FileInfo, err error) error { - if info.IsDir() { + if info == nil || info.IsDir() { return nil } diff --git a/middleware/auto/walk_test.go b/middleware/auto/walk_test.go index <HASH>..<HASH> 100644 --- a/middleware/auto/walk_test.go +++ b/middleware/auto/walk_test.go @@ -52,6 +52,25 @@ func TestWalk(t *testing.T) { } } +func TestWalkNonExistent(t *testing.T) { + log.SetOutput(ioutil.Discard) + + nonExistingDir := "highly_unlikely_to_exist_dir" + + ldr := loader{ + directory: nonExistingDir, + re: regexp.MustCompile(`db\.(.*)`), + template: `${1}`, + } + + a := Auto{ + loader: ldr, + Zones: &Zones{}, + } + + a.Walk() +} + func createFiles() (string, error) { dir, err := ioutil.TempDir(os.TempDir(), "coredns") if err != nil {
middleware/auto: handle non-existent directory (#<I>) Don't panic on a non-existent directory. Add test for it as well. Fixes #<I>
coredns_coredns
train
go,go
d413244c340ab312caaee32f8e4063e0d11684d5
diff --git a/nodeconductor/cloud/backend/openstack.py b/nodeconductor/cloud/backend/openstack.py index <HASH>..<HASH> 100644 --- a/nodeconductor/cloud/backend/openstack.py +++ b/nodeconductor/cloud/backend/openstack.py @@ -410,6 +410,8 @@ class OpenStackBackend(object): ) raise CloudBackendError('Timed out waiting for instance %s to boot' % instance.uuid) + security_group_ids = instance.security_groups.values_list('security_group__backend_id', flat=True) + server = nova.servers.create( name=instance.hostname, image=backend_image, @@ -447,6 +449,7 @@ class OpenStackBackend(object): {'net-id': network['id']} ], key_name=self.get_key_name(instance.ssh_public_key), + security_groups=security_group_ids, ) instance.backend_id = server.id
Honor security groups during provisioning NC-<I>
opennode_waldur-core
train
py
dae6cf8ebe2c2eb0f7c004190c9a3d76a65df918
diff --git a/django_enumfield/validators.py b/django_enumfield/validators.py index <HASH>..<HASH> 100644 --- a/django_enumfield/validators.py +++ b/django_enumfield/validators.py @@ -1,5 +1,5 @@ from django.utils.translation import gettext as _ -import six +from django.utils import six from django_enumfield.exceptions import InvalidStatusOperationError
Use Django's bundled six version instead of requiring to install another one.
5monkeys_django-enumfield
train
py
3822ebb5d66c1648745fb3542643fde74efffaae
diff --git a/lib/vmc/plugin.rb b/lib/vmc/plugin.rb index <HASH>..<HASH> 100644 --- a/lib/vmc/plugin.rb +++ b/lib/vmc/plugin.rb @@ -21,6 +21,13 @@ module VMC enabled = Set.new(matching.collect(&:name)) + Gem.loaded_specs["vmc"].dependencies.each do |dep| + if dep.name =~ /vmc-plugin/ && dep.type == :runtime + require "#{dep.name}/plugin" + enabled.delete dep.name + end + end + # allow explicit enabling/disabling of gems via config plugins = File.expand_path(VMC::PLUGINS_FILE) if File.exists?(plugins) && yaml = YAML.load_file(plugins)
ensure dependency plugins are loaded first this allows third-party/user-installed plugins to override default commands (e.g. the dummy tunnel plugin) Change-Id: I<I>efa<I>c<I>f<I>c9dd<I>c5ed<I>ec<I>
cloudfoundry-attic_cf
train
rb
e9c85e17056229ea2e09f54dba519fc7aea44387
diff --git a/build-tasks/connect.js b/build-tasks/connect.js index <HASH>..<HASH> 100644 --- a/build-tasks/connect.js +++ b/build-tasks/connect.js @@ -1,3 +1,6 @@ +var fallback = require("connect-history-api-fallback"); +var livereload = require("connect-livereload"); + module.exports = { "test": { "options": { @@ -11,7 +14,12 @@ module.exports = { "port": 8015, "hostname": "localhost", "keepalive": true, - "open": "https://localhost:8015/_site/index.html" + "open": "https://localhost:8015/_site/index.html", + "middleware": function(connect, options, middlewares) { + middlewares.unshift(fallback({ index: "/_site/index.html" })); + middlewares.unshift(livereload({ port: 32012 })); + return middlewares; + } } }, "dev": {
added back connects default page when serving up the site
MiguelCastillo_bit-imports
train
js