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
361263cc6d80577d6dffddd50c98099595c523bb
diff --git a/satpy/tests/test_readers.py b/satpy/tests/test_readers.py index <HASH>..<HASH> 100644 --- a/satpy/tests/test_readers.py +++ b/satpy/tests/test_readers.py @@ -691,6 +691,7 @@ class TestYAMLFiles(unittest.TestCase): reader_names = available_readers(yaml_loader=yaml.BaseLoader) self.assertIn('abi_l1b', reader_names) # needs netcdf4 + self.assertIn('viirs_l1b', reader_names) self.assertEqual(len(reader_names), len(list(glob_config('readers/*.yaml'))))
refactor: add another reader name to check
pytroll_satpy
train
py
ec7facfd2b56bc14af936e6923b69ed7f9fcd646
diff --git a/perfdump/models.py b/perfdump/models.py index <HASH>..<HASH> 100644 --- a/perfdump/models.py +++ b/perfdump/models.py @@ -184,7 +184,10 @@ class BaseTimeModel(object): """ cur = cls.get_cursor() - q = "SELECT file, SUM(elapsed) as sum_elapsed FROM {} ORDER BY sum_elapsed DESC LIMIT {}" + q = ( + "SELECT file, SUM(elapsed) as sum_elapsed FROM {} GROUP BY file" + " ORDER BY sum_elapsed DESC LIMIT {}" + ) cur.execute(q.format(cls.meta['table'], num)) result = cur.fetchall() # Don't return the weird invalid row if no tests were run @@ -197,7 +200,6 @@ class BaseTimeModel(object): """Returns the total time taken across all results. :rtype: float - """ cur = cls.get_cursor() q = "SELECT SUM(elapsed) FROM {}"
bug: Fix Query To Get Slowest Per-File Tests * The query lacked a GROUP BY clause and so collapsed all the file names down into a single one.
etscrivner_nose-perfdump
train
py
f7973c16c98a70b86e2ff5638b98f864e39342e7
diff --git a/PhpAmqpLib/Wire/GenericContent.php b/PhpAmqpLib/Wire/GenericContent.php index <HASH>..<HASH> 100644 --- a/PhpAmqpLib/Wire/GenericContent.php +++ b/PhpAmqpLib/Wire/GenericContent.php @@ -9,7 +9,7 @@ use PhpAmqpLib\Channel\AMQPChannel; */ abstract class GenericContent { - /** @var string[] */ + /** @var array */ public $delivery_info = array(); /** @var array Final property definitions */
Update $delivery_info to simply an array
php-amqplib_php-amqplib
train
php
60d23b2921ec0c1d6abfabd1501ddcf9b9ce174a
diff --git a/src/Leevel/Database/Ddd/Entity.php b/src/Leevel/Database/Ddd/Entity.php index <HASH>..<HASH> 100644 --- a/src/Leevel/Database/Ddd/Entity.php +++ b/src/Leevel/Database/Ddd/Entity.php @@ -786,9 +786,8 @@ abstract class Entity implements IArray, IJson, JsonSerializable, ArrayAccess */ public function withProp(string $prop, $value, bool $force = true, bool $ignoreReadonly = false, bool $ignoreUndefinedProp = false): self { - $prop = static::normalize($prop); - try { + $prop = static::normalize($prop); $this->validate($prop); } catch (InvalidArgumentException $e) { if ($ignoreUndefinedProp) { @@ -1115,7 +1114,7 @@ abstract class Entity implements IArray, IJson, JsonSerializable, ArrayAccess } /** - * 获取主键. + * 获取主键值. * * - 唯一标识符. *
refactor(ddd): code poem
hunzhiwange_framework
train
php
711a4edcd3591ba1bb52ef652a0a3d14b81c1b60
diff --git a/jupyterthemes/__init__.py b/jupyterthemes/__init__.py index <HASH>..<HASH> 100644 --- a/jupyterthemes/__init__.py +++ b/jupyterthemes/__init__.py @@ -29,9 +29,9 @@ def install_path(profile=None, jupyter=True): profile = profile or DEFAULT_PROFILE home_path = os.path.expanduser(os.path.join(IPY_HOME)) profile_path = home_path.format(profile='profile_'+profile) + custom_path = '/'.join([profile_path, 'static', 'custom']) if not os.path.exists(profile_path): - custom_path = '/'.join([profile_path, 'static', 'custom']) print "Profile %s does not exist at %s" % (profile, home_path) print "creating profile: %s" % profile subprocess.call(['ipython', 'profile', 'create', profile]) @@ -44,7 +44,7 @@ def install_path(profile=None, jupyter=True): else: print "No ipython config files (~/.ipython/profile_default/static/custom/)" print "try again after running ipython, closing & refreshing your terminal session" - + paths.append(custom_path) if jupyter:
fix inf loop during install on ipython4
dunovank_jupyter-themes
train
py
db68b82b48ce3b2fdd53031c45105b6895716f5c
diff --git a/lib/orbacle/nesting_container.rb b/lib/orbacle/nesting_container.rb index <HASH>..<HASH> 100644 --- a/lib/orbacle/nesting_container.rb +++ b/lib/orbacle/nesting_container.rb @@ -29,31 +29,31 @@ module Orbacle end def initialize - @current_nesting = [] + @levels = [] end def get_output_nesting - @current_nesting.map {|level| level.full_name } + @levels.map {|level| level.full_name } end def levels - @current_nesting + @levels end def is_selfed? - @current_nesting.last.is_a?(ClassConstLevel) + @levels.last.is_a?(ClassConstLevel) end def increase_nesting_const(const_ref) - @current_nesting << ConstLevel.new(const_ref) + @levels << ConstLevel.new(const_ref) end def increase_nesting_self - @current_nesting << ClassConstLevel.new(nesting_to_scope()) + @levels << ClassConstLevel.new(nesting_to_scope()) end def decrease_nesting - @current_nesting.pop + @levels.pop end def scope_from_nesting_and_prename(prename)
Rename @current_nesting to @levels
swistak35_orbacle
train
rb
2e14836f5d245c7153f95171857855e7fda90a07
diff --git a/src/main/java/org/fxmisc/flowless/Navigator.java b/src/main/java/org/fxmisc/flowless/Navigator.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/fxmisc/flowless/Navigator.java +++ b/src/main/java/org/fxmisc/flowless/Navigator.java @@ -96,7 +96,10 @@ extends Region implements TargetPositionVisitor { * and re-lays out the viewport */ public void scrollCurrentPositionBy(double delta) { - targetPosition = currentPosition.scrollBy(delta); + // delta needs rounding otherwise thin lines appear between cells, + // notably when scrolling with a mouse or using a scroll bar and + // usually only visible when cells have dark backgrounds/borders. + targetPosition = currentPosition.scrollBy(Math.round(delta)); requestLayout(); }
Fix thin lines between cells (#<I>)
FXMisc_Flowless
train
java
bb7f16339c8150a50c504133a9e578b2b88ac0c4
diff --git a/cli/src/main/java/org/jboss/as/cli/operation/OperationRequestCompleter.java b/cli/src/main/java/org/jboss/as/cli/operation/OperationRequestCompleter.java index <HASH>..<HASH> 100644 --- a/cli/src/main/java/org/jboss/as/cli/operation/OperationRequestCompleter.java +++ b/cli/src/main/java/org/jboss/as/cli/operation/OperationRequestCompleter.java @@ -118,7 +118,7 @@ public class OperationRequestCompleter implements Completor { if(handler.hasOperationName() || handler.endsOnAddressOperationNameSeparator()) { OperationCandidatesProvider provider = ctx.getOperationCandidatesProvider(); - final List<String> names = provider.getOperationNames(ctx.getPrefix()); + final List<String> names = provider.getOperationNames(handler.getAddress()); if(names.isEmpty()) { return -1; }
pass the full address instead of just the prefix to the candidates provider was: <I>d<I>be<I>e<I>a<I>d4f<I>f7aca<I>ca<I>fadd
wildfly_wildfly-core
train
java
e770f9f42867a738ca181480827bb305f6736e15
diff --git a/lightflow/models/dag.py b/lightflow/models/dag.py index <HASH>..<HASH> 100644 --- a/lightflow/models/dag.py +++ b/lightflow/models/dag.py @@ -133,7 +133,7 @@ class Dag: for task in nx.topological_sort(graph): task.workflow_name = self.workflow_name task.dag_name = self.name - if len(graph.predecessors(task)) == 0: + if len(list(graph.predecessors(task))) == 0: task.state = TaskState.Waiting tasks.append(task) @@ -166,7 +166,7 @@ class Dag: if stopped: task.state = TaskState.Stopped else: - pre_tasks = graph.predecessors(task) + pre_tasks = list(graph.predecessors(task)) if all([p.is_completed for p in pre_tasks]): # check whether the task should be skipped diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ setup( 'celery>=4.0.2', 'click>=6.7', 'colorlog>=2.10.0', - 'networkx>=1.11,<2', + 'networkx', 'pymongo>=3.6.0', 'pytz>=2016.10', 'redis>=2.10.5',
updated for networkx <I> (#<I>)
AustralianSynchrotron_lightflow
train
py,py
079181342452a1bd5cc76f2425c02db14cb46c2f
diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IGlobalServiceProvider.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IGlobalServiceProvider.java index <HASH>..<HASH> 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IGlobalServiceProvider.java +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/resource/IGlobalServiceProvider.java @@ -10,6 +10,7 @@ package org.eclipse.xtext.resource; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; +import org.eclipse.emf.ecore.resource.Resource; import com.google.inject.ImplementedBy; import com.google.inject.Inject; @@ -56,8 +57,11 @@ public interface IGlobalServiceProvider { if (eObject.eIsProxy()) { return findService(((InternalEObject)eObject).eProxyURI(),serviceClazz); } else { - return findService(eObject.eResource().getURI(),serviceClazz); + Resource eResource = eObject.eResource(); + if(eResource != null) + return findService(eResource.getURI(),serviceClazz); } + return null; } }
[grammar][codeassist] Reworked feature proposals
eclipse_xtext-core
train
java
dab9650a541f12e31ce33408f328b2a7b1073a64
diff --git a/lib/tty/command.rb b/lib/tty/command.rb index <HASH>..<HASH> 100644 --- a/lib/tty/command.rb +++ b/lib/tty/command.rb @@ -174,7 +174,7 @@ module TTY # @api private def command(*args) cmd = Cmd.new(*args) - cmd.update(@cmd_options) + cmd.update(**@cmd_options) cmd end
fix Ruby <I> warning: Using the last argument as keyword parameters is deprecated (#<I>)
piotrmurach_tty-command
train
rb
d39840eb6e595703ed56b69fe43f2fb5aa2971a4
diff --git a/app/controllers/content_search_controller.rb b/app/controllers/content_search_controller.rb index <HASH>..<HASH> 100644 --- a/app/controllers/content_search_controller.rb +++ b/app/controllers/content_search_controller.rb @@ -312,9 +312,16 @@ class ContentSearchController < ApplicationController {:terms => {:enabled => [true]}}] conditions << {:terms => {:product_id => product_ids}} unless product_ids.blank? + #get total repos + found = Repository.search(:load => true) do + query {string term, {:default_field => 'name'}} unless term.blank? + filter "and", conditions + size 1 + end Repository.search(:load => true) do query {string term, {:default_field => 'name'}} unless term.blank? filter "and", conditions + size found.total end end
<I> - fixing issue where only <I> repos would appear on content search
Katello_katello
train
rb
3eabb52becac49c21bf73e394c9a26a362e053c7
diff --git a/bench/format/plot.py b/bench/format/plot.py index <HASH>..<HASH> 100644 --- a/bench/format/plot.py +++ b/bench/format/plot.py @@ -145,7 +145,7 @@ class TimeSeriesCollection(): for val in self.data.iteritems(): stat_report = {} stat_report['mean'] = stats.mean(map(lambda x: x, val[1])) - stat_report['stddev'] = stats.stddev(map(lambda x: x, val[1])) + stat_report['stdev'] = stats.stdev(map(lambda x: x, val[1])) res[val[0]] = stat_report return res
stdev not stddev
rethinkdb_rethinkdb
train
py
e7802e4f0b17b1163ea34d1d190ab03cfd7966b3
diff --git a/ph-oton-core/src/main/java/com/helger/photon/core/app/context/SimpleWebExecutionContext.java b/ph-oton-core/src/main/java/com/helger/photon/core/app/context/SimpleWebExecutionContext.java index <HASH>..<HASH> 100644 --- a/ph-oton-core/src/main/java/com/helger/photon/core/app/context/SimpleWebExecutionContext.java +++ b/ph-oton-core/src/main/java/com/helger/photon/core/app/context/SimpleWebExecutionContext.java @@ -196,9 +196,9 @@ public class SimpleWebExecutionContext implements ISimpleWebExecutionContext } @Nonnull - public Iterator <Map.Entry <String, Object>> getIterator () + public Iterator <Map.Entry <String, Object>> iterator () { - return m_aRequestScope.getIterator (); + return m_aRequestScope.iterator (); } public boolean getCheckBoxAttr (@Nullable final String sName, final boolean bDefaultValue)
Updated to new ph-commons API
phax_ph-oton
train
java
c68cb15c1a59656b6ae0247818909f219536e257
diff --git a/tests/Parsers/HslaParserTest.php b/tests/Parsers/HslaParserTest.php index <HASH>..<HASH> 100644 --- a/tests/Parsers/HslaParserTest.php +++ b/tests/Parsers/HslaParserTest.php @@ -168,7 +168,7 @@ class HslaParserTest extends PHPUnit_Framework_TestCase ); } - public function test_it_throws_when_attempting_to_parse_unsopported_string() + public function test_it_throws_when_attempting_to_parse_unsupported_string() { $parser = new HslaParser;
Typo: unsopported => unsupported
ssnepenthe_color-utils
train
php
284154f759f4a51b1e0c1af684fa6bb7a123be58
diff --git a/lib/prices.js b/lib/prices.js index <HASH>..<HASH> 100644 --- a/lib/prices.js +++ b/lib/prices.js @@ -111,7 +111,7 @@ Prices.prototype.getValues = function(opts, callback) { } for (var j=0; j<row.Columns.length; j++) { var column = row.Columns[j] - var value = parseFloat(column.Value.replace(/(?:\s|,)/, '.')) + var value = parseFloat(column.Value.replace(/[. ]+/g, '')) if (isNaN(value)) { // console.log('invalid value ' + column.Value) continue
Update prices.js Regex failed in the last commit.
samuelmr_nordpool-node
train
js
3fcf87e61d04d25b921fec0d3f8225a91dd328cc
diff --git a/ratcave/texture.py b/ratcave/texture.py index <HASH>..<HASH> 100644 --- a/ratcave/texture.py +++ b/ratcave/texture.py @@ -85,10 +85,11 @@ class Texture(BaseTexture, ugl.BindTargetMixin): gl.glFramebufferTexture2DEXT(gl.GL_FRAMEBUFFER_EXT, self.attachment_point, self.target0, self.id, 0) @classmethod - def from_image(cls, img_filename, **kwargs): - """Uses Pyglet's image.load function to generate a Texture from an image file.""" + def from_image(cls, img_filename, mipmap=True, **kwargs): + """Uses Pyglet's image.load function to generate a Texture from an image file. If 'mipmap', then texture will + have mipmap layers calculated.""" img = pyglet.image.load(img_filename) - tex = img.get_texture() + tex = img.get_mipmapped_texture() if mipmap else img.get_texture() gl.glBindTexture(gl.GL_TEXTURE_2D, 0) return cls(id=tex.id, data=tex, **kwargs)
Added mipmapping from pyglet texture creation from images.
ratcave_ratcave
train
py
3532fccbc800a1a733a44bbe85ce9ad8affe064f
diff --git a/trie/dtrie/dtrie_test.go b/trie/dtrie/dtrie_test.go index <HASH>..<HASH> 100644 --- a/trie/dtrie/dtrie_test.go +++ b/trie/dtrie/dtrie_test.go @@ -155,7 +155,7 @@ func TestIterate(t *testing.T) { for atomic.LoadInt64(&c) < 100 { } close(stop) - assert.True(t, c > 99 && c < 110) + assert.True(t, c > 99 && c < 1000) // test with collisions n = insertTest(t, collisionHash, 1000) c = 0
widen bounds for atomic assertion
Workiva_go-datastructures
train
go
2c98a2fb626b85e31d16b16e7ea6a90fd83534c5
diff --git a/lib/suites/LinkedDataSignature.js b/lib/suites/LinkedDataSignature.js index <HASH>..<HASH> 100644 --- a/lib/suites/LinkedDataSignature.js +++ b/lib/suites/LinkedDataSignature.js @@ -55,13 +55,11 @@ module.exports = class LinkedDataSignature extends LinkedDataProof { // build proof (currently known as `signature options` in spec) let proof; if(this.proof) { - // use proof JSON-LD document passed to API - proof = await jsonld.compact( - this.proof, constants.SECURITY_CONTEXT_URL, - {documentLoader, expansionMap, compactToRelative: false}); + // shallow copy + proof = {...this.proof}; } else { // create proof JSON-LD document - proof = {'@context': constants.SECURITY_CONTEXT_URL}; + proof = {}; } // ensure proof type is set
Do not insert security context into proof.
digitalbazaar_jsonld-signatures
train
js
3c244c03542aab63eded83e41d70fe9d1a8ab802
diff --git a/ribbon-core/src/main/java/com/netflix/client/AbstractLoadBalancerAwareClient.java b/ribbon-core/src/main/java/com/netflix/client/AbstractLoadBalancerAwareClient.java index <HASH>..<HASH> 100644 --- a/ribbon-core/src/main/java/com/netflix/client/AbstractLoadBalancerAwareClient.java +++ b/ribbon-core/src/main/java/com/netflix/client/AbstractLoadBalancerAwareClient.java @@ -192,6 +192,9 @@ public abstract class AbstractLoadBalancerAwareClient<S extends ClientRequest, T response = execute(request); done = true; } catch (Exception e) { + if (serverStats != null) { + serverStats.addToFailureCount(); + } lastException = e; if (isCircuitBreakerException(e) && serverStats != null) { serverStats.incrementSuccessiveConnectionFailureCount();
Track total failures count for client upon exception.
Netflix_ribbon
train
java
26fcde10fa937bb84896bc37ccf653b2f4c162db
diff --git a/src/Psalm/Internal/PropertyMap.php b/src/Psalm/Internal/PropertyMap.php index <HASH>..<HASH> 100644 --- a/src/Psalm/Internal/PropertyMap.php +++ b/src/Psalm/Internal/PropertyMap.php @@ -327,7 +327,7 @@ return [ 'previousSibling' => 'DOMNode|null', 'nextSibling' => 'DOMNode|null', 'attributes' => 'null', - 'ownerDocument' => 'DOMDocument', + 'ownerDocument' => 'DOMDocument|null', 'namespaceURI' => 'string|null', 'prefix' => 'string', 'localName' => 'string',
Fix #<I> - use correct property type for ownerDocument
vimeo_psalm
train
php
06536bb4612a664fbe999677ef3392b677e82b61
diff --git a/plugins/CoreHome/angularjs/common/services/periods.js b/plugins/CoreHome/angularjs/common/services/periods.js index <HASH>..<HASH> 100644 --- a/plugins/CoreHome/angularjs/common/services/periods.js +++ b/plugins/CoreHome/angularjs/common/services/periods.js @@ -346,7 +346,7 @@ date.setTime(date.getTime() + date.getTimezoneOffset() * 60 * 1000); // apply piwik site timezone (if it exists) - date.setHours((piwik.timezoneOffset || 0) / 3600); + date.setHours(date.getHours() + ((piwik.timezoneOffset || 0) / 3600)); // get rid of hours/minutes/seconds/etc. date.setHours(0);
Add timezone to current date hours instead of directly setting to timezone offset. (#<I>)
matomo-org_matomo
train
js
e6369bc9e97d0f1e5583725cd9f684bbe4fca3e1
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index <HASH>..<HASH> 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -149,7 +149,10 @@ module Rails require "action_dispatch/http/rack_cache" if rack_cache middleware.use ::Rack::Cache, rack_cache if rack_cache - middleware.use ::ActionDispatch::Static, config.static_asset_paths if config.serve_static_assets + if config.serve_static_assets + asset_paths = ActiveSupport::OrderedHash[config.static_asset_paths.to_a.reverse] + middleware.use ::ActionDispatch::Static, asset_paths + end middleware.use ::Rack::Lock unless config.allow_concurrency middleware.use ::Rack::Runtime middleware.use ::Rails::Rack::Logger
Application's assets should have higher priority than engine's ones [#<I> state:resolved]
rails_rails
train
rb
4572ffd483bf69130f5680429d559e2810b7f0e9
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -68,8 +68,23 @@ def _stamp_version(filename): print("WARNING: Couldn't find version line in file %s" % filename, file=sys.stderr) install_requires = ['gitdb >= 0.6.4'] -if sys.version_info[:2] < (2, 7): - install_requires.append('ordereddict') +extras_require = { + ':python_version == "2.6"': ['ordereddict'], +} + +try: + if 'bdist_wheel' not in sys.argv: + for key, value in extras_require.items(): + if key.startswith(':') and pkg_resources.evaluate_marker(key[1:]): + install_requires.extend(value) +except Exception: + logging.getLogger(__name__).exception( + 'Something went wrong calculating platform specific dependencies, so ' + "you're getting them all!" + ) + for key, value in extras_require.items(): + if key.startswith(':'): + install_requires.extend(value) # end setup(
install ordereddict only on <I> with wheel
gitpython-developers_GitPython
train
py
5169c96dac2c1dfefe22e92bb7019cd413b53ba2
diff --git a/yubico_client/yubico.py b/yubico_client/yubico.py index <HASH>..<HASH> 100644 --- a/yubico_client/yubico.py +++ b/yubico_client/yubico.py @@ -82,7 +82,7 @@ class Yubico(object): ' argument')) self.client_id = client_id - self.key = base64.b64decode(key) if key is not None else None + self.key = base64.b64decode(key.encode('ascii')) if key is not None else None self.verify_cert = verify_cert self.translate_otp = translate_otp self.api_urls = self._init_request_urls(api_urls=api_urls)
yubico.py: Convert key to byte string before passing it to b<I>decode In Python3 <= <I>, the base<I>.b<I>decode function only accepts byte strings, so we need to convert the key to one.
Kami_python-yubico-client
train
py
ebaf5b54d652f1fad8f5ffda5ecbfc31b9c5ea07
diff --git a/tensorboard/java/org/tensorflow/tensorboard/vulcanize/Vulcanize.java b/tensorboard/java/org/tensorflow/tensorboard/vulcanize/Vulcanize.java index <HASH>..<HASH> 100644 --- a/tensorboard/java/org/tensorflow/tensorboard/vulcanize/Vulcanize.java +++ b/tensorboard/java/org/tensorflow/tensorboard/vulcanize/Vulcanize.java @@ -187,6 +187,9 @@ public final class Vulcanize { createFile( jsOutput, shouldExtractJs ? extractAndTransformJavaScript(document, jsPath) : ""); Document normalizedDocument = getFlattenedHTML5Document(document); + // Prevent from correcting the DOM structure and messing up the whitespace + // in the template. + normalizedDocument.outputSettings().prettyPrint(false); createFile(output, normalizedDocument.toString()); }
vulc: fix pretty print messing up whitespace (#<I>) Our data location in the runs selector use tf-wbr-string which is roughly written as `<template>[[prop]]<wbr></template>`. With the pretty print, this was rewritten as ``` <template> [[prop]] <wbr> </template> ``` which has whitespace and make the browser render the whitespace. This change fixes the issue by turning off the pretty print.
tensorflow_tensorboard
train
java
33dad3906ff221d99310242447901e81391fd4fb
diff --git a/packages/@vue/cli-service/lib/config/base.js b/packages/@vue/cli-service/lib/config/base.js index <HASH>..<HASH> 100644 --- a/packages/@vue/cli-service/lib/config/base.js +++ b/packages/@vue/cli-service/lib/config/base.js @@ -33,7 +33,7 @@ module.exports = (api, options) => { .end() .output .path(api.resolve(options.outputDir)) - .filename(isLegacyBundle ? '[name]-legacy.js' : '[name].js') + .filename(isLegacyBundle ? '[name]-legacy.[hash:8].js' : '[name].[hash:8].js') .publicPath(options.baseUrl) webpackConfig.resolve
fix: add hash to filename in development mode (#<I>) to circumvent a Safari caching issue closes #<I>, #<I>
vuejs_vue-cli
train
js
e861d8f1e0db3770bf88c8d35dffe5d0241fa9cc
diff --git a/tests/StringCalcTests.php b/tests/StringCalcTests.php index <HASH>..<HASH> 100644 --- a/tests/StringCalcTests.php +++ b/tests/StringCalcTests.php @@ -79,7 +79,6 @@ class StringCalcTest extends \PHPUnit\Framework\TestCase ['floor(2.8)', 2], ['fMod(2.2,2.1)', 0.1], ['hypot(2,2)', 2.8284271247462], - ['intdiv(11,5)', 2], ['log(2)', 0.69314718055995], ['log(2,2)', 1], ['logOneP(2)', 1.0986122886681],
Removed intdiv from the tests
chriskonnertz_string-calc
train
php
f16e8e13e7d3511bd36d74d2d21efd3d21e057ff
diff --git a/Symfony/CS/Tokenizer/Tokens.php b/Symfony/CS/Tokenizer/Tokens.php index <HASH>..<HASH> 100644 --- a/Symfony/CS/Tokenizer/Tokens.php +++ b/Symfony/CS/Tokenizer/Tokens.php @@ -19,6 +19,8 @@ use Symfony\CS\Utils; * * @author Dariusz Rumiński <dariusz.ruminski@gmail.com> * @author Gregor Harlan <gharlan@web.de> + * + * @method Token current() */ class Tokens extends \SplFixedArray {
Tokens: added typehint for Iterator elements
FriendsOfPHP_PHP-CS-Fixer
train
php
0ae0d54033c2516a9b42bd034fdf7003e794291f
diff --git a/lib/conversion_store.go b/lib/conversion_store.go index <HASH>..<HASH> 100644 --- a/lib/conversion_store.go +++ b/lib/conversion_store.go @@ -45,6 +45,7 @@ func (ms *ConversionStore) WriteACI(path string) (string, error) { if err != nil { return "", err } + defer cr.Close() h := sha512.New() r := io.TeeReader(cr, h) @@ -97,6 +98,7 @@ func (ms *ConversionStore) ReadStream(key string) (io.ReadCloser, error) { if err != nil { return nil, err } + defer tr.Close() return ioutil.NopCloser(tr), nil }
lib: close aci.NewCompressedReader The interface for aci.NewCompressedReader changed in appc to return a ReadCloser so we're resposible for closing it.
appc_docker2aci
train
go
84ffc4dc1833cee76d6598a41ca615cb73bc376e
diff --git a/chrome.js b/chrome.js index <HASH>..<HASH> 100644 --- a/chrome.js +++ b/chrome.js @@ -19,6 +19,10 @@ module.exports = function(opts) { return callback(err); } + if (! sourceId) { + return callback(new Error('user rejected screen share request')); + } + // pass the constraints through return callback(null, { audio: false,
Report user rejection of screenshare as an error
rtc-io_rtc-screenshare
train
js
6e650910bca737acb7f801b8e8a5ce3bf064c1b3
diff --git a/src/main/java/org/jamesframework/core/problems/solutions/SubsetSolution.java b/src/main/java/org/jamesframework/core/problems/solutions/SubsetSolution.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/jamesframework/core/problems/solutions/SubsetSolution.java +++ b/src/main/java/org/jamesframework/core/problems/solutions/SubsetSolution.java @@ -268,16 +268,21 @@ public class SubsetSolution extends Solution { return hash; } + /** + * Creates a nicely formatted, human readable string containing the selected IDs. + * + * @return formatted string + */ @Override public String toString(){ StringBuilder str = new StringBuilder(); str.append("SubsetSolution: {"); - // add selected IDs - for(int ID : selected){ - str.append(ID).append(", "); - } - // remove final comma and space if nonzero number of selected IDs + // add selected IDs, if any if(getNumSelectedIDs() > 0){ + for(int ID : selected){ + str.append(ID).append(", "); + } + // remove final comma and space str.delete(str.length()-2, str.length()); } // close brackets
updated toString of subset solution
hdbeukel_james-core
train
java
caa853b054203a3b7dfc6fa42f76a38a75262320
diff --git a/autofit/non_linear/settings.py b/autofit/non_linear/settings.py index <HASH>..<HASH> 100644 --- a/autofit/non_linear/settings.py +++ b/autofit/non_linear/settings.py @@ -55,5 +55,14 @@ class SettingsSearch: } @property + def search_dict_x1_core(self): + return { + "path_prefix": self.path_prefix, + "unique_tag": self.unique_tag, + "number_of_cores": 1, + "session": self.session, + } + + @property def fit_dict(self): return {"info": self.info, "pickle_files": self.pickle_files} \ No newline at end of file
updated Settings object for x1 core
rhayes777_PyAutoFit
train
py
b2335395d133e96c0e784c110efc8ea624d23acc
diff --git a/EventListener/BugsnagListener.php b/EventListener/BugsnagListener.php index <HASH>..<HASH> 100644 --- a/EventListener/BugsnagListener.php +++ b/EventListener/BugsnagListener.php @@ -84,7 +84,8 @@ class BugsnagListener implements EventSubscriberInterface } /** - * Handle a console exception. + * Handle a console exception (used instead of ConsoleErrorEvent before + * Symfony 3.3 and kept for backwards compatibility). * * @param \Symfony\Component\Console\Event\ConsoleExceptionEvent $event * diff --git a/Tests/Listener/BugsnagListenerTest.php b/Tests/Listener/BugsnagListenerTest.php index <HASH>..<HASH> 100644 --- a/Tests/Listener/BugsnagListenerTest.php +++ b/Tests/Listener/BugsnagListenerTest.php @@ -52,9 +52,6 @@ class BugsnagListenerTest extends TestCase $listener->onKernelException($event); } - /** - * @requires class foo - */ public function testOnConsoleError() { if (!class_exists('Symfony\Component\Console\Event\ConsoleErrorEvent')) {
style: phpdoc changes following review
bugsnag_bugsnag-symfony
train
php,php
96f8a3b09163a305d7e21537a8dc6d2b22d71b69
diff --git a/openquake/risklib/workflows.py b/openquake/risklib/workflows.py index <HASH>..<HASH> 100644 --- a/openquake/risklib/workflows.py +++ b/openquake/risklib/workflows.py @@ -498,7 +498,7 @@ class ProbabilisticEventBased(Workflow): self.insured_losses = insured_losses self.return_loss_matrix = True self.loss_ratios = loss_ratios - self.time_ratio = risk_investigation_time / ( + self.time_ratio = time_span / ( investigation_time * ses_per_logic_tree_path) def event_loss(self, loss_matrix, event_ids):
Fixed the case of risk_investigation_time None
gem_oq-engine
train
py
b538bd0a29db8b65ec5d9a37c1d535e5bcd0e53b
diff --git a/gns3server/version.py b/gns3server/version.py index <HASH>..<HASH> 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,7 +23,7 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "2.1.0b2" +__version__ = "2.1.0dev5" __version_info__ = (2, 1, 0, -99) # If it's a git checkout try to add the commit if "dev" in __version__:
Back to development on <I>dev5
GNS3_gns3-server
train
py
8852151a750ae018ada87d7c48063abbff3145ab
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java index <HASH>..<HASH> 100644 --- a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java +++ b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java @@ -2452,7 +2452,9 @@ public interface TypeWriter<T> { @Override public int getModifiers() { - return Opcodes.ACC_STATIC | Opcodes.ACC_PRIVATE | Opcodes.ACC_SYNTHETIC; + return Opcodes.ACC_SYNTHETIC | Opcodes.ACC_STATIC | (instrumentedType.isClassType() + ? Opcodes.ACC_PRIVATE + : Opcodes.ACC_PUBLIC); } @Override
Set rebased class initializer method to be public if the class initializer is defined on an interface type.
raphw_byte-buddy
train
java
fa339ce731a3170b0523fb2f418027fbadfab282
diff --git a/src/frontend/org/voltcore/zk/SynchronizedStatesManager.java b/src/frontend/org/voltcore/zk/SynchronizedStatesManager.java index <HASH>..<HASH> 100644 --- a/src/frontend/org/voltcore/zk/SynchronizedStatesManager.java +++ b/src/frontend/org/voltcore/zk/SynchronizedStatesManager.java @@ -1121,7 +1121,7 @@ public class SynchronizedStatesManager { "Unexpected failure in StateMachine.", true, e); membersWithResults = new TreeSet<String>(); } - if (Sets.symmetricDifference(m_knownMembers, membersWithResults).isEmpty()) { + if (Sets.difference(m_knownMembers, membersWithResults).isEmpty()) { processResultQuorum(membersWithResults); assert(!debugIsLocalStateLocked()); }
ENG-<I>: Don't use SymmetricDifference to compare results with active because a result could be supplied by a node that died (and is not in the member list).
VoltDB_voltdb
train
java
ca1baa00e9bee825a6918256fad158cb23dad993
diff --git a/lib/jsonapi/resource_serializer.rb b/lib/jsonapi/resource_serializer.rb index <HASH>..<HASH> 100644 --- a/lib/jsonapi/resource_serializer.rb +++ b/lib/jsonapi/resource_serializer.rb @@ -230,7 +230,7 @@ module JSONAPI end def custom_generation_options - { + @_custom_generation_options ||= { serializer: self, serialization_options: @serialization_options }
Cache custom_generation_options options This hash only needs to be computed once, and repeatedly building it results in a lot of memory allocations.
cerebris_jsonapi-resources
train
rb
28e83041a96eadfcb5965d5f8bf2ad37e85246f3
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 @@ -5,7 +5,7 @@ if ENV['CI'] || ENV['GENERATE_COVERAGE'] require 'simplecov' require 'coveralls' - if ENV['CI'] + if ENV['CI'] || ENV['TRAVIS'] SimpleCov.formatter = Coveralls::SimpleCov::Formatter elsif ENV['GENERATE_COVERAGE'] SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
[Specs] Apparently the CI flag is not set on the mac workers
CocoaPods_Xcodeproj
train
rb
f2593489866a4c5ff43f4adc490a993b6e41e44f
diff --git a/dev.py b/dev.py index <HASH>..<HASH> 100755 --- a/dev.py +++ b/dev.py @@ -123,6 +123,10 @@ def test(suites): warnings.filterwarnings(action='ignore', category=DeprecationWarning, module='webtest.*', message=msg3) + # Selenium tests client side code, so we only test on the newest Python version + if sys.version_info[0:2] != (3, 7): + os.environ.setdefault('SKIP_SELENIUM_TESTS', 'y') + work_dir = os.path.join(_rootdir, 'ca') os.chdir(work_dir)
default to skip selenium tests everywhere but py<I>
mathiasertl_django-ca
train
py
b5d2fc69224c54531d3a558a3bfdafc19ba1b2d6
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php index <HASH>..<HASH> 100644 --- a/core/Plugin/Manager.php +++ b/core/Plugin/Manager.php @@ -447,7 +447,7 @@ class Manager return self::$pluginsToPathCache[$pluginName]; } - $corePluginsDir = PIWIK_INCLUDE_PATH . 'plugins/' . $pluginName; + $corePluginsDir = PIWIK_INCLUDE_PATH . '/plugins/' . $pluginName; if (is_dir($corePluginsDir)) { // for faster performance self::$pluginsToPathCache[$pluginName] = self::getPluginRealPath($corePluginsDir);
Adds missing / in directoy check (#<I>)
matomo-org_matomo
train
php
5432329fdaad999ddd35e6b49058da3cb17844df
diff --git a/edisgo/io/electromobility_import.py b/edisgo/io/electromobility_import.py index <HASH>..<HASH> 100644 --- a/edisgo/io/electromobility_import.py +++ b/edisgo/io/electromobility_import.py @@ -7,13 +7,15 @@ import os from pathlib import Path, PurePath from typing import TYPE_CHECKING -import geopandas as gpd import numpy as np import pandas as pd from numpy.random import default_rng from sklearn import preprocessing +if "READTHEDOCS" not in os.environ: + import geopandas as gpd + if TYPE_CHECKING: from edisgo import EDisGo
moving geopandas import out of RtD
openego_eDisGo
train
py
6d41e7b76d9d1dfc79a060553bae49e97b210b04
diff --git a/tests/test_current_charts.py b/tests/test_current_charts.py index <HASH>..<HASH> 100644 --- a/tests/test_current_charts.py +++ b/tests/test_current_charts.py @@ -79,8 +79,8 @@ class TestCurrentGreatestHot100Singles(Base, unittest.TestCase): skipPeakPosCheck=True ) for entry in self.chart: - self.assertIsNone(entry.peakPos) - self.assertEqual(entry.lastPos, entry.rank) + self.assertEqual(entry.peakPos, entry.rank) + self.assertEqual(entry.lastPos, 0) self.assertEqual(entry.weeks, 1) # This is kind of unintuitive...
Fix test (for greatest-hot-<I>-singles)
guoguo12_billboard-charts
train
py
1c2f8147d3c056786b90e3a9a0f03368e58630b0
diff --git a/CHANGES.rst b/CHANGES.rst index <HASH>..<HASH> 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,10 @@ +Version 0.0.13 +-------------- + +* Fixed an error in :class:`.oauth2.Google` when the access token request + resulted in an + ``OAuth 2 parameters can only have a single value: client_secret`` error. + Version 0.0.12 -------------- diff --git a/doc/source/conf.py b/doc/source/conf.py index <HASH>..<HASH> 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -124,7 +124,7 @@ copyright = u'2013, Peter Hudec' # built documents. # # The short X.Y version. -version = '0.0.10' +version = '0.0.13' # The full version, including alpha/beta/rc tags. release = version diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from authomatic import six setup( name='Authomatic', - version='0.0.12', # TODO: Put version in one place. + version='0.0.13', # TODO: Put version in one place. packages=find_packages(), package_data={'': ['*.txt', '*.rst']}, author='Peter Hudec',
Updated release version to <I>.
authomatic_authomatic
train
rst,py,py
323f32e84b7cffb85bcdd060e35f5936d67ba285
diff --git a/server.go b/server.go index <HASH>..<HASH> 100644 --- a/server.go +++ b/server.go @@ -70,7 +70,7 @@ func (s *Server) Run() error { // Send sends a message throught the connection denoted by the connection ID. func (s *Server) Send(connID string, msg []byte) error { - if conn, ok := s.conns.Get(connID); ok { + if conn, ok := s.conns.GetOk(connID); ok { return conn.(*Conn).Write(msg) }
adapt to change in cmap lib
neptulon_neptulon
train
go
30f34f59e475d5a75a171506c055a8096939408c
diff --git a/lib/plugins/filter/template_locals/i18n.js b/lib/plugins/filter/template_locals/i18n.js index <HASH>..<HASH> 100644 --- a/lib/plugins/filter/template_locals/i18n.js +++ b/lib/plugins/filter/template_locals/i18n.js @@ -22,10 +22,9 @@ function i18nLocalsFilter(locals) { // i18n.languages is always an array with at least one argument ('default') lang = i18nConfigLanguages[0]; } - - page.lang = lang; } + page.lang = lang; page.canonical_path = page.canonical_path || locals.path; const languages = [...new Set([].concat(lang, i18nConfigLanguages, i18nLanguages).filter(Boolean))];
fix(i<I>n): page.lang is undefined when using the key `language` in front-matter (#<I>)
hexojs_hexo
train
js
fbd182493267dda88732638c4bdc387f93606ed1
diff --git a/texture.js b/texture.js index <HASH>..<HASH> 100644 --- a/texture.js +++ b/texture.js @@ -155,7 +155,7 @@ Object.defineProperties(proto, { var psamples = this._anisoSamples this._anisoSamples = Math.max(i, 1)|0 if(psamples !== this._anisoSamples) { - var ext = gl.getExtension('EXT_texture_filter_anisotropic') + var ext = this.gl.getExtension('EXT_texture_filter_anisotropic') if(ext) { this.gl.texParameterf(this.gl.TEXTURE_2D, ext.TEXTURE_MAX_ANISOTROPY_EXT, this._anisoSamples) }
Fix crash in mipSamples setter
stackgl_gl-texture2d
train
js
290a83e2ed7153d2a67e911fdfef9775ba34bd14
diff --git a/src/ol/control/attributioncontrol.js b/src/ol/control/attributioncontrol.js index <HASH>..<HASH> 100644 --- a/src/ol/control/attributioncontrol.js +++ b/src/ol/control/attributioncontrol.js @@ -99,13 +99,6 @@ ol.control.Attribution = function(opt_options) { goog.events.listen(button, goog.events.EventType.CLICK, this.handleClick_, false, this); - goog.events.listen(button, [ - goog.events.EventType.MOUSEOUT, - goog.events.EventType.FOCUSOUT - ], function() { - this.blur(); - }, false); - var cssClasses = className + ' ' + ol.css.CLASS_UNSELECTABLE + ' ' + ol.css.CLASS_CONTROL + (this.collapsed_ && this.collapsible_ ? ' ol-collapsed' : '') +
Remove blur workaround in ol.control.Attribution leftover from #<I>
openlayers_openlayers
train
js
670b895478a6e643bfd65582cb64a95f46874aff
diff --git a/mod/quiz/report/responses/responses_table.php b/mod/quiz/report/responses/responses_table.php index <HASH>..<HASH> 100644 --- a/mod/quiz/report/responses/responses_table.php +++ b/mod/quiz/report/responses/responses_table.php @@ -46,15 +46,14 @@ class quiz_report_responses_table extends table_sql { if (!$this->is_downloading()) { // Print "Select all" etc. if ($this->candelete) { - echo '<table id="commands">'; - echo '<tr><td>'; + echo '<div id="commands">'; echo '<a href="javascript:select_all_in(\'DIV\',null,\'tablecontainer\');">'. get_string('selectall', 'quiz').'</a> / '; echo '<a href="javascript:deselect_all_in(\'DIV\',null,\'tablecontainer\');">'. get_string('selectnone', 'quiz').'</a> '; echo '&nbsp;&nbsp;'; echo '<input type="submit" value="'.get_string('deleteselected', 'quiz_overview').'"/>'; - echo '</td></tr></table>'; + echo '</div>'; // Close form echo '</div>'; echo '</form></div>';
MDL-<I> "move detailled responses report out of contrib into main distribution" minor fix to html to align select all / deselect all with table
moodle_moodle
train
php
b894c0bca2069092cfd34700cbe42185ad53a8ee
diff --git a/sfm-datastax/src/main/java/org/sfm/datastax/impl/RowGetterFactory.java b/sfm-datastax/src/main/java/org/sfm/datastax/impl/RowGetterFactory.java index <HASH>..<HASH> 100644 --- a/sfm-datastax/src/main/java/org/sfm/datastax/impl/RowGetterFactory.java +++ b/sfm-datastax/src/main/java/org/sfm/datastax/impl/RowGetterFactory.java @@ -21,11 +21,11 @@ import java.net.InetAddress; import org.sfm.tuples.Tuple2; import org.sfm.tuples.Tuples; -//IFJAVA8_START -import org.sfm.map.getter.time.JavaTimeGetterFactory; import org.sfm.utils.conv.Converter; import org.sfm.utils.conv.ConverterFactory; +//IFJAVA8_START +import org.sfm.map.getter.time.JavaTimeGetterFactory; import java.time.*; //IFJAVA8_END import java.util.*;
#<I> add support for set and list type conversion
arnaudroger_SimpleFlatMapper
train
java
e8ed36f687587d74be1f104dcfaddb4021c3b96e
diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/I18nParam.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/I18nParam.java index <HASH>..<HASH> 100644 --- a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/I18nParam.java +++ b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/I18nParam.java @@ -16,6 +16,7 @@ package br.com.caelum.vraptor.validator; import java.io.Serializable; +import java.util.Objects; import java.util.ResourceBundle; import javax.enterprise.inject.Vetoed; @@ -48,4 +49,18 @@ public class I18nParam implements Serializable { public String toString() { return String.format("i18n(%s)", key); } -} + + @Override + public int hashCode() { + return Objects.hashCode(key); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + I18nParam other = (I18nParam) obj; + return Objects.equals(key, other.key); + } +} \ No newline at end of file
implementing equals and hashcode on i<I>nparam
caelum_vraptor4
train
java
63c14feced960798b0bfad84f613117891a497cb
diff --git a/node-persist.js b/node-persist.js index <HASH>..<HASH> 100644 --- a/node-persist.js +++ b/node-persist.js @@ -301,7 +301,7 @@ var parseString = function(str){ if(options.logging){ console.log("parse error: ", e); } - return {}; + return undefined; } }; @@ -315,4 +315,4 @@ var parseFile = function (key) { console.log("loaded: " + key); } }); -}; \ No newline at end of file +};
if a string cannot be parsed, it seems more accurate to return undefined rather than an empty object
simonlast_node-persist
train
js
bff34bad197f4fd740144c027dfc3afba08bbd6e
diff --git a/Neos.Eel/Classes/FlowQuery/Operations/Object/FilterOperation.php b/Neos.Eel/Classes/FlowQuery/Operations/Object/FilterOperation.php index <HASH>..<HASH> 100644 --- a/Neos.Eel/Classes/FlowQuery/Operations/Object/FilterOperation.php +++ b/Neos.Eel/Classes/FlowQuery/Operations/Object/FilterOperation.php @@ -234,7 +234,7 @@ class FilterOperation extends AbstractOperation case '=': return $value === $operand; case '=~': - return strcasecmp($value, $operand) == 0; + return strcasecmp($value, $operand) === 0; case '!=': return $value !== $operand; case '!=~':
Update Neos.Eel/Classes/FlowQuery/Operations/Object/FilterOperation.php
neos_flow-development-collection
train
php
bb606a6706ddf973b081e4af17615cd52e7fffab
diff --git a/src/app/Http/Controllers/Options.php b/src/app/Http/Controllers/Options.php index <HASH>..<HASH> 100644 --- a/src/app/Http/Controllers/Options.php +++ b/src/app/Http/Controllers/Options.php @@ -12,5 +12,5 @@ class Options extends Controller protected $model = Person::class; - protected $queryAttributes = ['name', 'appellative', 'uid']; + protected $queryAttributes = ['name', 'appellative', 'uid', 'phone']; }
adds phone to query attributes in Options.php
laravel-enso_People
train
php
f32446f5a2cc1cf2800c562ca9874b17c2619a60
diff --git a/tests/FluentDOMTest.php b/tests/FluentDOMTest.php index <HASH>..<HASH> 100644 --- a/tests/FluentDOMTest.php +++ b/tests/FluentDOMTest.php @@ -338,10 +338,9 @@ class FluentDOMTest extends FluentDomTestCase { * @group CoreFunctions */ function testItem() { - $doc = FluentDOM(self::XML); - $doc = $doc->find('/items'); - $this->assertEquals($doc->document->documentElement, $doc->item(0)); - $this->assertEquals(NULL, $doc->item(-10)); + $fd = $this->getFixtureFromString(self::XML)->find('/items'); + $this->assertEquals($fd->document->documentElement, $fd->item(0)); + $this->assertEquals(NULL, $fd->item(-10)); } /**
FluentDOMTest: - changed: refactoring item() method test (use mock objects, cleanup)
ThomasWeinert_FluentDOM
train
php
7e49eb94c21befcf72b7da9c017174ddfc265229
diff --git a/Kwf/Assets/Dependency/File/Css.php b/Kwf/Assets/Dependency/File/Css.php index <HASH>..<HASH> 100644 --- a/Kwf/Assets/Dependency/File/Css.php +++ b/Kwf/Assets/Dependency/File/Css.php @@ -24,6 +24,10 @@ class Kwf_Assets_Dependency_File_Css extends Kwf_Assets_Dependency_File $cfg = new Zend_Config_Ini('assetVariables.ini', $section); $assetVariables[$section] = array_merge($assetVariables[$section], $cfg->toArray()); } + foreach ($assetVariables[$section] as $k=>$i) { + //also support lowercase variables + if (strtolower($k) != $k) $assetVariables[$section][strtolower($k)] = $i; + } } foreach ($assetVariables[$section] as $k=>$i) { $contents = preg_replace('#\\$'.preg_quote($k).'([^a-z0-9A-Z])#', "$i\\1", $contents); //deprecated syntax
fix assetVariables with uppercase letters in scss files sass lowercases everything so the variables wheren't found anymore
koala-framework_koala-framework
train
php
f75a4b51960040db7cbfc47fe9cea3b649c4b6ea
diff --git a/corenlp_pywrap/pywrap.py b/corenlp_pywrap/pywrap.py index <HASH>..<HASH> 100644 --- a/corenlp_pywrap/pywrap.py +++ b/corenlp_pywrap/pywrap.py @@ -125,6 +125,11 @@ class CoreNLP: index = new_index tokens = sentence['tokens'] for val in tokens: + + #workaround to handle length inconsistancie with normalizedNER, rethink the logic + if 'ner' in val.values() and 'normalizedNER' not in val.values(): + token_dict['normalizedNER'].append('') + for key, val in val.items(): if key == 'index': new_index = index + int(val)
inconsistency with normalizedNER
hhsecond_corenlp_pywrap
train
py
1608ecf1a485705c81868df5c5b79c8702343667
diff --git a/lib/model/user.js b/lib/model/user.js index <HASH>..<HASH> 100644 --- a/lib/model/user.js +++ b/lib/model/user.js @@ -227,7 +227,7 @@ User.prototype.follow = function(id, callback) { // XXX: Remote follow callback(null); } else { - Stream.get(other.nickname + ":followers", this); + Stream.get("user:" + other.nickname + ":followers", this); } }, function(err, stream) { @@ -272,7 +272,7 @@ User.prototype.stopFollowing = function(id, callback) { // XXX: Remote follow callback(null); } else { - Stream.get(other.nickname + ":followers", this); + Stream.get("user:" + other.nickname + ":followers", this); } }, function(err, stream) {
Prefix other streams with "user:" too
pump-io_pump.io
train
js
79a6aaec796b7c50054140967d6ba52ab72e9e79
diff --git a/src/index.js b/src/index.js index <HASH>..<HASH> 100644 --- a/src/index.js +++ b/src/index.js @@ -30,6 +30,8 @@ function setContent( content, options ) { } ); } -setContent.withSelection = function( content, options ) {}; +setContent.withSelection = function( content, options ) { + +}; module.exports = setContent; \ No newline at end of file diff --git a/test/index.test.js b/test/index.test.js index <HASH>..<HASH> 100644 --- a/test/index.test.js +++ b/test/index.test.js @@ -40,4 +40,11 @@ } ); } ); } ); + + suite( 'setContent.withSelection', function() { + test( 'It sets the content', function() { + return setContent.withSelection( 'foo' ) + .then( editor => assert.strictEqual( getContent( editor ), 'foo', 'Invalid content') ); + } ); + } ); } )(); \ No newline at end of file
Started tests for set conetnt with selection.
mlewand-org_vscode-test-set-content
train
js,js
d5eca59dc615686f6d5e10efd325a4972fd24f7e
diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php index <HASH>..<HASH> 100644 --- a/modules/system/classes/MediaLibrary.php +++ b/modules/system/classes/MediaLibrary.php @@ -73,10 +73,6 @@ class MediaLibrary $this->storageFolder = self::validatePath(Config::get('cms.storage.media.folder', 'media'), true); $this->storagePath = rtrim(Config::get('cms.storage.media.path', '/storage/app/media'), '/'); - if (!starts_with($this->storagePath, ['//', 'http://', 'https://'])) { - $this->storagePath = Request::getBasePath() . $this->storagePath; - } - $this->ignoreNames = Config::get('cms.storage.media.ignore', FileDefinitions::get('ignoreFiles')); $this->ignorePatterns = Config::get('cms.storage.media.ignorePatterns', ['^\..*']);
Remove application root relative to domain root from $mediaFinder->storagePath (#<I>) This gets added later through the use of Url::to(). Credit to @adsa<I>. Fixes #<I>, fixes #<I>
octobercms_october
train
php
2be2034a55f6115b42253fad2f511f4d81c86f60
diff --git a/test/person-test.js b/test/person-test.js index <HASH>..<HASH> 100644 --- a/test/person-test.js +++ b/test/person-test.js @@ -56,7 +56,7 @@ var testSchema = { "updated", "upstreamDuplicates", "url"], - indices: ["_uuid", "url"] + indices: ["_uuid", "url", "image.url"] }; var testData = {
Add image.url to list of expected indices
pump-io_pump.io
train
js
95f31028c3bbea0cc4c818b04a6a8216f50d249f
diff --git a/lib/createStandardErrorMessage.js b/lib/createStandardErrorMessage.js index <HASH>..<HASH> 100644 --- a/lib/createStandardErrorMessage.js +++ b/lib/createStandardErrorMessage.js @@ -13,16 +13,14 @@ module.exports = function createStandardErrorMessage(output, subject, testDescri assertionIndices.push(offset + parsed.args.length - 2); var assertionName = options.originalArgs[offset + parsed.args.length - 2]; var assertions = options.unexpected.assertions[assertionName]; - var assertion; - for (var j = 0 ; j < assertions.length ; j += 1) { - if (assertions[j].parsed.args.some(function (a) { return a.isAssertion; })) { - assertion = assertions[j]; - break; + if (assertions) { + for (var j = 0 ; j < assertions.length ; j += 1) { + if (assertions[j].parsed.args.some(function (a) { return a.isAssertion; })) { + markAssertionIndices(assertions[j].parsed, offset + parsed.args.length - 1); + break; + } } } - if (assertion) { - markAssertionIndices(assertion.parsed, offset + parsed.args.length - 1); - } } }
createStandardErrorMessage: Don't break when the assertion pointed to by the argument declared <assertion> does not exist.
unexpectedjs_unexpected
train
js
9f3a24b722acffd00e024dad282278aae4bece45
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ from setuptools import setup, find_packages setup(name='umapi-client', - version='1.0.0rc5', + version='1.0.0', description='Adobe User Management API (UMAPI) client - see https://adobe.ly/2h1pHgV', long_description=('The Adobe User Management API (aka the Adobe UMAPI) is an Adobe-hosted network service ' 'which provides Adobe Enterprise customers the ability to manage their users. This '
Promote <I>rc5 to <I>.
adobe-apiplatform_umapi-client.py
train
py
66abfcf77f586959883e66eaa166bb29c5649770
diff --git a/packages/react/src/components/FileUploader/FileUploader.js b/packages/react/src/components/FileUploader/FileUploader.js index <HASH>..<HASH> 100644 --- a/packages/react/src/components/FileUploader/FileUploader.js +++ b/packages/react/src/components/FileUploader/FileUploader.js @@ -298,6 +298,12 @@ export default class FileUploader extends Component { name: PropTypes.string, /** + * Provide an optional `onChange` hook that is called each time the input is + * changed + */ + onChange: PropTypes.func, + + /** * Provide an optional `onClick` hook that is called each time the button is * clicked */ @@ -347,7 +353,9 @@ export default class FileUploader extends Component { Array.prototype.map.call(evt.target.files, file => file.name) ), }); - this.props.onChange(evt); + if (this.props.onChange) { + this.props.onChange(evt); + } }; handleClick = (evt, index) => {
feat(file-uploader): add support for onChange (#<I>)
carbon-design-system_carbon-components
train
js
fe270cc86e75b3f3de03791a8119255d46f24f21
diff --git a/src/Aws/Common/Client/UploadBodyListener.php b/src/Aws/Common/Client/UploadBodyListener.php index <HASH>..<HASH> 100644 --- a/src/Aws/Common/Client/UploadBodyListener.php +++ b/src/Aws/Common/Client/UploadBodyListener.php @@ -16,6 +16,7 @@ namespace Aws\Common\Client; +use Aws\Common\Exception\InvalidArgumentException; use Guzzle\Common\Event; use Guzzle\Http\EntityBody; use Guzzle\Service\Command\AbstractCommand as Command; @@ -81,13 +82,13 @@ class UploadBodyListener implements EventSubscriberInterface $body = fopen($source, 'r'); } + // Prepare the body parameter and remove the source file parameter if (null !== $body) { - $body = EntityBody::factory($body); + $command->remove($this->sourceParameter); + $command->set($this->bodyParameter, EntityBody::factory($body)); + } else { + throw new InvalidArgumentException("You must specify a non-null value for the {$this->bodyParameter} or {$this->sourceParameter} parameters."); } - - // Prepare the body parameter and remove the source file parameter - $command->remove($this->sourceParameter); - $command->set($this->bodyParameter, $body); } } }
Now throws an exception earlier when a body or source isn't specified for an upload operation.
aws_aws-sdk-php
train
php
18aea5a159974872316a37570b3b8d2f94aa0914
diff --git a/holoviews/plotting/mpl/plot.py b/holoviews/plotting/mpl/plot.py index <HASH>..<HASH> 100644 --- a/holoviews/plotting/mpl/plot.py +++ b/holoviews/plotting/mpl/plot.py @@ -164,6 +164,7 @@ class MPLPlot(DimensionedPlot): bbox_transform=axis.transAxes) at.patch.set_visible(False) axis.add_artist(at) + self.handles['sublabel'] = at.txt.get_children()[0] def _finalize_axis(self, key):
Added sublabel to plot handles in mpl backend
pyviz_holoviews
train
py
2c2c97f086ae2bee1e9732ab1025674015f78b79
diff --git a/src/Organizations/Options/ImageFileCacheOptions.php b/src/Organizations/Options/ImageFileCacheOptions.php index <HASH>..<HASH> 100644 --- a/src/Organizations/Options/ImageFileCacheOptions.php +++ b/src/Organizations/Options/ImageFileCacheOptions.php @@ -38,7 +38,7 @@ class ImageFileCacheOptions extends AbstractOptions * * @var string */ - protected $uriPath = '/cache/Organizations/Image'; + protected $uriPath = '/static/Organizations/Image'; /** * @param array|Traversable|null $options
Directory "cache" renamed to "static" for organization image cache #<I>
yawik_organizations
train
php
f91320357fd65966cd2a8830e139e126651787ec
diff --git a/Libraries/Column.php b/Libraries/Column.php index <HASH>..<HASH> 100644 --- a/Libraries/Column.php +++ b/Libraries/Column.php @@ -388,7 +388,7 @@ class Column { $column1 = explode('.', $this->relationshipField->column); $column1 = $column1[1]; $column2 = explode('.', $this->relationshipField->column2); - $column2 = $column1[1]; + $column2 = $column2[1]; $joins .= ' LEFT JOIN '.$int_table.' AS '.$int_alias.' ON '.$int_alias.'.'.$column1.' = '.$field_table.'.'.$model::$key .' LEFT JOIN '.$other_table.' AS '.$other_alias.' ON '.$other_alias.'.'.$other_key.' = '.$int_alias.'.'.$column2;
just kidding (See #<I>)
FrozenNode_Laravel-Administrator
train
php
9359ebcb58efdde15a77f5fe900769d042431406
diff --git a/tinymce/views.py b/tinymce/views.py index <HASH>..<HASH> 100644 --- a/tinymce/views.py +++ b/tinymce/views.py @@ -95,4 +95,4 @@ def filebrowser(request): except: fb_url = request.build_absolute_uri(reverse('filebrowser:fb_browse')) return render(request, 'tinymce/filebrowser.js', {'fb_url': fb_url}, - content_type='text/javascript') + content_type='application/javascript')
Corrects js mime type in view
romanvm_django-tinymce4-lite
train
py
0c1c3e572559e73a5a52f1ad1c5e2e8c9f70c73c
diff --git a/xmantissa/static/js/scrolltable.js b/xmantissa/static/js/scrolltable.js index <HASH>..<HASH> 100644 --- a/xmantissa/static/js/scrolltable.js +++ b/xmantissa/static/js/scrolltable.js @@ -152,6 +152,9 @@ Mantissa.ScrollTable.ScrollingWidget.methods( cells = MochiKit.Base.map.apply(null, [null].concat(cells))[1]; var rowNode = self.makeRowElement(rowOffset, rowData, cells); + rowNode.style.position = "absolute"; + rowNode.style.top = (rowOffset * self._rowHeight) + "px"; + self._rows[rowOffset] = [rowData, rowNode]; self._scrollContent.appendChild(rowNode); },
apply patch from #<I>. author: moe, reviewer: glyph. fixes issue with scrolltable row positioning. closes #<I>
twisted_mantissa
train
js
cb655f0a2c320efc4fd7c18d6bc301a94e6d6f56
diff --git a/tensor2tensor/models/research/universal_transformer_util.py b/tensor2tensor/models/research/universal_transformer_util.py index <HASH>..<HASH> 100644 --- a/tensor2tensor/models/research/universal_transformer_util.py +++ b/tensor2tensor/models/research/universal_transformer_util.py @@ -125,8 +125,6 @@ def universal_transformer_encoder(encoder_input, x, extra_output = universal_transformer_layer( x, hparams, ffn_unit, attention_unit, pad_remover=pad_remover) - if hparams.get("use_memory_as_last_state", False): - x = extra_output # which is memory return common_layers.layer_preprocess(x, hparams), extra_output @@ -251,8 +249,9 @@ def universal_transformer_layer(x, output, _, extra_output = tf.foldl( ut_function, tf.range(hparams.num_rec_steps), initializer=initializer) - # This is possible only when we are using lstm as transition function. - if hparams.get("use_memory_as_final_state", False): + # Right now, this is only possible when the transition function is an lstm + if (hparams.recurrence_type == "lstm" and + hparams.get("use_memory_as_final_state", False)): output = extra_output if hparams.mix_with_transformer == "after_ut":
setting the default for use_memory_as_final_state flag to False (#<I>)
tensorflow_tensor2tensor
train
py
1aa191e58e905f470f73663fc1c35f36e05e929a
diff --git a/examples/src/main/python/ml/dataframe_example.py b/examples/src/main/python/ml/dataframe_example.py index <HASH>..<HASH> 100644 --- a/examples/src/main/python/ml/dataframe_example.py +++ b/examples/src/main/python/ml/dataframe_example.py @@ -28,6 +28,7 @@ import shutil from pyspark.sql import SparkSession from pyspark.mllib.stat import Statistics +from pyspark.mllib.util import MLUtils if __name__ == "__main__": if len(sys.argv) > 2: @@ -55,7 +56,8 @@ if __name__ == "__main__": labelSummary.show() # Convert features column to an RDD of vectors. - features = df.select("features").rdd.map(lambda r: r.features) + features = MLUtils.convertVectorColumnsFromML(df, "features") \ + .select("features").rdd.map(lambda r: r.features) summary = Statistics.colStats(features) print("Selected features column with average values:\n" + str(summary.mean()))
[SPARK-<I>][PYSPARK][ML][EXAMPLES] dataframe_example.py fails to convert ML style vectors ## What changes were proposed in this pull request? Need to convert ML Vectors to the old MLlib style before doing Statistics.colStats operations on the DataFrame ## How was this patch tested? Ran example, local tests
apache_spark
train
py
4d9a7dc9126d2807e534337c7e051e5c4c8be258
diff --git a/connection.go b/connection.go index <HASH>..<HASH> 100644 --- a/connection.go +++ b/connection.go @@ -16,6 +16,7 @@ const heartbeatDuration = time.Minute type Connection interface { OpenQueue(name string) Queue CollectStats() Stats + GetOpenQueues() []string } // Connection is the entry point. Use a connection to access queues, consumers and deliveries diff --git a/test_connection.go b/test_connection.go index <HASH>..<HASH> 100644 --- a/test_connection.go +++ b/test_connection.go @@ -49,3 +49,7 @@ func (connection TestConnection) Reset() { queue.Reset() } } + +func (connection TestConnection) GetOpenQueues() []string { + return []string{} +}
matching queue name with regexp and return reject for all matches
adjust_rmq
train
go,go
8481edbe1a7a867be5f25f643fee177213ed60d5
diff --git a/auth.go b/auth.go index <HASH>..<HASH> 100644 --- a/auth.go +++ b/auth.go @@ -32,12 +32,13 @@ func (auth *PlainAuth) Response() string { return fmt.Sprintf("\000%s\000%s", auth.Username, auth.Password) } -// AMQPLAINAuth is similar to PlainAuth +// AMQPlainAuth is similar to PlainAuth type AMQPlainAuth struct { Username string Password string } +// Mechanism returns "AMQPLAIN" func (auth *AMQPlainAuth) Mechanism() string { return "AMQPLAIN" } diff --git a/uri.go b/uri.go index <HASH>..<HASH> 100644 --- a/uri.go +++ b/uri.go @@ -125,7 +125,7 @@ func (uri URI) PlainAuth() *PlainAuth { } } -// PlainAuth returns a PlainAuth structure based on the parsed URI's +// AMQPlainAuth returns a PlainAuth structure based on the parsed URI's // Username and Password fields. func (uri URI) AMQPlainAuth() *AMQPlainAuth { return &AMQPlainAuth{
Fixes pre-existing golint issues
streadway_amqp
train
go,go
988e736836738996c46070265ebb274d0dbd06f5
diff --git a/LiSE/LiSE/proxy.py b/LiSE/LiSE/proxy.py index <HASH>..<HASH> 100644 --- a/LiSE/LiSE/proxy.py +++ b/LiSE/LiSE/proxy.py @@ -2934,9 +2934,10 @@ class EngineProxy(AbstractEngine): for f in self._time_listeners: f(b, t, branch, tick) - def __init__(self, handle_out, handle_in, eventq): + def __init__(self, handle_out, handle_in, logger, eventq): self._handle_out = handle_out self._handle_in = handle_in + self.logger = logger self._q = eventq self.eternal = EternalVarProxy(self) self.universal = GlobalVarProxy(self) @@ -3544,6 +3545,7 @@ class EngineProcessManager(object): self.engine_proxy = EngineProxy( self._handle_out_pipe_send, handle_in_pipe_recv, + self.logger, callbacq ) return self.engine_proxy
let EngineHandle at the logger, too
LogicalDash_LiSE
train
py
e9e4e4bd75b460ffc3524877a416771774244172
diff --git a/conf/lex.go b/conf/lex.go index <HASH>..<HASH> 100644 --- a/conf/lex.go +++ b/conf/lex.go @@ -13,7 +13,7 @@ import ( ) const spaces = " \t" -const whitespace = spaces + "\n\r" +const whitespace = spaces + "\n" const wordRunes = "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVXYZ_" const quotes = `'"` @@ -232,6 +232,7 @@ func (l *lexer) nextSignificantItem() item { // lex creates a new scanner for the input string. func lex(name, input string) *lexer { + input = strings.Replace(input, "\r\n", "\n", -1) l := &lexer{ name: name, input: input,
Adjust our CRLF strategy - convert before lexing.
cortesi_modd
train
go
9625842367e9c4c70ac1e3da8b40db641933ee6f
diff --git a/test/api-configuration.test.js b/test/api-configuration.test.js index <HASH>..<HASH> 100644 --- a/test/api-configuration.test.js +++ b/test/api-configuration.test.js @@ -71,10 +71,10 @@ suite('Configuration API', function() { var dump = database.commandSync('dump', { tables: 'companies' }); - var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + - 'table_create companies_BigramTerms ' + + var expected = 'table_create companies_BigramTerms ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram\n' + + 'table_create companies TABLE_HASH_KEY ShortText\n' + 'column_create companies name COLUMN_SCALAR ShortText\n' + 'column_create companies_BigramTerms companies_name ' + 'COLUMN_INDEX|WITH_POSITION companies name';
Fix expected dump for DefineIndexField
groonga_gcs
train
js
75147b9fd3f117f01d4a5301ddf98e0f19ab824d
diff --git a/webapp/WEB-INF/setupdata/vfs/system/workplace/editors/msdhtml/edithtml.js b/webapp/WEB-INF/setupdata/vfs/system/workplace/editors/msdhtml/edithtml.js index <HASH>..<HASH> 100644 --- a/webapp/WEB-INF/setupdata/vfs/system/workplace/editors/msdhtml/edithtml.js +++ b/webapp/WEB-INF/setupdata/vfs/system/workplace/editors/msdhtml/edithtml.js @@ -42,7 +42,7 @@ function hasSelectedText() { selectedRange = range; } - if ((selectedRange == null) || (selectedRange.htmlText == "") || (selectedRange.htmlText == null)) { + if ((selectedRange == null) || (selectedRange.htmlText == null) || (selectedRange.htmlText == "") || (selectedRange.htmlText.search(/<P>&nbsp;<\/P>/) != -1)) { // no text selected, check if an image is selected try { range = range.item(0);
fixed issue in getSelectedText method throwing JavaScript error
alkacon_opencms-core
train
js
f2851d9e73182d5dc3e3a0913bfd4d4405f1c6d2
diff --git a/__init__.py b/__init__.py index <HASH>..<HASH> 100644 --- a/__init__.py +++ b/__init__.py @@ -17,3 +17,4 @@ from srl_data import * from causal_data import * from temporal_data import * from factuality_data import * +from markable_data import *
Added markable data to the init
cltl_KafNafParserPy
train
py
66c2b3384ac1557b35934c77b0576b346be04869
diff --git a/cassandra/cluster.py b/cassandra/cluster.py index <HASH>..<HASH> 100644 --- a/cassandra/cluster.py +++ b/cassandra/cluster.py @@ -1940,7 +1940,7 @@ class Session(object): increasing timestamps across clusters, or set it to to ``lambda: int(time.time() * 1e6)`` if losing records over clock inconsistencies is acceptable for the application. Custom :attr:`timestamp_generator` s should - be callable, and calling them should return an integer representing seconds + be callable, and calling them should return an integer representing microseconds since some point in time, typically UNIX epoch. .. versionadded:: 3.8.0 diff --git a/cassandra/timestamps.py b/cassandra/timestamps.py index <HASH>..<HASH> 100644 --- a/cassandra/timestamps.py +++ b/cassandra/timestamps.py @@ -70,7 +70,7 @@ class MonotonicTimestampGenerator(object): call an instantiated ``MonotonicTimestampGenerator`` object. :param int now: an integer to be used as the current time, typically - representing the current time in seconds since the UNIX epoch + representing the current time in microseconds since the UNIX epoch :param int last: an integer representing the last timestamp returned by this object """
timestamp gen docstrings: sec-->usec
datastax_python-driver
train
py,py
34fb6241eb0dfe534ffd2f95cbdf83f4963ad1b2
diff --git a/ptpython/layout.py b/ptpython/layout.py index <HASH>..<HASH> 100644 --- a/ptpython/layout.py +++ b/ptpython/layout.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from prompt_toolkit.enums import DEFAULT_BUFFER +from prompt_toolkit.enums import DEFAULT_BUFFER, SEARCH_BUFFER from prompt_toolkit.filters import IsDone, HasCompletions, RendererHeightIsKnown, Always, HasFocus, Condition from prompt_toolkit.key_binding.vi_state import InputMode from prompt_toolkit.layout import Window, HSplit, VSplit, FloatContainer, Float, ConditionalContainer @@ -400,7 +400,9 @@ def create_layout(python_input, key_bindings_manager, ConditionalProcessor( processor=HighlightMatchingBracketProcessor(chars='[](){}'), filter=HasFocus(DEFAULT_BUFFER) & ~IsDone()), - HighlightSearchProcessor(preview_search=Always()), + ConditionalProcessor( + processor=HighlightSearchProcessor(preview_search=Always()), + filter=HasFocus(SEARCH_BUFFER)), HighlightSelectionProcessor()] + extra_buffer_processors, menu_position=menu_position,
Only show search highlighting when the search is the current input buffer.
prompt-toolkit_ptpython
train
py
10095bd3703e8d5e1b4e413e2eeb97f30341cdae
diff --git a/cmd/jujud/machine.go b/cmd/jujud/machine.go index <HASH>..<HASH> 100644 --- a/cmd/jujud/machine.go +++ b/cmd/jujud/machine.go @@ -84,7 +84,7 @@ func (a *MachineAgent) Run(_ *cmd.Context) error { // that need a state connection Unless we're bootstrapping, we // need to connect to the API server to find out if we need to // call this, so we make the APIWorker call it when necessary if - // the machine requires it. Note that startStateWorker can be + // the machine requires it. Note that ensureStateWorker can be // called many times - StartWorker does nothing if there is // already a worker started with the given name. ensureStateWorker := func() { @@ -126,7 +126,7 @@ var stateJobs = map[params.MachineJob]bool{ // APIWorker returns a Worker that connects to the API and starts any // workers that need an API connection. // -// If a state worker is necessary, APIWorker calls startStateWorker. +// If a state worker is necessary, APIWorker calls ensureStateWorker. func (a *MachineAgent) APIWorker(ensureStateWorker func()) (worker.Worker, error) { st, entity, err := openAPIState(a.Conf.Conf, a) if err != nil {
cmd/jujud: fix comments
juju_juju
train
go
68fb5c794b943977a76737e9892c92e323bf0a59
diff --git a/src/sap.m/src/sap/m/upload/UploadSet.js b/src/sap.m/src/sap/m/upload/UploadSet.js index <HASH>..<HASH> 100644 --- a/src/sap.m/src/sap/m/upload/UploadSet.js +++ b/src/sap.m/src/sap/m/upload/UploadSet.js @@ -272,6 +272,7 @@ sap.ui.define([ * <code>maxFileNameLength</code> property.</li> * <li>When the file name length restriction changes, and the file to be uploaded fails to meet the new * restriction.</li> + * <li>Listeners can use the item parameter to remove the incomplete item that failed to meet the restriction</li> * </ul> */ fileNameLengthExceeded: { @@ -290,6 +291,7 @@ sap.ui.define([ * <code>maxFileSize</code> property.</li> * <li>When the file size restriction changes, and the file to be uploaded fails to meet the new * restriction.</li> + * <li>Listeners can use the item parameter to remove the incomplete item that failed to meet the restriction</li> * </ul> */ fileSizeExceeded: {
[INTERNAL] API Documentation change for file name and size exceeded BCP: <I> Change-Id: I7eddb9d4fced<I>c<I>bb<I>ef7f5ea<I>c<I>b
SAP_openui5
train
js
7e4de0bc0820328740f91861416e287c4d75be2c
diff --git a/object-assign.js b/object-assign.js index <HASH>..<HASH> 100644 --- a/object-assign.js +++ b/object-assign.js @@ -10,7 +10,7 @@ var ToObject = function (val) { if (val == null) { - throw new TypeError('Object.assign can not be called with null or undefined'); + throw new TypeError('Object.assign cannot be called with null or undefined'); } return Object(val);
Update object-assign.js
sindresorhus_object-assign
train
js
701202b94b73abbc1abfe032f3119e6f05782cbe
diff --git a/code/thirdparty/Apache/Solr/HttpTransport/Curl.php b/code/thirdparty/Apache/Solr/HttpTransport/Curl.php index <HASH>..<HASH> 100644 --- a/code/thirdparty/Apache/Solr/HttpTransport/Curl.php +++ b/code/thirdparty/Apache/Solr/HttpTransport/Curl.php @@ -119,6 +119,9 @@ class Apache_Solr_HttpTransport_Curl extends Apache_Solr_HttpTransport_Abstract // set the URL CURLOPT_URL => $url, + // unset the content type, could be left over from previous request + CURLOPT_HTTPHEADER => array("Content-Type:"), + // set the timeout CURLOPT_TIMEOUT => $timeout ));
Remove Content-Type from Curl GET Request Solr <I> does not like Content-Types on GET requests. The Curl HttpTransport reuses the curl instance if you send multiple requests to Solr. This leads to an error if you send a post request, which sets the Content-Type Header and then send a GET request like search.
nyeholt_silverstripe-solr
train
php
5d24c38c5512c75248844b6233cf449d9b98cc79
diff --git a/vapi/library/finder/finder.go b/vapi/library/finder/finder.go index <HASH>..<HASH> 100644 --- a/vapi/library/finder/finder.go +++ b/vapi/library/finder/finder.go @@ -78,6 +78,17 @@ func (f *Finder) find(ctx context.Context, ipath string) ([]FindResult, error) { // Tokenize the path into its distinct parts. parts := strings.Split(ipath, "/") + // If there are more than three parts then the file name contains + // the "/" character. In that case collapse any additional parts + // back into the filename. + if len(parts) > 3 { + parts = []string{ + parts[0], + parts[1], + strings.Join(parts[2:], "/"), + } + } + libs, err := f.findLibraries(ctx, parts[0]) if err != nil { return nil, err
lib/finder: Support filenames with "/" This patch fixes the library's finder to support filenames containing the "/" character.
vmware_govmomi
train
go
f2a0e5c0ffd8f955fb35732ea6eacbbb20187e26
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/review.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/review.rb index <HASH>..<HASH> 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/review.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/review.rb @@ -24,7 +24,7 @@ class Review < ActiveRecord::Base belongs_to :project, :class_name => "Project", :foreign_key => "project_id" has_many :review_comments, :order => "created_at", :dependent => :destroy alias_attribute :comments, :review_comments - belongs_to :rule_failure, :foreign_key => 'rule_failure_permanent_id' + belongs_to :rule_failure, :foreign_key => 'rule_failure_permanent_id', :primary_key => 'permanent_id' validates_presence_of :user, :message => "can't be empty" validates_presence_of :review_type, :message => "can't be empty"
Fix display of source code in review detail The problem occurs when the review relates to a violation tracked over time.
SonarSource_sonarqube
train
rb
e283f9512eeb94847d6ed8b4594806cb4698b572
diff --git a/consul/structs/prepared_query_test.go b/consul/structs/prepared_query_test.go index <HASH>..<HASH> 100644 --- a/consul/structs/prepared_query_test.go +++ b/consul/structs/prepared_query_test.go @@ -4,7 +4,7 @@ import ( "testing" ) -func TestStructs_PreparedQuery_GetACLInfo(t *testing.T) { +func TestStructs_PreparedQuery_GetACLPrefix(t *testing.T) { ephemeral := &PreparedQuery{} if prefix := ephemeral.GetACLPrefix(); prefix != nil { t.Fatalf("bad: %#v", prefix)
Renames a unit test.
hashicorp_consul
train
go
91e8f68ae2e96faefc64c0727ca44518aa959b8f
diff --git a/lib/compoundify.js b/lib/compoundify.js index <HASH>..<HASH> 100644 --- a/lib/compoundify.js +++ b/lib/compoundify.js @@ -52,10 +52,11 @@ function compoundify(SuperConstructor) { if (arguments.length < 2) { value = {}; } + u = SuperConstructor.prototype.addNode.call(this, u, value); this._parents[u] = null; this._children[u] = new Set(); this._children[null].add(u); - return SuperConstructor.prototype.addNode.call(this, u, value); + return u; }; Constructor.prototype.delNode = function(u) { diff --git a/test/abstract-compoundify-test.js b/test/abstract-compoundify-test.js index <HASH>..<HASH> 100644 --- a/test/abstract-compoundify-test.js +++ b/test/abstract-compoundify-test.js @@ -114,6 +114,12 @@ module.exports = function(name, Constructor, superName, SuperConstructor) { g.delNode("sg1"); assert.throws(function() { g.children("sg1"); }); }); + + it("can remove a node created with a automatically assigned id", function() { + var id = g.addNode(); + g.delNode(id); + assert.lengthOf(g.nodes(), 0); + }); }); describe("from" + superName, function() {
Fix bug where auto-assigned id was not used for parent/children properties
dagrejs_graphlib
train
js,js
4f21e06d801e1e2c427c95da214ae580647aa047
diff --git a/contrib/parseq-batching/src/main/java/com/linkedin/parseq/batching/BatchingSupport.java b/contrib/parseq-batching/src/main/java/com/linkedin/parseq/batching/BatchingSupport.java index <HASH>..<HASH> 100644 --- a/contrib/parseq-batching/src/main/java/com/linkedin/parseq/batching/BatchingSupport.java +++ b/contrib/parseq-batching/src/main/java/com/linkedin/parseq/batching/BatchingSupport.java @@ -16,12 +16,12 @@ public class BatchingSupport implements PlanActivityListener { } @Override - public void onPlanActivated(final PlanContext plaContext) { + public void onPlanActivated(final PlanContext planContext) { } @Override - public void onPlanDeactivated(final PlanContext plaContext) { - _strategies.forEach(strategy -> strategy.handleBatch(plaContext)); + public void onPlanDeactivated(final PlanContext planContext) { + _strategies.forEach(strategy -> strategy.handleBatch(planContext)); } }
Typos in BathingSupport class.
linkedin_parseq
train
java
fc32d62a262c90497ec83fe61e07b5717d8e81bf
diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js index <HASH>..<HASH> 100644 --- a/cordova-lib/src/cordova/plugin.js +++ b/cordova-lib/src/cordova/plugin.js @@ -391,6 +391,7 @@ function determinePluginTarget(projectRoot, cfg, target, fetchOptions) { } // Require project pkgJson. var pkgJsonPath = path.join(projectRoot, 'package.json'); + var cordovaVersion = pkgJson.version; if(fs.existsSync(pkgJsonPath)) { pkgJson = cordova_util.requireNoCache(pkgJsonPath); } @@ -457,7 +458,7 @@ function determinePluginTarget(projectRoot, cfg, target, fetchOptions) { return (shouldUseNpmInfo ? registry.info([id]) .then(function(pluginInfo) { - return getFetchVersion(projectRoot, pluginInfo, pkgJson.version); + return getFetchVersion(projectRoot, pluginInfo, cordovaVersion); }) : Q(null)) .then(function(fetchVersion) { return fetchVersion ? (id + '@' + fetchVersion) : target;
CB-<I>: fixed incorrect plugin version fetching issue
apache_cordova-lib
train
js
ba03a830c5eddd32277237f5a7281a686c833477
diff --git a/salt/grains/core.py b/salt/grains/core.py index <HASH>..<HASH> 100644 --- a/salt/grains/core.py +++ b/salt/grains/core.py @@ -222,7 +222,7 @@ def os_data(): match = regex.match(line) if match: # Adds: lsb_distrib_{id,release,codename,description} - grains['lsb_{0}'.format(match.groups()[0].lower())] = match.groups()[1] + grains['lsb_{0}'.format(match.groups()[0].lower())] = match.groups()[1].rstrip() if os.path.isfile('/etc/arch-release'): grains['os'] = 'Arch' elif os.path.isfile('/etc/debian_version'):
Strip trailing \n off of lsb_* grains
saltstack_salt
train
py
5c8ad1bf85400aaacb82a478304bb77661d726a1
diff --git a/sos/archive.py b/sos/archive.py index <HASH>..<HASH> 100644 --- a/sos/archive.py +++ b/sos/archive.py @@ -118,11 +118,18 @@ class FileCacheArchive(Archive): self._check_path(dest) try: shutil.copy(src, dest) + except IOError: + self.log.info("caught IO error copying %s" % src) + try: shutil.copystat(src, dest) + except PermissionError: + # SELinux xattrs in /proc and /sys throw this + pass + try: stat = os.stat(src) os.chown(dest, stat.st_uid, stat.st_gid) - except IOError: - self.log.info("caught IO error copying %s" % src) + except Exception as e: + self.log.debug("caught %s setting ownership of %s" % (e,dest)) self.log.debug("added %s to FileCacheArchive %s" % (src, self._archive_root))
Break up exception handling in FileCacheArchive.add_file() An exception can occur at several points in add_file() - Copying the source to the destination - Propagating permissions with shutil.copystat - Setting ownership via os.chown The second of these can occur when copying SELinux xattrs from /proc. Separate out the three cases and ignore failures in copystat.
sosreport_sos
train
py
84b852c45751930fdf8850c519509bdb2e5a5e38
diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py index <HASH>..<HASH> 100644 --- a/superset/connectors/sqla/models.py +++ b/superset/connectors/sqla/models.py @@ -920,6 +920,7 @@ class SqlaTable(Model, BaseDatasource): # pylint: disable=too-many-public-metho data_["is_sqllab_view"] = self.is_sqllab_view data_["health_check_message"] = self.health_check_message data_["extra"] = self.extra + data_["owners"] = self.owners_data return data_ @property diff --git a/tests/integration_tests/datasource_tests.py b/tests/integration_tests/datasource_tests.py index <HASH>..<HASH> 100644 --- a/tests/integration_tests/datasource_tests.py +++ b/tests/integration_tests/datasource_tests.py @@ -290,6 +290,8 @@ class TestDatasource(SupersetTestCase): self.compare_lists(datasource_post[k], resp[k], "metric_name") elif k == "database": self.assertEqual(resp[k]["id"], datasource_post[k]["id"]) + elif k == "owners": + self.assertEqual([o["id"] for o in resp[k]], datasource_post["owners"]) else: print(k) self.assertEqual(resp[k], datasource_post[k])
fix: properly set `owners` to Sqlatable.owners_data inside payload (#<I>) * properly set owners_data for sqlatabl * fix test
apache_incubator-superset
train
py,py
0c78d7b31ec40082fcdb62866223340180c1674b
diff --git a/shoebot/__init__.py b/shoebot/__init__.py index <HASH>..<HASH> 100644 --- a/shoebot/__init__.py +++ b/shoebot/__init__.py @@ -993,10 +993,10 @@ class CairoCanvas(Canvas): ctx.save() x,y = item.metrics[0:2] deltax, deltay = item.center + m = item._transform.get_matrix_with_center(deltax,deltay-item.baseline,item._transformmode) + ctx.transform(m) ctx.translate(item.x,item.y) ctx.translate(0,-item.baseline) - m = item._transform.get_matrix_with_center(deltax,deltay,item._transformmode) - ctx.transform(m) self.drawtext(item) elif isinstance(item, Image): ctx.save()
transforms are correct for text objects too, finallyhg diff! now the transform system works almost perfectly
shoebot_shoebot
train
py
81e04d32840571d98e52b750d699ae3900213e0d
diff --git a/psiturk/psiturk_config.py b/psiturk/psiturk_config.py index <HASH>..<HASH> 100644 --- a/psiturk/psiturk_config.py +++ b/psiturk/psiturk_config.py @@ -28,7 +28,7 @@ class PsiturkConfig(SafeConfigParser): local_defaults_file = os.path.join(defaults_folder, "local_config_defaults.txt") global_defaults_file = os.path.join(defaults_folder, "global_config_defaults.txt") if not os.path.exists(self.localFile): - print "ERROR - no config.txt file in the current directory. \n\nAre you use this directory is a valid psiTurk experiment? If you are starting a new project run 'psiturk-setup-example' first." + print "ERROR - no config.txt file in the current directory. \n\nAre you sure this directory is a valid psiTurk experiment? If you are starting a new project run 'psiturk-setup-example' first." exit() self.localParser.read( self.localFile) if not os.path.exists(self.globalFile):
typo (closes #<I>)
NYUCCL_psiTurk
train
py
e24f9b70209eb6681f055596846033f7d3215ea5
diff --git a/git/util.py b/git/util.py index <HASH>..<HASH> 100644 --- a/git/util.py +++ b/git/util.py @@ -20,7 +20,6 @@ import shutil import stat from sys import maxsize import time -from unittest import SkipTest from urllib.parse import urlsplit, urlunsplit import warnings @@ -130,6 +129,7 @@ def rmtree(path: PathLike) -> None: func(path) # Will scream if still not possible to delete. except Exception as ex: if HIDE_WINDOWS_KNOWN_ERRORS: + from unittest import SkipTest raise SkipTest("FIXME: fails with: PermissionError\n {}".format(ex)) from ex raise
import unittest adds <I>s to script launch time This should not be imported at root level, since it adds a lot of initialization overhead without need.
gitpython-developers_GitPython
train
py
155e3ae6ea68b7c7865a47ce58388ed7ec23da0f
diff --git a/src/Malenki/Bah/S.php b/src/Malenki/Bah/S.php index <HASH>..<HASH> 100644 --- a/src/Malenki/Bah/S.php +++ b/src/Malenki/Bah/S.php @@ -216,7 +216,6 @@ class S extends O implements \Countable, \IteratorAggregate 'r', 'first', 'last', - 'a', //DEPRECATED to delete 'trans', 'rtl', 'ltr', @@ -492,21 +491,6 @@ class S extends O implements \Countable, \IteratorAggregate } - // TODO Deprecated? Or must create `to_a`? Must use chunk feature as ref. - protected function _a() - { - $a = new A(); - $i = new N(0); - - while ($i->less($this->_length())) { - $a->add($this->sub($i->value)); - $i->incr; - } - - return $a; - } - - protected function _trans() {
Class S: removed deprecated method
malenkiki_bah
train
php
f1d3d2b4442fba45c1bf8c8e8a1e0094b155c395
diff --git a/environs/ec2/ec2.go b/environs/ec2/ec2.go index <HASH>..<HASH> 100644 --- a/environs/ec2/ec2.go +++ b/environs/ec2/ec2.go @@ -419,7 +419,9 @@ func (e *environ) Destroy(insts []environs.Instance) error { if err != nil { return err } - // take an immutable reference to the current Storage + // to properly observe e.storageUnlocked we need to get it's value while + // holding e.configMutex. e.Storage() does this for us, then we convert + // back to the (*storage) to access the private deleteAll() method. st := e.Storage().(*storage) err = st.deleteAll() if err != nil { diff --git a/environs/interface.go b/environs/interface.go index <HASH>..<HASH> 100644 --- a/environs/interface.go +++ b/environs/interface.go @@ -131,11 +131,13 @@ type Environ interface { Instances(ids []string) ([]Instance, error) // Storage returns storage specific to the environment. - // The reference returned is immutable with respect to SetConfig. + // The configuration of the Storage returned is unaffected by + // subsiquent calls to SetConfig. Storage() Storage // PublicStorage returns storage shared between environments. - // The reference returned is immutable with respect to SetConfig. + // The configuration of the Storage returned is unaffected by + // subsiquent calls to SetConfig. PublicStorage() StorageReader // Destroy shuts down all known machines and destroys the
responding to review comments; some wordsmithing
juju_juju
train
go,go