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
8bdc191994bb091310cbbe4690900e7a97da0b5e
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb index <HASH>..<HASH> 100644 --- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb +++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb @@ -29,7 +29,7 @@ module ActiveRecord if @reflection.options[:insert_sql] @owner.connection.insert(interpolate_sql(@reflection.options[:insert_sql], record)) else - relation = Arel::Table.new(@reflection.options[:join_table]) + relation = join_table timestamps = record_timestamp_columns(record) timezone = record.send(:current_time_from_proper_timezone) if timestamps.any? @@ -59,7 +59,7 @@ module ActiveRecord if sql = @reflection.options[:delete_sql] records.each { |record| @owner.connection.delete(interpolate_sql(sql, record)) } else - relation = Arel::Table.new(@reflection.options[:join_table]) + relation = join_table stmt = relation.where(relation[@reflection.foreign_key].eq(@owner.id). and(relation[@reflection.association_foreign_key].in(records.map { |x| x.id }.compact)) ).compile_delete
we have a method for this, so let's use it
rails_rails
train
rb
6a5a652cb2ea44b7b5219897d13725d9f987493e
diff --git a/examples/tokens/vipercoin.v.py b/examples/tokens/vipercoin.v.py index <HASH>..<HASH> 100644 --- a/examples/tokens/vipercoin.v.py +++ b/examples/tokens/vipercoin.v.py @@ -3,8 +3,6 @@ # ERC20 details at: # https://theethereum.wiki/w/index.php/ERC20_Token_Standard # https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20-token-standard.md - - # Events of the token. Transfer: __log__({_from: indexed(address), _to: indexed(address), _value: num256}) Approval: __log__({_owner: indexed(address), _spender: indexed(address), _value: num256}) @@ -34,12 +32,12 @@ def symbol() -> bytes32: return self.symbol +@constant def name() -> bytes32: return self.name - # What is the balance of a particular account? @constant def balanceOf(_owner: address) -> num256:
Adds missing constant on name() function.
ethereum_vyper
train
py
faffc8eeb2ca06cae60b726fa873e474a51ac39b
diff --git a/discord/ext/commands/core.py b/discord/ext/commands/core.py index <HASH>..<HASH> 100644 --- a/discord/ext/commands/core.py +++ b/discord/ext/commands/core.py @@ -781,14 +781,19 @@ class Command(_BaseCommand): if self._max_concurrency is not None: await self._max_concurrency.acquire(ctx) - if self.cooldown_after_parsing: - await self._parse_arguments(ctx) - self._prepare_cooldowns(ctx) - else: - self._prepare_cooldowns(ctx) - await self._parse_arguments(ctx) + try: + if self.cooldown_after_parsing: + await self._parse_arguments(ctx) + self._prepare_cooldowns(ctx) + else: + self._prepare_cooldowns(ctx) + await self._parse_arguments(ctx) - await self.call_before_hooks(ctx) + await self.call_before_hooks(ctx) + except: + if self._max_concurrency is not None: + await self._max_concurrency.release(ctx) + raise def is_on_cooldown(self, ctx): """Checks whether the command is currently on cooldown.
[commands] Correct concurrency never releasing during prepare call
Rapptz_discord.py
train
py
c89a80fa8e85a1f4b7bbedfc4512b6dc9ec1b8ef
diff --git a/reflex.go b/reflex.go index <HASH>..<HASH> 100644 --- a/reflex.go +++ b/reflex.go @@ -4,6 +4,7 @@ import ( "bufio" "errors" "fmt" + "io" "os" "os/exec" "os/signal" @@ -314,11 +315,21 @@ func main() { if anyNonGlobalsRegistered() { Fatalln("Cannot set other flags along with --config other than --sequential, --verbose, and --decoration.") } - configFile, err := os.Open(flagConf) - if err != nil { - Fatalln(err) + + // Now open the configuration file. + // As a special case we read the config from stdin if --config is set to "-" + var config io.ReadCloser + if flagConf == "-" { + config = os.Stdin + } else { + configFile, err := os.Open(flagConf) + if err != nil { + Fatalln(err) + } + config = configFile } - scanner := bufio.NewScanner(configFile) + + scanner := bufio.NewScanner(config) lineNo := 0 for scanner.Scan() { lineNo++ @@ -349,6 +360,7 @@ func main() { if err := scanner.Err(); err != nil { Fatalln(err) } + config.Close() } // Catch ctrl-c and make sure to kill off children.
Add possibility to pass config from stdin if --config is set to '-'
cespare_reflex
train
go
a09970110bb20ff3cf0985dd42ed16888665c5f1
diff --git a/src/main/java/com/blackducksoftware/integration/hub/validator/HubServerConfigValidator.java b/src/main/java/com/blackducksoftware/integration/hub/validator/HubServerConfigValidator.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/blackducksoftware/integration/hub/validator/HubServerConfigValidator.java +++ b/src/main/java/com/blackducksoftware/integration/hub/validator/HubServerConfigValidator.java @@ -189,6 +189,11 @@ public class HubServerConfigValidator extends AbstractValidator { Response response = client.newCall(request).execute(); if (!response.isSuccessful()) { + if (response.code() == 407) { + result.addResult(HubProxyInfoFieldEnum.PROXYUSERNAME, + new ValidationResult(ValidationResultEnum.ERROR, response.message())); + return; + } result.addResult(HubServerConfigFieldEnum.HUBURL, new ValidationResult(ValidationResultEnum.ERROR, ERROR_MSG_UNREACHABLE_PREFIX + hubUrl));
Adding validation for Proxy authentication required in the validator
blackducksoftware_blackduck-common
train
java
b7391bd401a7dbea70ef0168cbe9ee5fbe73944a
diff --git a/docs/conf.py b/docs/conf.py index <HASH>..<HASH> 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -23,7 +23,7 @@ sys.path.insert( project = 'NailGun' copyright = '2014, Jeremy Audet' # pylint:disable=redefined-builtin -version = '0.8.0' +version = '0.8.1' release = version # General Configuration ------------------------------------------------------- diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ with open('README.rst') as handle: setup( name='nailgun', - version='0.8.0', # Should be identical to the version in docs/conf.py! + version='0.8.1', # Should be identical to the version in docs/conf.py! description='A library that facilitates easy usage of the Satellite 6 API', long_description=LONG_DESCRIPTION, url='https://github.com/SatelliteQE/nailgun',
Release version <I> Changes in this release: * Fix a bug in method `ComputeResource.create_missing`. Docker compute resources should have a URL that points to port <I> by default.
SatelliteQE_nailgun
train
py,py
79ad14b641e91392c15a60d35897889a73ffb91d
diff --git a/src/index.js b/src/index.js index <HASH>..<HASH> 100644 --- a/src/index.js +++ b/src/index.js @@ -428,7 +428,7 @@ class Service extends AdapterService { createQuery (params = {}) { const { filters, query } = this.filterQuery(params); - const q = this._createQuery(params).skipUndefined(); + const q = this._createQuery(params); const eagerOptions = { ...this.eagerOptions, ...params.eagerOptions }; if (this.allowedEager) { q.allowGraph(this.allowedEager); }
Removed usage of Objection's skipUndefined deprecated method
feathersjs-ecosystem_feathers-objection
train
js
bf5f9c74321cc43acf2209b6738f8b7834cddcd2
diff --git a/lib/active_model/associations/version.rb b/lib/active_model/associations/version.rb index <HASH>..<HASH> 100644 --- a/lib/active_model/associations/version.rb +++ b/lib/active_model/associations/version.rb @@ -1,5 +1,5 @@ module ActiveModel module Associations - VERSION = "0.1.0" + VERSION = "0.1.1" end end
Bump up to <I>
joker1007_activemodel-associations
train
rb
9b3df0327cf81546fb21d46c301acfe19f129a81
diff --git a/src/core/strsearch.class.php b/src/core/strsearch.class.php index <HASH>..<HASH> 100644 --- a/src/core/strsearch.class.php +++ b/src/core/strsearch.class.php @@ -60,7 +60,9 @@ class LuminousStringSearch PREG_OFFSET_CAPTURE, $index))) { if ($ret === false) { throw new Exception('preg_match returned false for pattern: "' - . $search . '"'); + . $search . '", with code: ' . LuminousUtils::pcre_error_decode( + preg_last_error()) + ); } $this->cache[$search] = false; return false;
Add PCRE error name to the message of the exception thrown in strsearch on PCRE failure
markwatkinson_luminous
train
php
24f0183da14a910ea5c73fceac7c28e463f8a39d
diff --git a/models/classes/class.LtiUtils.php b/models/classes/class.LtiUtils.php index <HASH>..<HASH> 100755 --- a/models/classes/class.LtiUtils.php +++ b/models/classes/class.LtiUtils.php @@ -75,10 +75,16 @@ class taoLti_models_classes_LtiUtils } } - public static function mapTaoRole2LTIRoles($role) + /** + * Adds the LTI roles to the tao roles + * + * @param string $roleUri + * @return array + */ + public static function mapTaoRole2LTIRoles($roleUri) { - $roles = array($role->getUri()); - if ($role->getUri() == 'http://www.tao.lu/Ontologies/TAO.rdf#DeliveryRole') { + $roles = array($roleUri); + if ($roleUri == 'http://www.tao.lu/Ontologies/TAO.rdf#DeliveryRole') { $roles[] = 'http://www.imsglobal.org/imspurl/lis/v1/vocab/membership#Learner'; } return $roles;
fixed bug "getUri on non object" created during user roles update git-svn-id: <URL>
oat-sa_extension-tao-lti
train
php
07b47aca207d156971ba07ab59b2b45eccadbc0a
diff --git a/tests/aws/test_features.py b/tests/aws/test_features.py index <HASH>..<HASH> 100644 --- a/tests/aws/test_features.py +++ b/tests/aws/test_features.py @@ -40,9 +40,12 @@ class SmokeTestApplication(object): # Number of seconds to wait after redeploy before starting # to poll for successful 200. - _REDEPLOY_SLEEP = 20 + _REDEPLOY_SLEEP = 30 # Seconds to wait between poll attempts after redeploy. _POLLING_DELAY = 5 + # Number of successful wait attempts before we consider the app + # stabilized. + _NUM_SUCCESS = 3 def __init__(self, deployed_values, stage_name, app_name, app_dir, region): @@ -104,7 +107,9 @@ class SmokeTestApplication(object): self._has_redeployed = True # Give it settling time before running more tests. time.sleep(self._REDEPLOY_SLEEP) - self._wait_for_stablize() + for _ in range(self._NUM_SUCCESS): + self._wait_for_stablize() + time.sleep(self._POLLING_DELAY) @retry(max_attempts=10, delay=5) def _wait_for_stablize(self):
Add more polling in feature integ tests
aws_chalice
train
py
cc93191764ed8b5de21369eec53aba32e692389c
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index <HASH>..<HASH> 100644 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -140,13 +140,18 @@ class InfoCommon: else version + self.vtags ) - def tags(self): + def _safe_tags(self, tags: str) -> str: + # To implement this we can rely on `safe_version` pretending to be version 0 + # followed by tags. Then we simply discard the starting 0 (fake version number) + return safe_version(f"0{tags}")[1:] + + def tags(self) -> str: version = '' if self.tag_build: version += self.tag_build if self.tag_date: version += time.strftime("-%Y%m%d") - return version + return self._safe_tags(version) vtags = property(tags)
Fix duplicated version tags in egg_info Previously egg_info was adding duplicated tags to the version string. This was happening because of the version normalization. When the version normalization was applied to the string the tag was modified, then later egg_info could no longer recognize it before applying. The fix for this problem was to normalize the tag string before applying.
pypa_setuptools
train
py
6476cb51842cf82b3d49b4cc066b2421d46c659b
diff --git a/core-bundle/contao/config/config.php b/core-bundle/contao/config/config.php index <HASH>..<HASH> 100644 --- a/core-bundle/contao/config/config.php +++ b/core-bundle/contao/config/config.php @@ -445,7 +445,7 @@ $GLOBALS['TL_WRAPPERS'] = array */ $GLOBALS['TL_ASSETS'] = array ( - 'ACE' => '1.1.2', + 'ACE' => '1.1.3', 'CSS3PIE' => '1.0.0', 'HIGHLIGHTER' => '3.0.83', 'HTML5SHIV' => '3.7.0',
[Core] Update ACE to version <I>
contao_contao
train
php
2853c7e463fa65d9bce53da46a928b36a1d2c6d5
diff --git a/tibiapy/highscores.py b/tibiapy/highscores.py index <HASH>..<HASH> 100644 --- a/tibiapy/highscores.py +++ b/tibiapy/highscores.py @@ -220,7 +220,7 @@ class Highscores(abc.Serializable): page_links = pages_div.find_all("a") listed_pages = [int(p.text) for p in page_links] if listed_pages: - self.page = next((x for x in range(1, listed_pages[-1] + 1) if x not in listed_pages), 0) + self.page = next((x for x in range(1, listed_pages[-1] + 1) if x not in listed_pages), listed_pages[-1] + 1) self.total_pages = max(int(page_links[-1].text), self.page) self.results_count = parse_integer(results_pattern.search(results_div.text).group(1)) for row in rows:
Fixed last page of highscores parsing as page 0
Galarzaa90_tibia.py
train
py
4530adce49290cbd8914e5c4e4caf36ae122ecc2
diff --git a/test/threading/test_threading_large_pool.rb b/test/threading/test_threading_large_pool.rb index <HASH>..<HASH> 100644 --- a/test/threading/test_threading_large_pool.rb +++ b/test/threading/test_threading_large_pool.rb @@ -25,7 +25,7 @@ class TestThreadingLargePool < Test::Unit::TestCase def test_safe_update set_up_safe_data threads = [] - 1000.times do |i| + 300.times do |i| threads[i] = Thread.new do if i % 2 == 0 assert_raise Mongo::OperationFailure do @@ -37,7 +37,7 @@ class TestThreadingLargePool < Test::Unit::TestCase end end - 1000.times do |i| + 300.times do |i| threads[i].join end end @@ -45,7 +45,7 @@ class TestThreadingLargePool < Test::Unit::TestCase def test_safe_insert set_up_safe_data threads = [] - 1000.times do |i| + 300.times do |i| threads[i] = Thread.new do if i % 2 == 0 assert_raise Mongo::OperationFailure do @@ -57,7 +57,7 @@ class TestThreadingLargePool < Test::Unit::TestCase end end - 1000.times do |i| + 300.times do |i| threads[i].join end end
minor: adjusted pooled threading test for windows
mongodb_mongo-ruby-driver
train
rb
17bb6207fff56b400d468c224bcf1bbf55a94a9c
diff --git a/src/components/ScrollView.js b/src/components/ScrollView.js index <HASH>..<HASH> 100644 --- a/src/components/ScrollView.js +++ b/src/components/ScrollView.js @@ -334,7 +334,7 @@ const ScrollView = createReactClass({ flashScrollIndicators() { // no-op. Only has an effect on the UI - } + }, render() { return React.createElement('react-native-mock', null, this.props.children);
add trailing comma after flashScrollIndicators
Root-App_react-native-mock-render
train
js
8efdc738a575bd1198ad7bd67f6d2752632df552
diff --git a/src/extras/primitives/primitives/a-camera.js b/src/extras/primitives/primitives/a-camera.js index <HASH>..<HASH> 100644 --- a/src/extras/primitives/primitives/a-camera.js +++ b/src/extras/primitives/primitives/a-camera.js @@ -14,6 +14,7 @@ registerPrimitive('a-camera', { 'look-controls-enabled': 'look-controls.enabled', near: 'camera.near', 'wasd-controls-enabled': 'wasd-controls.enabled', + 'user-height': 'camera.userHeight', zoom: 'camera.zoom' },
add user height to a-camera primitive (#<I>)
aframevr_aframe
train
js
a70f62e03ad7a485217ff2bc0460cc5d940c7506
diff --git a/src/Parser/QueryScanner.php b/src/Parser/QueryScanner.php index <HASH>..<HASH> 100755 --- a/src/Parser/QueryScanner.php +++ b/src/Parser/QueryScanner.php @@ -234,9 +234,7 @@ class QueryScanner // add quotes to emoticons foreach ([self::REGEX_EMOTICONS_BASIC, self::REGEX_EMOTICONS_UTF8] as $regEx) { if (preg_match($regEx, $value, $m)) { - $value = str_replace($m[0], '', $value) == ')' - ? sprintf('"%s")', substr($value, 0, -1)) - : sprintf('"%s"', $value); + $value = str_replace($m[0], sprintf('"%s"', $m[0]), $value); } }
Fixed operators on emoji's
gdbots_query-parser-php
train
php
c8d2d9de0cecce253f2f1de1c3d50ec7fd5c3f71
diff --git a/src/components/media_control/media_control.js b/src/components/media_control/media_control.js index <HASH>..<HASH> 100644 --- a/src/components/media_control/media_control.js +++ b/src/components/media_control/media_control.js @@ -193,7 +193,8 @@ export default class MediaControl extends UIObject { this.$playStopToggle.append(pauseIcon) this.trigger(Events.MEDIACONTROL_NOTPLAYING) } - this.applyButtonStyle($(this.$playPauseToggle, this.$playStopToggle)) + this.applyButtonStyle(this.$playPauseToggle) + this.applyButtonStyle(this.$playStopToggle) } mousemoveOnSeekBar(event) {
media control: fix play/stop toggle styling (refs #<I>)
clappr_clappr
train
js
87175334673f99b4a387c551b9f3ddcaba662ed5
diff --git a/src/com/google/javascript/jscomp/GlobalTypeInfo.java b/src/com/google/javascript/jscomp/GlobalTypeInfo.java index <HASH>..<HASH> 100644 --- a/src/com/google/javascript/jscomp/GlobalTypeInfo.java +++ b/src/com/google/javascript/jscomp/GlobalTypeInfo.java @@ -325,6 +325,8 @@ class GlobalTypeInfo implements CompilerPass, TypeIRegistry { // we don't need to run GatherExternProperties, which uses the OTI-specific // Visitor interface. private final Set<String> externPropertyNames = new LinkedHashSet<>(); + // The collection of all RawNominalTypes. + private Collection<RawNominalType> rawNominalTypes; GlobalTypeInfo(AbstractCompiler compiler, Set<String> unknownTypeNames) { // TODO(dimvar): it's bad style to refer to DiagnosticGroups after DefaultPassConfig. @@ -511,6 +513,8 @@ class GlobalTypeInfo implements CompilerPass, TypeIRegistry { (new FunctionTypeBuilder(this.commonTypes)). addReceiverType(globalThisType).buildDeclaration()); + checkState(rawNominalTypes == null); + rawNominalTypes = new ArrayList<>(nominaltypesByNode.values()); nominaltypesByNode = null; propertyDefs = null; for (NTIScope s : scopes) {
Add the set of all RawNominalTypes to GlobalTypeInfo. ------------- Created by MOE: <URL>
google_closure-compiler
train
java
1a200da1d35c4ef22840c6448adc5b072a5c2c4b
diff --git a/src/test/java/stormpot/PoolTest.java b/src/test/java/stormpot/PoolTest.java index <HASH>..<HASH> 100644 --- a/src/test/java/stormpot/PoolTest.java +++ b/src/test/java/stormpot/PoolTest.java @@ -2315,7 +2315,7 @@ public class PoolTest { assertTrue(JMX.isMXBeanInterface(ManagedPool.class)); } - @Test(timeout = 1601) + @Test(timeout = 3601) @Theory public void managedPoolMustBeExposableThroughAnMBeanServerAsAnMXBean(PoolFixture fixture) throws Exception {
Increase timeout for test that creates an MBeanServer
chrisvest_stormpot
train
java
235271453cf33faf1144221f2167f2aae920da0c
diff --git a/tests/features/issues.php b/tests/features/issues.php index <HASH>..<HASH> 100644 --- a/tests/features/issues.php +++ b/tests/features/issues.php @@ -259,4 +259,23 @@ if $entryopen and !$submitted $this->assertSame($expected, $actual); } + + public function testMethodCallsInStatements() + { + foreach (array('js', 'auto') as $expressionLanguage) { + $pug = new Pug(array( + 'expressionLanguage' => $expressionLanguage, + )); + $actual = trim($pug->render(implode("\n", array( + 'if zone.getLocation()', + ' each val in zone.getLocation()', + ' p=val', + )), array( + 'zone' => new DateTimeZone("Europe/Prague"), + ))); + $expected = '`<p>CZ</p><p>[\d.]+</p><p>[\d.]+</p><p></p>`'; + + $this->assertRegExp($expected, $actual); + } + } }
Add a test for method calls in statements
pug-php_pug
train
php
3d85478e186224c28df0e43296d534363c1ef9d0
diff --git a/allauth/account/forms.py b/allauth/account/forms.py index <HASH>..<HASH> 100644 --- a/allauth/account/forms.py +++ b/allauth/account/forms.py @@ -38,7 +38,8 @@ class EmailAwarePasswordResetTokenGenerator(PasswordResetTokenGenerator): user, timestamp ) sync_user_email_addresses(user) - emails = set([user.email] if user.email else []) + email = user_email(user) + emails = set([email] if email else []) emails.update( EmailAddress.objects.filter(user=user).values_list("email", flat=True) )
fix(accounts): Attribute error for custom email field
pennersr_django-allauth
train
py
292971dcb629d9811f073b2a8eefa47a5b3d3cb8
diff --git a/lib/build-asset-map-reader.js b/lib/build-asset-map-reader.js index <HASH>..<HASH> 100644 --- a/lib/build-asset-map-reader.js +++ b/lib/build-asset-map-reader.js @@ -1,11 +1,12 @@ let fs = require("fs"); +let retryTimings = [10, 50, 100, 250, 500, 1000]; // Build an asset map reader // // An asset map reader looks up assets in a manifest file module.exports = assetMaps => { return () => { - return Promise.all(assetMaps.map(readJSON) + return Promise.all(assetMaps.map(retry(readJSON, retryTimings)) ).then(maps => Object.assign({}, ...maps) ).then(map => { return asset => map[asset]; @@ -24,3 +25,21 @@ function readJSON(assetMap) { }); }); } + +// Retries a function that returns a promise +// The first argument is the function +// The second argument is an array of ms to wait in between attempts +// Returns a function that takes the same arguments as the provided function +function retry(fn, retries) { + return (...params) => fn(...params).catch(err => { + if(retries.length === 0) { + throw err; + } + let backoff = retries.shift(); + return wait(backoff).then(_ => retry(fn, retries)(...params)); + }); +} + +function wait(ms) { + return new Promise(resolve => setTimeout(resolve, ms)); +}
Retry to read the manifests three times before giving up Includes feedback from @mkhl and @fnd
faucet-pipeline_faucet-pipeline-sass
train
js
208d5880f8655802b4ef7b9cdbad4c6b50ee23ef
diff --git a/openxc/src/com/openxc/interfaces/bluetooth/BluetoothVehicleInterface.java b/openxc/src/com/openxc/interfaces/bluetooth/BluetoothVehicleInterface.java index <HASH>..<HASH> 100644 --- a/openxc/src/com/openxc/interfaces/bluetooth/BluetoothVehicleInterface.java +++ b/openxc/src/com/openxc/interfaces/bluetooth/BluetoothVehicleInterface.java @@ -212,11 +212,11 @@ public class BluetoothVehicleInterface extends BytestreamDataSource } } - // TODO clear up the threading here - the issue is that if we - // are connected, then disable the BT vehicle interface, it - // breaks the socket connecetion so we come out here - but we - // don't check to see if we're still running before creating - // another socket. + // If the BT interface has been disabled, the socket wlil be + // disconnected and we will break out of the above + // while(isConnected()) loop and land here - double check that + // this interface should still be running before trying to make + // another connection. if(!isRunning()) { break; } @@ -247,7 +247,6 @@ public class BluetoothVehicleInterface extends BytestreamDataSource } } Log.d(TAG, "SocketAccepter is stopping"); - // TODO clean up so we aren't duplicating shutdown logic closeSocket(); stop(); }
Remove a few resolved TODOs, clarify the threading model for BT VI.
openxc_openxc-android
train
java
eea7564c9ec428cd82bd4068ab8fcddc5d938779
diff --git a/src/Composer/Command/LicensesCommand.php b/src/Composer/Command/LicensesCommand.php index <HASH>..<HASH> 100644 --- a/src/Composer/Command/LicensesCommand.php +++ b/src/Composer/Command/LicensesCommand.php @@ -96,9 +96,9 @@ EOT break; case 'json': - $usedLicenses = array(); + $dependencies = array(); foreach ($packages as $package) { - $usedLicenses[$package->getPrettyName()] = array( + $dependencies[$package->getPrettyName()] = array( 'version' => $package->getFullPrettyVersion(), 'license' => $package->getLicense(), ); @@ -108,7 +108,7 @@ EOT 'name' => $root->getPrettyName(), 'version' => $root->getFullPrettyVersion(), 'license' => $root->getLicense(), - 'dependencies' => $usedLicenses, + 'dependencies' => $dependencies, ))); break;
Revert accidental rename of $dependencies variable in unrelated code branch
composer_composer
train
php
b8ce6a1a8c5dc370cae86cc3a40450d472e6843c
diff --git a/spec/integration/node/catalog.rb b/spec/integration/node/catalog.rb index <HASH>..<HASH> 100755 --- a/spec/integration/node/catalog.rb +++ b/spec/integration/node/catalog.rb @@ -7,6 +7,12 @@ require File.dirname(__FILE__) + '/../../spec_helper' describe Puppet::Node::Catalog do describe "when using the indirector" do + before do + # This is so the tests work w/out networking. + Facter.stubs(:to_hash).returns({"hostname" => "foo.domain.com"}) + Facter.stubs(:value).returns("eh") + end + after { Puppet::Node::Catalog.indirection.clear_cache } it "should be able to delegate to the :yaml terminus" do
Mocking Facter in an integration test, so it works with no networking
puppetlabs_puppet
train
rb
ffc3ce4f41256568fcb50bddb89d332700e6dbe3
diff --git a/markermanager/src/markermanager.js b/markermanager/src/markermanager.js index <HASH>..<HASH> 100644 --- a/markermanager/src/markermanager.js +++ b/markermanager/src/markermanager.js @@ -95,7 +95,7 @@ MarkerManager.prototype.initialize = function (map, opt_opts) { // Find max zoom level var mapMaxZoom = 1; for (var sType in mapTypes ) { - if (typeof map.mapTypes.get(sType) === 'object' && typeof map.mapTypes.get(sType).maxZoom === 'number') { + if (mapTypes.hasOwnProperty(sType) && mapTypes.get(sType).maxZoom === 'number') { var mapTypeMaxZoom = map.mapTypes.get(sType).maxZoom; if (mapTypeMaxZoom > mapMaxZoom) { mapMaxZoom = mapTypeMaxZoom; @@ -976,4 +976,4 @@ ProjectionHelperOverlay.prototype.draw = function () { this.ready = true; google.maps.event.trigger(this, 'ready'); } -}; \ No newline at end of file +};
Fix "Cannot call method 'substr' of undefined" error
googlemaps_v3-utility-library
train
js
c812d3524981c6a36a1f16f4b906f0a5d9313c9f
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb index <HASH>..<HASH> 100644 --- a/lib/jekyll/version.rb +++ b/lib/jekyll/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Jekyll - VERSION = "3.6.0".freeze + VERSION = "3.6.2".freeze end
last released version is at <I>
jekyll_jekyll
train
rb
36999127746b188b0eb799e905eaac56abc97b26
diff --git a/lib/ember-mocha/setup-test-factory.js b/lib/ember-mocha/setup-test-factory.js index <HASH>..<HASH> 100644 --- a/lib/ember-mocha/setup-test-factory.js +++ b/lib/ember-mocha/setup-test-factory.js @@ -1,5 +1,4 @@ import { before, beforeEach, afterEach } from 'mocha'; -import { getContext } from 'ember-test-helpers'; export default function(Constructor) { return function setupTest(moduleName, options) { @@ -10,12 +9,9 @@ export default function(Constructor) { }); beforeEach(function() { - return module.setup().then(() => { - var context = getContext(); - Object.keys(context).forEach(key => { - this[key] = context[key]; - }); - }); + module.setContext(this); + + return module.setup(); }); afterEach(function() {
Share Mocha's test context in setup-test-factory. Mirrors change in #<I>.
emberjs_ember-mocha
train
js
639386759a2506c6b93852b042335ed49df00b10
diff --git a/source/org/jivesoftware/smackx/provider/XHTMLExtensionProvider.java b/source/org/jivesoftware/smackx/provider/XHTMLExtensionProvider.java index <HASH>..<HASH> 100644 --- a/source/org/jivesoftware/smackx/provider/XHTMLExtensionProvider.java +++ b/source/org/jivesoftware/smackx/provider/XHTMLExtensionProvider.java @@ -70,12 +70,12 @@ public class XHTMLExtensionProvider implements PacketExtensionProvider { buffer.append(StringUtils.escapeForXML(parser.getText())); } } else if (eventType == XmlPullParser.END_TAG) { - if (parser.getName().equals("body") || parser.getDepth() <= depth) { + if (parser.getName().equals("body") && parser.getDepth() <= depth) { buffer.append(parser.getText()); xhtmlExtension.addBody(buffer.toString()); } else if (parser.getName().equals(xhtmlExtension.getElementName()) - || parser.getDepth() <= startDepth) { + && parser.getDepth() <= startDepth) { done = true; } else {
Switch or's to and's so that the exploit can't be used note that this doesn't fix the issue of invalid XML. SMACK-<I> git-svn-id: <URL>
igniterealtime_Smack
train
java
4278b1fe326586a5c7b0d672965d0c8eac3d934f
diff --git a/tests/frontend/org/voltdb/planner/TestSubQueries.java b/tests/frontend/org/voltdb/planner/TestSubQueries.java index <HASH>..<HASH> 100644 --- a/tests/frontend/org/voltdb/planner/TestSubQueries.java +++ b/tests/frontend/org/voltdb/planner/TestSubQueries.java @@ -1710,7 +1710,8 @@ public class TestSubQueries extends PlannerTestCase { pn = pn.getChild(0); checkPrimaryKeyIndexScan(pn, "P1", "A", "C"); assertNotNull(pn.getInlinePlanNode(PlanNodeType.PROJECTION)); - assertNotNull(pn.getInlinePlanNode(PlanNodeType.HASHAGGREGATE)); + // Using index scan for group by only: use serial aggregate instead hash aggregate + assertNotNull(pn.getInlinePlanNode(PlanNodeType.AGGREGATE)); // LEFT partition table planNodes = compileToFragments("SELECT T1.CC FROM P1 LEFT JOIN (SELECT A, count(*) CC FROM P2 GROUP BY A) T1 ON T1.A = P1.A ");
Merge the recent master serial aggregate feature. Fix the delegated tests verifying hash aggregate
VoltDB_voltdb
train
java
aae6f9ffc570b826f55332e93b8efab4bab3ba41
diff --git a/src/class/Dates.php b/src/class/Dates.php index <HASH>..<HASH> 100755 --- a/src/class/Dates.php +++ b/src/class/Dates.php @@ -398,11 +398,7 @@ class Dates extends DateTime public function humanReadable($returnDateAndTime = true) { $current = new Dates; - - $dateZoneName = parent::getTimezone()->getName(); - $current->setTimezone(new \DateTimeZone($dateZoneName)); - - $diff = parent::diff($current); + $diff = parent::diff($current); $parsedTxt = (object) [ 'date' => '',
#<I> Dates::humanReadable Remove timezone manual management Because we extends \DateTime, the diff method manage timezone internaly :) Revert : <I>d<I>eeee7d<I>f7a<I>d<I>c<I>ae0f<I>bae3
bfw-systems_bfw
train
php
e0637fa9b75e9a74e6a23dd0167cf74ee9518403
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php index <HASH>..<HASH> 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php @@ -192,6 +192,7 @@ class GraphvizDumper extends Dumper $container = new ContainerBuilder($parameterBag); $container->setDefinitions($this->container->getDefinitions()); $container->setAliases($this->container->getAliases()); + $container->setResources($this->container->getResources()); foreach ($this->container->getScopes() as $scope) { $container->addScope($scope); }
[DependencyInjection] Add clone for resources which were introduced in <I>
symfony_symfony
train
php
d8715694cfa8a8d79fb4de4496e5246612cffd75
diff --git a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerJSON.java b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerJSON.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerJSON.java +++ b/core/src/main/java/com/orientechnologies/orient/core/serialization/serializer/record/string/ORecordSerializerJSON.java @@ -525,7 +525,7 @@ public class ORecordSerializerJSON extends ORecordSerializerStringAbstract { if (attribSameRow) firstAttribute = false; } - if (includeVer && record.getVersion() > 0) { + if (includeVer) { json.writeAttribute(firstAttribute ? indentLevel + 1 : 0, firstAttribute, ATTRIBUTE_VERSION, record.getVersion()); if (attribSameRow) firstAttribute = false;
Fixed bug on JSON converter. Before now it included the @version only if > 0. Now always.
orientechnologies_orientdb
train
java
19de1985f45910367e5042a80c118eea7627ea02
diff --git a/discover-providers.js b/discover-providers.js index <HASH>..<HASH> 100644 --- a/discover-providers.js +++ b/discover-providers.js @@ -53,20 +53,22 @@ function createJsonFileDiscoverProvider(hostsFile) { var fs = require('fs'); return function jsonFileProvider(callback) { - if (!fs.existsSync(hostsFile)) { - callback(new Error('bootstrap hosts file does not exist', {file: hostsFile})); - return; - } + fs.readFile(hostsFile, function onFileRead(err, data) { + if (err) { + callback(err); + return; + } - var hosts; - try { - hosts = JSON.parse(fs.readFileSync(hostsFile).toString()); - } catch (e) { - callback(e); + var hosts; + try { + hosts = JSON.parse(data.toString()); + } catch (e) { + callback(e); + return; + } + callback(null, hosts); return; - } - - return callback(null, hosts); + }); }; }
Read hosts-file async (#<I>) Since discover-providers are using a callback to return the host list, the hosts-file could be able to read the file asynchronously.
esatterwhite_skyring
train
js
2b746537ef24f087c463c229891f5f390dd27146
diff --git a/src/Test/RepositoryTest.php b/src/Test/RepositoryTest.php index <HASH>..<HASH> 100644 --- a/src/Test/RepositoryTest.php +++ b/src/Test/RepositoryTest.php @@ -59,9 +59,9 @@ trait RepositoryTest $historyItem->getSender(), $sender ); - $this->assertTrue( - $historyItem->getSentAt() >= $before - && $historyItem->getSentAt() <= $after + $this->assertEquals( + $before->format('Y-m-d H:i:s'), + $historyItem->getSentAt()->format('Y-m-d H:i:s') ); } }
Fix Delivery\Test\RepositoryTest issue with storing sent time without microtime
wearesho-team_message-delivery
train
php
d35729254ebd27ac519422233e6dd82a5da5de5d
diff --git a/lib/node/request.js b/lib/node/request.js index <HASH>..<HASH> 100644 --- a/lib/node/request.js +++ b/lib/node/request.js @@ -13,6 +13,7 @@ class Request { this._headers = {}; this._resHeaders = {}; this._request = null; + this._aborted = false; this.status = 0; @@ -44,6 +45,8 @@ class Request { let req = this._request = (options.protocol !== "https:") ? http.request(options) : https.request(options); req.on("response", (res) => { + if (this._aborted) return; + this.status = res.statusCode; this._resHeaders = res.headers; @@ -51,6 +54,8 @@ class Request { }); req.on("error", (err) => { + if (this._aborted) return; + this.onerror(err); }); @@ -66,6 +71,7 @@ class Request { } abort() { + this._aborted = true; if (this._request !== null) this._request.abort(); } }
Do not invoke callbacks for aborted Node.js request Previously, an upload would be retried if an upload with retryDelays is aborted. It is caused by the fact that an error is emitted when the HTTP request is aborted. This error is handled by the retry mechanism which then retries the upload. However, the user does not want to retry if they abort the upload. Fixes <URL>
tus_tus-js-client
train
js
3c6195849e33cda5881c0a0bba0c387a1558a462
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 @@ -1,10 +1,8 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__) -if ENV['CODECLIMATE_REPO_TOKEN'] - require 'codeclimate-test-reporter' - CodeClimate::TestReporter.start -else - require 'simplecov' - SimpleCov.start + +require 'simplecov' +SimpleCov.start do + add_filter 'spec/' end require 'pry' require 'vcr'
Removed codeclimate-test-reporter
anakinj_paytrail-client
train
rb
a6b0064a04403e0f693045e37c1bc430acae5e97
diff --git a/plaso/lib/sleuthkit.py b/plaso/lib/sleuthkit.py index <HASH>..<HASH> 100644 --- a/plaso/lib/sleuthkit.py +++ b/plaso/lib/sleuthkit.py @@ -19,7 +19,9 @@ This class provides a method to create a filehandle from an image file that is readable by TSK (Sleuthkit) and use like an ordinary file in Python. """ + import logging +import platform import pytsk3 @@ -63,9 +65,14 @@ class TSKFile(object): self.inode = inode self.fs = filesystem - # We prefer opening up a file by it's inode number. + # We prefer opening up a file by it's inode number since its faster. if inode: self.fileobj = self.fs.open_meta(inode=inode) + # Ignore a leading path separator: \ on Windows. + # This prevents the cannot access \$MFT issue. + # TODO: this is a workaround for now and needs to be fixed in pyvfs. + elif platform.system() == 'Windows' and path.startswith('\\'): + self.fileobj = self.fs.open(path[1:]) else: self.fileobj = self.fs.open(path)
Code review: <I>: Fix for $MFT
log2timeline_plaso
train
py
b2f4a166f41200f2987e5f181bd50efeb9c030f3
diff --git a/multiqc/plots/beeswarm.py b/multiqc/plots/beeswarm.py index <HASH>..<HASH> 100644 --- a/multiqc/plots/beeswarm.py +++ b/multiqc/plots/beeswarm.py @@ -7,7 +7,7 @@ import logging import os import random -from multiqc.utils import config +from multiqc.utils import config, report from multiqc.plots import table_object logger = logging.getLogger(__name__) diff --git a/multiqc/plots/heatmap.py b/multiqc/plots/heatmap.py index <HASH>..<HASH> 100644 --- a/multiqc/plots/heatmap.py +++ b/multiqc/plots/heatmap.py @@ -8,7 +8,7 @@ import logging import os import random -from multiqc.utils import config +from multiqc.utils import config, report logger = logging.getLogger(__name__) diff --git a/multiqc/plots/scatter.py b/multiqc/plots/scatter.py index <HASH>..<HASH> 100644 --- a/multiqc/plots/scatter.py +++ b/multiqc/plots/scatter.py @@ -7,7 +7,7 @@ import logging import os import random -from multiqc.utils import config +from multiqc.utils import config, report logger = logging.getLogger(__name__)
Added missing import for counting flat plots. See #<I>.
ewels_MultiQC
train
py,py,py
e6f5c80011e425d217aef58ec91a8e57f175fb3f
diff --git a/packages/mdc-textfield/addon/mixins/helper-text-support.js b/packages/mdc-textfield/addon/mixins/helper-text-support.js index <HASH>..<HASH> 100644 --- a/packages/mdc-textfield/addon/mixins/helper-text-support.js +++ b/packages/mdc-textfield/addon/mixins/helper-text-support.js @@ -89,5 +89,5 @@ export default Mixin.create ({ persistMessage: or ('{helperTextPersistent,errorMessage,validationMessage}'), validation: or ('{errorMessage,validationMessage}'), - message: or ('{errorMessage,validationMessage,helperText}') + message: or ('{validationMessage,errorMessage,helperText}') });
fix: Prioritize validation message or error message since error message is managed externally to the component
onehilltech_ember-cli-mdc
train
js
6692d9cb6140865ad8b7dd2c20c630930f768966
diff --git a/src/http/api/routes/webui.js b/src/http/api/routes/webui.js index <HASH>..<HASH> 100644 --- a/src/http/api/routes/webui.js +++ b/src/http/api/routes/webui.js @@ -17,7 +17,7 @@ module.exports = [ method: '*', path: '/webui', handler (request, h) { - return h.redirect('/ipfs/QmRvPGBVDBEUvrXrinMKgh8Vu8mVBbTZk3C1jJGfgWchSP') + return h.redirect('/ipfs/QmfQkD8pBSBCBxWEwFSu4XaDVSWK6bjnNuaWZjMyQbyDub') } } ]
chore: update to Web UI <I> (#<I>)
ipfs_js-ipfs
train
js
ef12de564dcb3b49ee11cf55d519ca9b67c13481
diff --git a/molgenis-core/src/main/java/org/molgenis/Molgenis.java b/molgenis-core/src/main/java/org/molgenis/Molgenis.java index <HASH>..<HASH> 100644 --- a/molgenis-core/src/main/java/org/molgenis/Molgenis.java +++ b/molgenis-core/src/main/java/org/molgenis/Molgenis.java @@ -229,9 +229,16 @@ public class Molgenis // DOCUMENTATION if (options.generate_doc) { - generators.add(new DotDocGen()); generators.add(new FileFormatDocGen()); - generators.add(new DotDocMinimalGen()); + //check if dot is available to prevent error lists in the build logs + try{ + Runtime.getRuntime().exec("dot -?"); + generators.add(new DotDocGen()); + generators.add(new DotDocMinimalGen()); + } + catch(Exception e){ + //dot not available + } generators.add(new ObjectModelDocGen()); generators.add(new DotDocModuleDependencyGen()); }
Prevent errors while building molgenis on systems where "dot" is not available
molgenis_molgenis
train
java
59dd03f5486c26e549f1c1768ba40724ff0bf2d2
diff --git a/src/Stagehand/TestRunner/SimpleTest.php b/src/Stagehand/TestRunner/SimpleTest.php index <HASH>..<HASH> 100644 --- a/src/Stagehand/TestRunner/SimpleTest.php +++ b/src/Stagehand/TestRunner/SimpleTest.php @@ -109,6 +109,7 @@ class Stagehand_TestRunner_SimpleTest extends Stagehand_TestRunner_Common ob_end_clean(); if ($this->_color) { + include_once 'Console/Color.php'; print Console_Color::convert(preg_replace(array('/^(OK.+)/ms', '/^(FAILURES!!!.+)/ms', '/^(\d+\)\s)(.+at \[.+\]$\s+in .+)$/m',
- Added missing include_once statement.
piece_stagehand-testrunner
train
php
93d95cbde5224af21d44c8ae39d078778f835bbf
diff --git a/src/test/java/com/lmax/disruptor/example/EarlyReleaseHandler.java b/src/test/java/com/lmax/disruptor/example/EarlyReleaseHandler.java index <HASH>..<HASH> 100644 --- a/src/test/java/com/lmax/disruptor/example/EarlyReleaseHandler.java +++ b/src/test/java/com/lmax/disruptor/example/EarlyReleaseHandler.java @@ -20,11 +20,13 @@ public class EarlyReleaseHandler implements SequenceReportingEventHandler<LongEv { processEvent(event); - if (isLogicalChunkOfWorkComplete()) + boolean logicalChunkOfWorkComplete = isLogicalChunkOfWorkComplete(); + if (logicalChunkOfWorkComplete) { sequenceCallback.set(sequence); - batchRemaining = 20; } + + batchRemaining = logicalChunkOfWorkComplete || endOfBatch ? 20 : batchRemaining; } private boolean isLogicalChunkOfWorkComplete()
Example to show how to release a sequence before a full batch is complete.
LMAX-Exchange_disruptor
train
java
d96e0ef35e15b5d72cc1471b736186dbb8125ecf
diff --git a/py/ec2_cmd.py b/py/ec2_cmd.py index <HASH>..<HASH> 100755 --- a/py/ec2_cmd.py +++ b/py/ec2_cmd.py @@ -169,6 +169,7 @@ def dump_hosts_config(ec2_config, reservation, filename='ec2-config-{0}.json'): cfg['use_flatfile'] = True cfg['h2o_per_host'] = 1 cfg['java_heap_GB'] = MEMORY_MAPPING[ec2_config['instance_type']]['xmx'] + cfg['base_port'] = 54321 cfg['ip'] = [ i.private_ip_address for i in reservation.instances ] cfg['instances'] = [ { 'id': i.id, 'private_ip_address': i.private_ip_address, 'public_ip_address': i.ip_address, 'public_dns_name': i.public_dns_name } for i in reservation.instances ] cfg['reservation_id'] = reservation.id
EC2 always use <I> as a base port
h2oai_h2o-2
train
py
d7a23e69102b57b96c2803a2f4484a1ebc268261
diff --git a/peer.js b/peer.js index <HASH>..<HASH> 100644 --- a/peer.js +++ b/peer.js @@ -201,9 +201,14 @@ function waitForIdentified(callback) { } else if (conn.remoteName) { callback(null); } else { - conn.closeEvent.on(onConnectionClose); - conn.identifiedEvent.on(onIdentified); + self._waitForIdentified(conn, callback); } +}; + +TChannelPeer.prototype._waitForIdentified = +function _waitForIdentified(conn, callback) { + conn.closeEvent.on(onConnectionClose); + conn.identifiedEvent.on(onIdentified); function onConnectionClose(err) { conn.closeEvent.removeListener(onConnectionClose);
peer: move closures into seperate method
uber_tchannel-node
train
js
a2e1711620e63c8a313a3858d37a1080c204541d
diff --git a/aptly/publisher/__init__.py b/aptly/publisher/__init__.py index <HASH>..<HASH> 100644 --- a/aptly/publisher/__init__.py +++ b/aptly/publisher/__init__.py @@ -58,7 +58,7 @@ class PublishManager(object): publishes = self.client.do_get('/publish') for publish in publishes: - name = '{}/{}'.format(publish['Prefix'], publish['Distribution']) + name = '{}/{}'.format(publish['Prefix'].replace("/", "_"), publish['Distribution']) if save_all or name in publishes_to_save: save_list.append(Publish(self.client, name, load=True)) @@ -222,7 +222,7 @@ class Publish(object): publishes = self.client.do_get('/publish') for publish in publishes: if publish['Distribution'] == self.distribution and \ - publish['Prefix'] == (self.prefix or '.'): + publish['Prefix'].replace("/", "_") == (self.prefix or '.'): return publish raise NoSuchPublish("Publish %s does not exist" % self.name)
Additional fix for PR #9 Aptly API returning Prefix without converting slashes to underscore. This cause an issue when you are trying to publish mirror once again.
tcpcloud_python-aptly
train
py
1ea7ad4e93cbf6a49f8988dc155b45ea30b9548b
diff --git a/lib/mongo_client.js b/lib/mongo_client.js index <HASH>..<HASH> 100644 --- a/lib/mongo_client.js +++ b/lib/mongo_client.js @@ -467,7 +467,7 @@ MongoClient.prototype.isConnected = function(options) { * @param {array} [options.readPreferenceTags=null] Read preference tags * @param {number} [options.numberOfRetries=5] The number of retries for a tailable cursor * @param {boolean} [options.auto_reconnect=true] Enable auto reconnecting for single server instances - * @param {number} [minSize] If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections + * @param {number} [options.minSize] If present, the connection pool will be initialized with minSize connections, and will never dip below minSize connections * @param {MongoClient~connectCallback} [callback] The command result callback * @return {Promise<MongoClient>} returns Promise if no callback passed */
chore(minSize): fixing jsdoc for minSize
mongodb_node-mongodb-native
train
js
6b4f2ee591e63b435300cd602aa5a8c66aaabfb5
diff --git a/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java b/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java index <HASH>..<HASH> 100644 --- a/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java +++ b/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java @@ -135,7 +135,7 @@ public abstract class CompositesIndex extends AbstractSimplePerColumnSecondaryIn throw new ConfigurationException("Unknown options provided for COMPOSITES index: " + options.keySet()); } - public class IndexedEntry + public static class IndexedEntry { public final DecoratedKey indexValue; public final ByteBuffer indexEntry;
make CompositesIndex.IndexEntry static to reduce footprint
Stratio_stratio-cassandra
train
java
8f1a446e7f9102eb32806619ddc3ea38b0eb5dc0
diff --git a/modules/custom/openy_home_branch/js/hb_cookies_storage.js b/modules/custom/openy_home_branch/js/hb_cookies_storage.js index <HASH>..<HASH> 100644 --- a/modules/custom/openy_home_branch/js/hb_cookies_storage.js +++ b/modules/custom/openy_home_branch/js/hb_cookies_storage.js @@ -80,7 +80,7 @@ // Move current data to Cookies storage. updateStorage: function () { $(document).trigger('hb-before-storage-update', this.data); - $.cookie('home_branch', JSON.stringify(this.data), { expires: 360, path: '/' }); + $.cookie('home_branch', JSON.stringify(this.data), { expires: 360, path: drupalSettings.path.baseUrl }); $(document).trigger('hb-after-storage-update', this.data); },
[YGBWHB-<I>] Set base path in cookie
ymcatwincities_openy
train
js
ccdb064c0523e9293dca13adefa13d155d372505
diff --git a/spotifyconnect/sink.py b/spotifyconnect/sink.py index <HASH>..<HASH> 100644 --- a/spotifyconnect/sink.py +++ b/spotifyconnect/sink.py @@ -2,6 +2,9 @@ from __future__ import unicode_literals import spotifyconnect +__all__ = [ + 'Sink' +] class Sink(object):
Add Sink class to initial spotify-connect import
chukysoria_pyspotify-connect
train
py
d8d7d7b89f158518a23c1f7b4bde2b9e6ff67409
diff --git a/more_test.go b/more_test.go index <HASH>..<HASH> 100644 --- a/more_test.go +++ b/more_test.go @@ -555,9 +555,10 @@ func TestDate(t *testing.T) { } id := "idbdate" + f - DB().Exec("insert into foo( "+f+", cend) values( :1, :2)", n, id) + db := DB() + db.Exec("insert into foo( "+f+", cend) values( :1, :2)", n, id) - r := sqlstest(DB(), t, "select "+f+" from foo where cend= :1", id) + r := sqlstest(db, t, "select "+f+" from foo where cend= :1", id) fmt.Println(n, r[f].(time.Time)) }
Fix TestDate() TestDate() called DB() twice, but DB() truncates table foo. So the test which inserts a row then tries to read it back fails.
mattn_go-oci8
train
go
a9c17787f34eec2a91fb352ff5b6325dd4c51af0
diff --git a/src/ServiceFactory.php b/src/ServiceFactory.php index <HASH>..<HASH> 100644 --- a/src/ServiceFactory.php +++ b/src/ServiceFactory.php @@ -42,6 +42,7 @@ abstract /* static final (fuck fuck fuuuck!!) */ class ServiceFactory public static final function create(App $app): ?Service { $request = $app->request(); + $response = $app->response(); $requestUri = $request->uri(); $requestMethod = $request->method(); @@ -53,6 +54,11 @@ abstract /* static final (fuck fuck fuuuck!!) */ class ServiceFactory $serviceMethodArguments = null; $serviceAliases = $app->configValue('app.service.aliases', []); + // redirect main method + if ($requestUri->segment(1) == Service::METHOD_MAIN) { + return $response->redirect('/'. $serviceName)->end(); + } + // main if (empty($serviceName)) { $serviceName = Service::SERVICE_MAIN;
Redirect main method to service root.
froq_froq-service
train
php
828606232e2a66efc9c12b02ea4a3c3368df7a36
diff --git a/consul/client_test.go b/consul/client_test.go index <HASH>..<HASH> 100644 --- a/consul/client_test.go +++ b/consul/client_test.go @@ -10,7 +10,7 @@ import ( "github.com/hashicorp/consul/consul/structs" "github.com/hashicorp/consul/testutil" - "github.com/hashicorp/consul/vendor/github.com/hashicorp/net-rpc-msgpackrpc" + "github.com/hashicorp/net-rpc-msgpackrpc" "github.com/hashicorp/serf/serf" )
Correct a bogus goimport rewrite for tests
hashicorp_consul
train
go
7db27680f87f69e04f65eba52bc67e287c162db7
diff --git a/lib/yui/chooserdialogue/chooserdialogue.js b/lib/yui/chooserdialogue/chooserdialogue.js index <HASH>..<HASH> 100644 --- a/lib/yui/chooserdialogue/chooserdialogue.js +++ b/lib/yui/chooserdialogue/chooserdialogue.js @@ -152,6 +152,7 @@ YUI.add('moodle-core-chooserdialogue', function(Y) { var bb = this.overlay.get('boundingBox'); var winheight = bb.get('winHeight'); + var winwidth = bb.get('winWidth'); var offsettop = 0; // Try and set a sensible max-height -- this must be done before setting the top @@ -187,6 +188,13 @@ YUI.add('moodle-core-chooserdialogue', function(Y) { // We need to set the height for the yui3-widget - can't work // out what we're setting at present -- shoud be the boudingBox bb.setStyle('top', dialoguetop + 'px'); + + // Calculate the left location of the chooser + // We don't set a minimum width in the same way as we do height as the width would be far lower than the + // optimal width for moodle anyway. + var dialoguewidth = bb.get('offsetWidth'); + var dialogueleft = (winwidth - dialoguewidth) / 2; + bb.setStyle('left', dialogueleft + 'px'); }, handle_key_press : function(e) {
MDL-<I> Ensure that chooser dialogues are centred vertically
moodle_moodle
train
js
74a93ac77899fe709bdd503328679f7e50c04b38
diff --git a/lexicon/providers/online.py b/lexicon/providers/online.py index <HASH>..<HASH> 100644 --- a/lexicon/providers/online.py +++ b/lexicon/providers/online.py @@ -25,24 +25,12 @@ class Provider(BaseProvider): def __init__(self, options, engine_overrides=None): super(Provider, self).__init__(options, engine_overrides) self.zone_name = 'Zone Automatic Lexicon ' - self.domain_id = None self.passive_zone = None self.active_zone = None + self.domain_id = self.options['domain'] self.api_endpoint = self.engine_overrides.get('api_endpoint', 'https://api.online.net/api/v1') def authenticate(self): - payload = self._get('/domain/') - domain = self.options['domain'] - did = None - for row in payload: - if row['name'] == domain: - did = row['id'] - break - - if did is None: - raise Exception('No domain found') - - self.domain_id = did self.init_zones() def list_zones(self):
online api change: domain_id became simply domain name
AnalogJ_lexicon
train
py
d6a08bed5b6acf5781109712a45369b0badc3af2
diff --git a/src/Builder.php b/src/Builder.php index <HASH>..<HASH> 100644 --- a/src/Builder.php +++ b/src/Builder.php @@ -28,7 +28,7 @@ class Builder /** * Optional callback before search execution. * - * @var string + * @var \Closure|null */ public $callback; @@ -72,7 +72,7 @@ class Builder * * @param \Illuminate\Database\Eloquent\Model $model * @param string $query - * @param \Closure $callback + * @param \Closure|null $callback * @param bool $softDelete * @return void */
[Fix] Builder callback property type (#<I>)
laravel_scout
train
php
364dcd1fe84f72c1082fb5115b8ffe048ffd479e
diff --git a/lib/vain.js b/lib/vain.js index <HASH>..<HASH> 100644 --- a/lib/vain.js +++ b/lib/vain.js @@ -85,6 +85,8 @@ exports.render = function(input, options, fn) { snippetName = invocationParts[0], snippetParams = processParams(invocationParts[1] || ""); + $.extend(snippetParams, {request: options.request, response: options.response}); + if ('function' === typeof snippetHandlers[snippetName]) { snippetsDiscovered.push({name: snippetName, params: snippetParams, domNode: this}); } @@ -111,11 +113,9 @@ exports.render = function(input, options, fn) { var snippetInformation = snippetsDiscovered[currentSnippetIndex]; - snippetHandlers[snippetInformation.name]( - $, + snippetHandlers[snippetInformation.name].call( snippetInformation.domNode, - options.request, - options.response, + $, snippetInformation.params, snippetFinishedCallback );
Reduce number of arguments passed into snippet functions. The argument list for snippet functions was getting pretty gnarly, so we're making some changes. Specifically, - The request and response are now passed into the params object, so you can't use those names for params passed in from markup. - The current element is bound to this so it doesn't need to have its own argument.
farmdawgnation_vain
train
js
f10374d6fd757704a93c767daaa2840ac8aea46c
diff --git a/src/View/Widget/DateTimeWidget.php b/src/View/Widget/DateTimeWidget.php index <HASH>..<HASH> 100644 --- a/src/View/Widget/DateTimeWidget.php +++ b/src/View/Widget/DateTimeWidget.php @@ -61,7 +61,7 @@ class DateTimeWidget extends \Cake\View\Widget\DateTimeWidget $val = $val->format($type === 'date' ? 'Y-m-d' : 'Y-m-d H:i:s'); } - if ($format !== null) { + if ($format === null) { if ($type === 'date') { $format = 'L'; } elseif ($type === 'time') {
Only set the format if it isn't already set
FriendsOfCake_crud-view
train
php
30e94d1d190649a37d7e055a0da32aaf82ee40ee
diff --git a/stripe/resource.py b/stripe/resource.py index <HASH>..<HASH> 100644 --- a/stripe/resource.py +++ b/stripe/resource.py @@ -368,7 +368,7 @@ class DeletableAPIResource(APIResource): # API objects class Account(CreateableAPIResource, ListableAPIResource, - UpdateableAPIResource): + UpdateableAPIResource, DeletableAPIResource): @classmethod def retrieve(cls, id=None, api_key=None, **params): instance = cls(id, api_key, **params)
Added the ability to delete an account
stripe_stripe-python
train
py
7f96c82d356e7ed2bd299538118775a6063a5da7
diff --git a/scripts/juju-inspect/main.go b/scripts/juju-inspect/main.go index <HASH>..<HASH> 100644 --- a/scripts/juju-inspect/main.go +++ b/scripts/juju-inspect/main.go @@ -42,6 +42,8 @@ func main() { log.Fatal(err) } + // Engine reports aren't actually valid yaml files. Instead they have a + // header that isn't a comment! This code exists to skip that line. row1, _, err := bufio.NewReader(f).ReadLine() if err != nil { log.Fatal(err)
Scripts+inspect: Explain why we have to jump over a header.
juju_juju
train
go
f8bd94767b8fcdd396251c83924ac2983f1cc003
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ try: doc.markdown = open('README.md').read() long_description = doc.rst except: - long_description = open('README.md').read() + pass setup(
Don't read in README if it fails
fordhurley_s3url
train
py
a94248442133baeac0dd095ee37dba08cfae9458
diff --git a/lib/mailin.js b/lib/mailin.js index <HASH>..<HASH> 100644 --- a/lib/mailin.js +++ b/lib/mailin.js @@ -470,7 +470,7 @@ Mailin.prototype.start = function (options, callback) { streamCallback(err); }; _this.emit('validateRecipient', session, address.address, callback); - validateAddress('sender', address.address, session.envelope) + validateAddress('recipient', address.address, session.envelope) .then(ack) .catch(ack); }
Update mailin.js Typo sender is passed to validate address rather than recipient
Flolagale_mailin
train
js
322597b3fb6124970d8eada70a5b05000c478011
diff --git a/lion.go b/lion.go index <HASH>..<HASH> 100644 --- a/lion.go +++ b/lion.go @@ -67,3 +67,7 @@ func (middlewares Middlewares) BuildHandler(handler http.Handler) http.Handler { } return handler } + +func (mws Middlewares) ServeNext(next http.Handler) http.Handler { + return mws.BuildHandler(next) +}
Make Middlewares([]Middleware) implement the Middleware interface
celrenheit_lion
train
go
dea2f0e65b5aba21bd66e1c346e01f0b04177491
diff --git a/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java b/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java index <HASH>..<HASH> 100644 --- a/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java +++ b/presto-main/src/main/java/com/facebook/presto/execution/SqlQueryManager.java @@ -48,6 +48,7 @@ import org.weakref.jmx.Flatten; import org.weakref.jmx.Managed; import org.weakref.jmx.Nested; +import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.annotation.concurrent.ThreadSafe; import javax.inject.Inject; @@ -191,6 +192,11 @@ public class SqlQueryManager queryManagementExecutor = Executors.newScheduledThreadPool(queryManagerConfig.getQueryManagerExecutorPoolSize(), threadsNamed("query-management-%s")); queryManagementExecutorMBean = new ThreadPoolExecutorMBean((ThreadPoolExecutor) queryManagementExecutor); + } + + @PostConstruct + public void start() + { queryManagementExecutor.scheduleWithFixedDelay(new Runnable() { @Override
Start scheduling query management thread in a separate method To prevent unsafe publication.
prestodb_presto
train
java
6046ea9c88fe22f589e815b264d2c16ed46ce1ac
diff --git a/pepper8/pepper8.py b/pepper8/pepper8.py index <HASH>..<HASH> 100644 --- a/pepper8/pepper8.py +++ b/pepper8/pepper8.py @@ -65,7 +65,3 @@ def main(): # Generate the HTML report to output_file if not None, else print to stdout generator = HtmlGenerator(fileparser) generator.generate(output_file=args.output_file) - - -if __name__ == '__main__': - main() diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -48,6 +48,6 @@ setup( 'Programming Language :: Python :: 3.4', ], entry_points={ - 'console_scripts': ['pepper8 = pepper8.pepper8:main', ], + 'console_scripts': ['pepper8=pepper8.pepper8:main'] } )
Remove auto run in pepper8.main
myth_pepper8
train
py,py
5fcec8352c7fdcc6297dd869876494e7131c41b4
diff --git a/src/Bkwld/Decoy/Controllers/Base.php b/src/Bkwld/Decoy/Controllers/Base.php index <HASH>..<HASH> 100644 --- a/src/Bkwld/Decoy/Controllers/Base.php +++ b/src/Bkwld/Decoy/Controllers/Base.php @@ -565,7 +565,7 @@ class Base extends Controller { // Fire them foreach($events as $event) { - if ($until) return Event::until($event, $args); + if ($until) Event::until($event, $args); else Event::fire($event, $args); } }
The return was screwing up model validations from getting caught
BKWLD_decoy
train
php
5c0de270a3df5869ff0247f871745078dbc99fea
diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java index <HASH>..<HASH> 100644 --- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java +++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/AccountJson.java @@ -117,7 +117,8 @@ public class AccountJson extends AccountJsonSimple { @Override public String getLocale() { - return null; + // TODO + return "en"; } @Override
jaxrs: default to English locale for now
killbill_killbill
train
java
a3701ad50c051f74d107178e64431db901eb9e1e
diff --git a/packages/selenium-ide/src/neo/IO/SideeX/playback.js b/packages/selenium-ide/src/neo/IO/SideeX/playback.js index <HASH>..<HASH> 100644 --- a/packages/selenium-ide/src/neo/IO/SideeX/playback.js +++ b/packages/selenium-ide/src/neo/IO/SideeX/playback.js @@ -372,7 +372,7 @@ function doPluginCommand(commandNode, implicitTime, implicitCount) { } function isElementNotFound(error) { - return error.match(/Element[\s\S]*?not (found|visible)/); + return (error.match(/Element[\s\S]*?not (found|visible)/) || error.match === "Element is not currently visible and may not be manipulated"); } async function doLocatorFallback() {
Added atoms element not visible message to `isElementNotFound` check to include in implicit retry
SeleniumHQ_selenium-ide
train
js
e4935c34635a234e8770a16845a46165d5251f23
diff --git a/servlet/src/main/java/io/undertow/servlet/spec/AsyncContextImpl.java b/servlet/src/main/java/io/undertow/servlet/spec/AsyncContextImpl.java index <HASH>..<HASH> 100644 --- a/servlet/src/main/java/io/undertow/servlet/spec/AsyncContextImpl.java +++ b/servlet/src/main/java/io/undertow/servlet/spec/AsyncContextImpl.java @@ -469,7 +469,7 @@ public class AsyncContextImpl implements AsyncContext { @Override public void run() { synchronized (AsyncContextImpl.this) { - if (!dispatched) { + if (!dispatched && !complete) { addAsyncTask(new Runnable() { @Override public void run() {
Fix issue with async timeout
undertow-io_undertow
train
java
fe1ba328a644e947922dc50c53f2e6a7d81b90c1
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaRpcService.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaRpcService.java index <HASH>..<HASH> 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaRpcService.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/akka/AkkaRpcService.java @@ -104,9 +104,14 @@ public class AkkaRpcService implements RpcService { InvocationHandler akkaInvocationHandler = new AkkaInvocationHandler(actorRef, timeout, maximumFramesize); + // Rather than using the System ClassLoader directly, we derive the ClassLoader + // from this class . That works better in cases where Flink runs embedded and all Flink + // code is loaded dynamically (for example from an OSGI bundle) through a custom ClassLoader + ClassLoader classLoader = AkkaRpcService.this.getClass().getClassLoader(); + @SuppressWarnings("unchecked") C proxy = (C) Proxy.newProxyInstance( - ClassLoader.getSystemClassLoader(), + classLoader, new Class<?>[] {clazz}, akkaInvocationHandler);
[FLINK-<I>] [rpc] Use relative classloader for proxies, rather than system class loader.
apache_flink
train
java
7c3f21fe44ca7b2633b44b88ce075c232ab2a160
diff --git a/examples/glyphs/iris_splom.py b/examples/glyphs/iris_splom.py index <HASH>..<HASH> 100644 --- a/examples/glyphs/iris_splom.py +++ b/examples/glyphs/iris_splom.py @@ -41,7 +41,7 @@ zoom = WheelZoomTool(dataranges=[xdr,ydr], dimensions=["x","y"]) def make_plot(xname, yname, xax=False, yax=False, text=None): plot = Plot( x_range=xdr, y_range=ydr, data_sources=[source], background_fill="#efe8e2", - width=250, height=250, border_fill='white', title="", border_symmetry="", min_border=2) + width=250, height=250, border_fill='white', title="", min_border=2) if xax: xaxis = LinearAxis(plot=plot, dimension=0, location="bottom") if yax:
Remove border_symmetry from glyphs/iris_splom.py
bokeh_bokeh
train
py
613a87b1ce3e49cb9bc144873f4d7fe78d4ea219
diff --git a/src/Knp/Menu/Provider/PimpleProvider.php b/src/Knp/Menu/Provider/PimpleProvider.php index <HASH>..<HASH> 100644 --- a/src/Knp/Menu/Provider/PimpleProvider.php +++ b/src/Knp/Menu/Provider/PimpleProvider.php @@ -26,9 +26,4 @@ class PimpleProvider implements MenuProviderInterface { return isset($this->menuIds[$name]); } - - public function addMenu($name, $serviceId) - { - $this->menuIds[$name] = $serviceId; - } }
Removed a method that is not (and cannot be) part of the MenuProviderInterface
KnpLabs_KnpMenu
train
php
ad41641bee1dc8218fafba50ce88b0791c55c2bb
diff --git a/ordered_set.py b/ordered_set.py index <HASH>..<HASH> 100644 --- a/ordered_set.py +++ b/ordered_set.py @@ -68,6 +68,8 @@ class OrderedSet(collections.MutableSet): Get the index of a given key, raising an IndexError if it's not present. """ + if hasattr(key, '__iter__'): + return [self.index(subkey) for subkey in key] return self.map[key] def discard(self, key):
make OrderedSet.index take a list, performing the inverse of __getitem__
LuminosoInsight_ordered-set
train
py
9e97a72c0cc85558b071128c2f80cb7c419ccbd6
diff --git a/zxbpplex.py b/zxbpplex.py index <HASH>..<HASH> 100755 --- a/zxbpplex.py +++ b/zxbpplex.py @@ -91,7 +91,7 @@ class Lexer(object): def t_asm_CONTINUE(self, t): - r'[\\_]\r?\n' + r'[\\_]([ \t]*;.*)?\r?\n' t.lexer.lineno += 1 return t
Ignore continuation chars after comment
boriel_zxbasic
train
py
dad0d13c9020733f6761e268d496b834c562d75b
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -95,8 +95,8 @@ app.get('/tables/:TableName/items/:key', (req, res, next) => { } return get(params).then((response) => { - if (!response) { - return res.status(404).end() + if (!response.Item) { + return res.status(404).send('Not found') } res.render('item', { TableName: req.params.TableName,
send proper <I> when item not found
aaronshaf_dynamodb-admin
train
js
306810528329467771653c81a2f984ae80956290
diff --git a/src/Illuminate/Foundation/Console/KeyGenerateCommand.php b/src/Illuminate/Foundation/Console/KeyGenerateCommand.php index <HASH>..<HASH> 100755 --- a/src/Illuminate/Foundation/Console/KeyGenerateCommand.php +++ b/src/Illuminate/Foundation/Console/KeyGenerateCommand.php @@ -48,6 +48,8 @@ class KeyGenerateCommand extends Command { $this->files->put($path, $contents); + $this->laravel['config']['app.key'] = $key; + $this->info("Application key [$key] set successfully."); }
Set the app key in the config after updating it
laravel_framework
train
php
ce0fcd404f3618218c994d0ce380478c1dc0ea7a
diff --git a/src/index.js b/src/index.js index <HASH>..<HASH> 100644 --- a/src/index.js +++ b/src/index.js @@ -1024,7 +1024,7 @@ function anime(params = {}) { const insTime = adjustTime(engineTime); instance.progress = minMax((insTime / insDuration) * 100, 0, 100); instance.reversePlayback = insTime < instance.currentTime; - if (children) { syncInstanceChildren(insTime); }; + if (children) { syncInstanceChildren(insTime); } if (!instance.began && instance.currentTime > 0) { instance.began = true; setCallback('begin'); @@ -1270,4 +1270,4 @@ anime.easing = parseEasings; anime.penner = penner; anime.random = (min, max) => Math.floor(Math.random() * (max - min + 1)) + min; -export default anime; \ No newline at end of file +export default anime;
Just fixing a little error I noticed ;)
juliangarnier_anime
train
js
9c84550622cb48c63a83cc52c5f1e2af0bda72bb
diff --git a/lib/rackit.js b/lib/rackit.js index <HASH>..<HASH> 100644 --- a/lib/rackit.js +++ b/lib/rackit.js @@ -331,7 +331,7 @@ Rackit.prototype.add = function (source, options, cb) { } // Generate file id - var id = o1.options.filename || utils.uid(24); + var id = options.filename || utils.uid(24); // // Generate the headers to be send to Rackspace
options is a parameter of the add function, not o1. This is how rackspace is told what to name the file. Merge pull request #<I> from benrlodge/fix-filename-option fix options.filename for id variable (reverted from commit <I>f<I>e5f9dd<I>e8c<I>cc<I>e7bb<I>)
rossj_rackit
train
js
d1237affdc2d4f67f7f388e43ea7bdb9f8813b54
diff --git a/hwt/hdl/statements/utils/listOfHdlStatements.py b/hwt/hdl/statements/utils/listOfHdlStatements.py index <HASH>..<HASH> 100644 --- a/hwt/hdl/statements/utils/listOfHdlStatements.py +++ b/hwt/hdl/statements/utils/listOfHdlStatements.py @@ -1,3 +1,4 @@ +from copy import deepcopy from itertools import islice from typing import Sequence, Dict, List, Union @@ -113,3 +114,10 @@ class ListOfHdlStatement(list): res = list.sort(self, *args, **kwargs) self.firstStmWithBranchesI = None return res + + def __deepcopy__(self, memo: dict): + cls = self.__class__ + result = cls(deepcopy(i, memo) for i in self) + memo[id(self)] = result + return result +
fix ListOfHdlStatement.__deepcopy__ (avoid copy of signals)
Nic30_hwt
train
py
dc476bbf544e4918446fe8a04be02981d1bf9f9e
diff --git a/symphony/content/content.blueprintspages.php b/symphony/content/content.blueprintspages.php index <HASH>..<HASH> 100755 --- a/symphony/content/content.blueprintspages.php +++ b/symphony/content/content.blueprintspages.php @@ -7,7 +7,7 @@ class contentBlueprintsPages extends AdministrationPage { protected $_errors; - protected $_hilights; + protected $_hilights = array(); public function __viewIndex() { $this->setPageType('table');
Explicitly set as an array to suppress in_array WARNINGs later on
symphonycms_symphony-2
train
php
93d0bf9d3246a8df4b049f6c0c6e8da94ad561fa
diff --git a/lib/snapshot/runner.rb b/lib/snapshot/runner.rb index <HASH>..<HASH> 100644 --- a/lib/snapshot/runner.rb +++ b/lib/snapshot/runner.rb @@ -63,6 +63,7 @@ module Snapshot ENV['SNAPSHOT_LANGUAGE'] = language command = generate_test_command(device, language, app_path) + Helper.log.debug command.yellow retry_run = false
Added logging of executed test command
fastlane_fastlane
train
rb
33affbf26411a3157d8f38b5dac8f66be878e894
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb index <HASH>..<HASH> 100644 --- a/lib/sinatra/base.rb +++ b/lib/sinatra/base.rb @@ -446,10 +446,19 @@ module Sinatra end # Access settings defined with Base.set. + def self.settings + self + end + + # Access settings defined with Base.set. def settings - self.class + self.class.settings end + alias_method :options, :settings + class << self + alias_method :options, :settings + end # Exit the current block, halts any further processing # of the request, and returns the specified response. diff --git a/test/settings_test.rb b/test/settings_test.rb index <HASH>..<HASH> 100644 --- a/test/settings_test.rb +++ b/test/settings_test.rb @@ -115,6 +115,10 @@ class SettingsTest < Test::Unit::TestCase assert_equal :foo, @base.new.settings.environment end + it 'is accessible from class via #settings' do + assert_equal :foo, @base.settings.environment + end + describe 'methodoverride' do it 'is disabled on Base' do assert ! @base.method_override?
Add class level #settings for convenience.
sinatra_sinatra
train
rb,rb
1f2fb03606e16ee94f30a15de64cdb597f877e46
diff --git a/src/BehatPlugin.php b/src/BehatPlugin.php index <HASH>..<HASH> 100644 --- a/src/BehatPlugin.php +++ b/src/BehatPlugin.php @@ -11,6 +11,7 @@ namespace PhpGuard\Plugins\Behat; +use PhpGuard\Application\ApplicationEvents; use PhpGuard\Application\Event\GenericEvent; use PhpGuard\Application\Event\ProcessEvent; use PhpGuard\Application\Plugin\Plugin; @@ -27,6 +28,13 @@ class BehatPlugin extends Plugin $this->setOptions(array()); } + public static function getSubscribedEvents() + { + return array( + ApplicationEvents::started => 'start' + ); + } + public function configure() { parent::configure();
added feature to start behat when application started
phpguard_plugin-behat
train
php
fc7a14af19cb87add83d9db6a8e38d8d6ac8ad1b
diff --git a/packages/ember-runtime/lib/copy.js b/packages/ember-runtime/lib/copy.js index <HASH>..<HASH> 100644 --- a/packages/ember-runtime/lib/copy.js +++ b/packages/ember-runtime/lib/copy.js @@ -39,7 +39,7 @@ function _copy(obj, deep, seen, copies) { ret = {}; for (key in obj) { - if (!obj.hasOwnProperty(key)) { + if (obj.hasOwnProperty && !obj.hasOwnProperty(key)) { continue; } diff --git a/packages/ember-runtime/tests/core/copy_test.js b/packages/ember-runtime/tests/core/copy_test.js index <HASH>..<HASH> 100644 --- a/packages/ember-runtime/tests/core/copy_test.js +++ b/packages/ember-runtime/tests/core/copy_test.js @@ -12,3 +12,9 @@ test("Ember.copy date", function() { dateCopy = copy(date); equal(date.getTime(), dateCopy.getTime(), "dates should be equivalent"); }); + +test("Ember.copy null prototype object", function() { + var obj = Object.create(null); + obj.foo = 'bar'; + equal(copy(obj).foo, 'bar', 'bar should still be bar'); +});
Ember.copy should copy null prototype object
emberjs_ember.js
train
js,js
96188bdeb92ee893c7a17fff185beb8c0f0d5aa7
diff --git a/js/helpers/replaceAll.js b/js/helpers/replaceAll.js index <HASH>..<HASH> 100644 --- a/js/helpers/replaceAll.js +++ b/js/helpers/replaceAll.js @@ -1,11 +1,17 @@ var escapeRegExp = require( "lodash/string/escapeRegExp" ); +/** + * Replace placeholders in the passed string. + * @param {string} string The string that needs placeholders to be replaced. + * @param {object} mapObject The replacement values to be used. + * @returns {string} The string with the replaced placeholders. + */ var replaceAll = function( string, mapObject ) { - var replacementString = escapeRegExp( Object.keys( mapObject ).join( "|" ) ).replace( "\\|", "|" ); + var replacementString = escapeRegExp( Object.keys( mapObject ).join( "|" ) ).replace( "\\|", "|" ); - return string.replace( new RegExp( replacementString, "gi" ), function( matched ) { - return mapObject[ matched.toLowerCase() ]; - } ); + return string.replace( new RegExp( replacementString, "gi" ), function( matched ) { + return mapObject[ matched.toLowerCase() ]; + } ); }; module.exports = replaceAll;
Fixed some tab issues and added missing docblock
Yoast_YoastSEO.js
train
js
56ada5ca918609282aed3e8e546b6b58baad50d9
diff --git a/isso/js/app/i18n/zh_TW.js b/isso/js/app/i18n/zh_TW.js index <HASH>..<HASH> 100644 --- a/isso/js/app/i18n/zh_TW.js +++ b/isso/js/app/i18n/zh_TW.js @@ -6,7 +6,7 @@ define({ "postbox-preview": "預覽", "postbox-edit": "編輯", "postbox-submit": "送出", - "postbox-notification": "訂閱回复的電子郵件通知", + "postbox-notification": "訂閱回覆的電子郵件通知", "num-comments": "1 則留言\n{{ n }} 則留言", "no-comments": "尚無留言",
Fixing a zh_TW translation text (#<I>)
posativ_isso
train
js
0f6069bb7b3f29d73991783d586423a0d361c44c
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java index <HASH>..<HASH> 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java @@ -387,7 +387,7 @@ public final class CoreMetrics { public static final Metric TEST_FAILURES = new Metric.Builder(TEST_FAILURES_KEY, "Unit test failures", Metric.ValueType.INT) .setDescription("Number of unit test failures") .setDirection(Metric.DIRECTION_WORST) - .setQualitative(false) + .setQualitative(true) .setDomain(DOMAIN_TESTS) .setBestValue(0.0) .setOptimizedBestValue(true) @@ -1490,8 +1490,7 @@ public final class CoreMetrics { .setFormula(new SumChildValuesFormula(false)) .create(); - - + //--------------------------------------------------------------------------------------------------------------------
SONAR-<I> Metric 'test_failures' should be qualitative
SonarSource_sonarqube
train
java
fc81c64f7f4d09d28978ab72d3cfa60ae6b831f0
diff --git a/docs/python_docs/_static/google_analytics.js b/docs/python_docs/_static/google_analytics.js index <HASH>..<HASH> 100644 --- a/docs/python_docs/_static/google_analytics.js +++ b/docs/python_docs/_static/google_analytics.js @@ -22,5 +22,5 @@ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); - ga('create', 'UA-96378503-11', 'auto'); + ga('create', 'UA-96378503-1', 'auto'); ga('send', 'pageview');
Correct Google Analytics Tracker (#<I>)
apache_incubator-mxnet
train
js
295d8e0031500e259a3c8197271cd2b20ef25bbc
diff --git a/trimesh/exchange/obj.py b/trimesh/exchange/obj.py index <HASH>..<HASH> 100644 --- a/trimesh/exchange/obj.py +++ b/trimesh/exchange/obj.py @@ -195,7 +195,8 @@ def load_obj(file_obj, resolver=None, **kwargs): # find the first newline in the chunk # everything before it will be the usemtl direction newline = m_chunk.find('\n') - current_material = m_chunk[:newline].strip() + # remove internal double spaces because why wouldn't that be OK + current_material = ' '.join(m_chunk[:newline].strip().split()) # material chunk contains multiple objects o_split = m_chunk.split('\no ') if len(o_split) > 1: @@ -426,7 +427,6 @@ def parse_mtl(mtl, resolver=None): if material is not None: # save the old material by old name and remove key materials[material.pop('newmtl')] = material - # start a fresh new material material = {'newmtl': ' '.join(split[1:])}
change current_material to match newmtl
mikedh_trimesh
train
py
05ac42f5c89e85f6c2fd9c512a0f43f32a430af9
diff --git a/test/unit/formatters/total_time_test.rb b/test/unit/formatters/total_time_test.rb index <HASH>..<HASH> 100644 --- a/test/unit/formatters/total_time_test.rb +++ b/test/unit/formatters/total_time_test.rb @@ -3,6 +3,7 @@ require 'test_helper' class TotalTimeTest < Test::Unit::TestCase include FormatterTestHelper include MiddlewareTestHelper + include Tack::Util def middleware_class TotalTime @@ -11,4 +12,13 @@ class TotalTimeTest < Test::Unit::TestCase should_behave_like_middleware should_behave_like_formatter + should "print total time" do + adapter = StubAdapter.new + adapter.pass(Test.make) + output = StringIO.new + middleware = TotalTime.new(adapter, :output => output) + middleware.run_suite([Test.make]) + assert_match /Finished in \d+.\d+ seconds/, output.string + end + end
Added test for TotalTime formatter
bhb_tack
train
rb
6913515c831b6e795d4bf31a5a11415aa21dfa9e
diff --git a/internal/oci/runtime_vm.go b/internal/oci/runtime_vm.go index <HASH>..<HASH> 100644 --- a/internal/oci/runtime_vm.go +++ b/internal/oci/runtime_vm.go @@ -155,8 +155,10 @@ func (r *runtimeVM) CreateContainer(c *Container, cgroupParent string) (retErr e createdCh := make(chan error) go func() { // Create the container - if _, err := r.task.Create(r.ctx, request); err != nil { + if resp, err := r.task.Create(r.ctx, request); err != nil { createdCh <- errdefs.FromGRPC(err) + } else if err := c.state.SetInitPid(int(resp.Pid)); err != nil { + createdCh <- err } close(createdCh) @@ -649,6 +651,7 @@ func (r *runtimeVM) updateContainerStatus(c *Container) error { c.state.Finished = response.ExitedAt exitCode := int32(response.ExitStatus) c.state.ExitCode = &exitCode + c.state.Pid = int(response.Pid) if exitCode != 0 { oomFilePath := filepath.Join(c.bundlePath, "oom")
runtime_vm: set Pid and InitPid for VM runtimes If Pid or InitPid is not set correctly, then c.Alive() will return false, and all calls depending on c.Alive() will fail. Fixes: #<I>
cri-o_cri-o
train
go
6262d1871dbfe0c41bd47c8d0817a4db9053c846
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -49,7 +49,7 @@ process.nextTick(function () { logger.disableColors(); } //Get the tasks to run - let list = (typeof options["flow-tasks"] === "string") ? options["tasks"].split(",") : tasksList; + let list = (typeof options["flow-tasks"] === "string") ? options["flow-tasks"].split(",") : tasksList; if(list.length === 0) { logger.error("No tasks to run"); return logger.end();
Fixed bug getting tasks passed from CLI
jmjuanes_tinyflow
train
js
b03e1b75099cb46e40f7dcf85dc61e8718aa292d
diff --git a/slack_log_handler/__init__.py b/slack_log_handler/__init__.py index <HASH>..<HASH> 100644 --- a/slack_log_handler/__init__.py +++ b/slack_log_handler/__init__.py @@ -1,9 +1,19 @@ import json import traceback -from logging import Handler +from logging import Handler, CRITICAL, ERROR, WARNING from slacker import Slacker +ERROR_COLOR = 'danger' # color name is built in to Slack API +WARNING_COLOR = 'warning' # color name is built in to Slack API +INFO_COLOR = '#439FE0' + +COLORS = { + CRITICAL: ERROR_COLOR, + ERROR: ERROR_COLOR, + WARNING: WARNING_COLOR +} + class SlackLogHandler(Handler): def __init__(self, api_key, channel, stack_trace=False, username='Python logger', icon_url=None, icon_emoji=None): @@ -22,7 +32,7 @@ class SlackLogHandler(Handler): message = str(record.getMessage()) attachments = [{ 'fallback': message, - 'color': 'danger', + 'color': COLORS.get(self.level, INFO_COLOR), 'text': '\n'.join(traceback.format_exception(*record.exc_info)) }] self.slack_chat.chat.post_message(
Set attachment color based on log level
mathiasose_slacker_log_handler
train
py
2de4a243971aab231adbcab0e67e21570cdbd971
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -9,8 +9,8 @@ module.exports = function(hydro) { if (!hydro.get('focus')) return; var focus = false; hydro.on('pre:test', function(test) { - if (focus) return test.skip(); - if (test.meta.indexOf('focus') != -1) focus = true; + if (focus || test.meta.indexOf('focus') == -1) return test.skip(); + focus = true; }); };
Fix bug where it will run more tests than desired
hydrojs_focus
train
js
a3ad3ba240b736be665352c84ae5bbc4ed0affce
diff --git a/mtp_common/user_admin/urls.py b/mtp_common/user_admin/urls.py index <HASH>..<HASH> 100644 --- a/mtp_common/user_admin/urls.py +++ b/mtp_common/user_admin/urls.py @@ -5,6 +5,6 @@ from . import views urlpatterns = [ url(r'^users/$', views.list_users, name='list-users'), url(r'^users/new/$', views.UserCreationView.as_view(), name='new-user'), - url(r'^users/(?P<username>[\w-]+)/edit/$', views.UserUpdateView.as_view(), name='edit-user'), - url(r'^users/(?P<username>[\w-]+)/delete/$', views.delete_user, name='delete-user'), + url(r'^users/(?P<username>[^/]+)/edit/$', views.UserUpdateView.as_view(), name='edit-user'), + url(r'^users/(?P<username>[^/]+)/delete/$', views.delete_user, name='delete-user'), ]
Allow for editing/deletion of all valid usernames
ministryofjustice_money-to-prisoners-common
train
py
9d2d2dcbeff653cf1d9f11839114237111a712b6
diff --git a/lib/spaceship/tunes/language_item.rb b/lib/spaceship/tunes/language_item.rb index <HASH>..<HASH> 100644 --- a/lib/spaceship/tunes/language_item.rb +++ b/lib/spaceship/tunes/language_item.rb @@ -30,7 +30,7 @@ module Spaceship def inspect result = "" self.original_array.collect do |current| - result += current['language'] + ": " + current[identifier]['value'] + "\n" + result += "#{current.fetch('language')}: #{current.fetch(identifier, {}).fetch('value')}\n" end result end
Fixed inspect of language item when value is nil
fastlane_fastlane
train
rb
5c12a8ba2be633ce403e6162ec211a89eaf94404
diff --git a/packages/node_modules/@ciscospark/test-helper-mock-spark/src/index.js b/packages/node_modules/@ciscospark/test-helper-mock-spark/src/index.js index <HASH>..<HASH> 100644 --- a/packages/node_modules/@ciscospark/test-helper-mock-spark/src/index.js +++ b/packages/node_modules/@ciscospark/test-helper-mock-spark/src/index.js @@ -65,6 +65,14 @@ function makeSpark(options) { }, put: function put(namespace, key, value) { this.data = this.data || data; + try { + // this is the simplest way to to turn ampstate objects into bare + // objects without actually checking if they're ampstate objects + value = JSON.parse(JSON.stringify(value)); + } + catch (err) { + // ignore + } this.data[namespace] = this.data[namespace] || {}; this.data[namespace][key] = value; return Promise.resolve();
fix(@ciscospark/test-helper-mock-spark): do not store instance
webex_spark-js-sdk
train
js