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
6492271acc324e8d341184ea07898d3c8ecf823e
diff --git a/packages/ember-glimmer/tests/integration/content-test.js b/packages/ember-glimmer/tests/integration/content-test.js index <HASH>..<HASH> 100644 --- a/packages/ember-glimmer/tests/integration/content-test.js +++ b/packages/ember-glimmer/tests/integration/content-test.js @@ -484,6 +484,29 @@ class DynamicContentTest extends RenderingTest { this.assertContent('hello'); this.assertInvariants(); } + + ['@test it can render a property on a function']() { + let func = () => {}; + func.aProp = 'this is a property on a function'; + + this.renderPath('func.aProp', { func }); + + this.assertContent('this is a property on a function'); + + this.assertStableRerender(); + + // this.runTask(() => set(func, 'aProp', 'still a property on a function')); + // this.assertContent('still a property on a function'); + // this.assertInvariants(); + + // func = () => {}; + // func.aProp = 'a prop on a new function'; + + // this.runTask(() => set(this.context, 'func', func)); + + // this.assertContent('a prop on a new function'); + // this.assertInvariants(); + } } const EMPTY = {};
[BUGFIX release] failing test for reading a property off of a function
emberjs_ember.js
train
js
e2f8e549a9b6a78fe06d9ed3e93933485a602696
diff --git a/src/Product/Block/ProductImageGallery.php b/src/Product/Block/ProductImageGallery.php index <HASH>..<HASH> 100644 --- a/src/Product/Block/ProductImageGallery.php +++ b/src/Product/Block/ProductImageGallery.php @@ -15,8 +15,6 @@ class ProductImageGallery extends Block { $product = $this->getProduct(); - /* TODO: Once environment match is ready loop through images and select main one. */ - $images = $product->getAttributeValue('image'); $imageFile = $images->getAttribute('file'); $imageLabel = $images->getAttribute('label');
Issue #<I>: Remove obsolete comment
lizards-and-pumpkins_catalog
train
php
1c14a468d10f2657e3cf47353ec46c47aee4e5a4
diff --git a/src/index.js b/src/index.js index <HASH>..<HASH> 100644 --- a/src/index.js +++ b/src/index.js @@ -2,8 +2,8 @@ const tag = require('tagmeme') const {mapEffect, batchEffects} = require('raj-compose') const Result = (function () { - const Err = tag() - const Ok = tag() + const Err = tag('Err') + const Ok = tag('Ok') const Result = tag.union([Err, Ok]) Result.Err = Err Result.Ok = Ok @@ -32,10 +32,10 @@ function spa ({ errorProgram, containerView }) { - const GetRoute = tag() - const GetCancel = tag() - const GetProgram = tag() - const ProgramMsg = tag() + const GetRoute = tag('GetRoute') + const GetCancel = tag('GetCancel') + const GetProgram = tag('GetProgram') + const ProgramMsg = tag('ProgramMsg') const Msg = tag.union([ GetRoute, GetCancel,
Add tag names for better debugging
andrejewski_raj-spa
train
js
d06b3924ca56c6dc540ce4032f7a5aa6f543b9ec
diff --git a/src/main/java/com/plivo/api/models/call/Call.java b/src/main/java/com/plivo/api/models/call/Call.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/plivo/api/models/call/Call.java +++ b/src/main/java/com/plivo/api/models/call/Call.java @@ -28,6 +28,9 @@ public class Call extends BaseResource { private String toNumber; private String totalAmount; private String totalRate; + private String hangupSource; + private String hangupCauseName; + private Integer hangupCauseCode; public static CallCreator creator(String from, List<String> to, String answerUrl) { return new CallCreator(from, to, answerUrl); @@ -141,6 +144,18 @@ public class Call extends BaseResource { return totalRate; } + public String getHangupCauseName(){ + return hangupCauseName; + } + + public String getHangupSource(){ + return hangupSource; + } + + public Integer getHangupCauseCode(){ + return hangupCauseCode; + } + public CallDeleter deleter() { return Call.deleter(callUuid); }
adds the hangupCause, hangupCauseCode, hangupSource to Call response
plivo_plivo-java
train
java
ad3ecd64724916bb562267fcbdf45ecfcce4696d
diff --git a/test/tests.rb b/test/tests.rb index <HASH>..<HASH> 100755 --- a/test/tests.rb +++ b/test/tests.rb @@ -676,7 +676,8 @@ class TestExtractor < Minitest::Test expected = "N^nLl" extractor.extract.each do |pdf_page| spreadsheet = pdf_page.spreadsheets.first - assert_equal expected, spreadsheet.rows[0].reject(&:empty?).first.text.gsub(" ", '') + puts + assert_equal expected, spreadsheet.rows[0].map(&:text).reject(&:empty?).first.gsub(" ", '') end end @@ -688,7 +689,7 @@ class TestExtractor < Minitest::Test expected = "N^nLl" extractor.extract.each do |pdf_page| spreadsheet = pdf_page.spreadsheets.first - assert_equal expected, spreadsheet.rows[0].reject(&:empty?).first.text + assert_equal expected, spreadsheet.rows[0].map(&:text).reject(&:empty?).first end end
oops I'm bad at writing tests that pass; now it works!
tabulapdf_tabula-extractor
train
rb
ddf5980574c56859f7159e04fe2e8587e8740c80
diff --git a/tests/Stubs/AuditableModelStub.php b/tests/Stubs/AuditableModelStub.php index <HASH>..<HASH> 100644 --- a/tests/Stubs/AuditableModelStub.php +++ b/tests/Stubs/AuditableModelStub.php @@ -13,6 +13,13 @@ class AuditableModelStub extends Model implements AuditableContract /** * {@inheritdoc} */ + protected $casts = [ + 'published' => 'bool', + ]; + + /** + * {@inheritdoc} + */ public function resolveIpAddress() { return '127.0.0.1'; @@ -41,4 +48,16 @@ class AuditableModelStub extends Model implements AuditableContract { $this->auditThreshold = $threshold; } + + /** + * Uppercase Title accessor. + * + * @param string $value + * + * @return string + */ + public function getTitleAttribute($value) + { + return strtoupper($value); + } }
feat(AuditableModelStub): implement cast and accessor
owen-it_laravel-auditing
train
php
aba1b29b671991d0d00b610f6842575aa261bd8a
diff --git a/packager/packager.go b/packager/packager.go index <HASH>..<HASH> 100644 --- a/packager/packager.go +++ b/packager/packager.go @@ -2,8 +2,8 @@ package packager import ( "archive/zip" - "crypto/sha256" "crypto/md5" + "crypto/sha256" "encoding/hex" "fmt" "io" @@ -66,11 +66,8 @@ func Package(bpDir, cacheDir, version string, cached bool) (string, error) { for _, d := range manifest.Dependencies { dest := filepath.Join("dependencies", fmt.Sprintf("%x", md5.Sum([]byte(d.URI))), filepath.Base(d.URI)) - if _, err := os.Stat(dest); err != nil { - if os.IsNotExist(err) { - err = downloadFromURI(d.URI, filepath.Join(cacheDir, dest)) - } - if err != nil { + if _, err := os.Stat(filepath.Join(cacheDir, dest)); err != nil { + if err := downloadFromURI(d.URI, filepath.Join(cacheDir, dest)); err != nil { return "", err } }
Fix download vs cached choice for packager
cloudfoundry_libbuildpack
train
go
5d89ff672a3f7aacb69e7baac225017c890e7d0e
diff --git a/api-list.go b/api-list.go index <HASH>..<HASH> 100644 --- a/api-list.go +++ b/api-list.go @@ -19,7 +19,6 @@ package minio import ( "context" - "errors" "fmt" "net/http" "net/url" @@ -299,7 +298,10 @@ func (c Client) listObjectsV2Query(bucketName, objectPrefix, continuationToken s // This is an additional verification check to make // sure proper responses are received. if listBucketResult.IsTruncated && listBucketResult.NextContinuationToken == "" { - return listBucketResult, errors.New("Truncated response should have continuation token set") + return listBucketResult, ErrorResponse{ + Code: "NotImplemented", + Message: "Truncated response should have continuation token set", + } } for i, obj := range listBucketResult.Contents {
return notImplemented on listObjectsV2 call failure (#<I>)
minio_minio-go
train
go
66d1330bb01462f88332e52f969063aec5bd2385
diff --git a/lib/transforms/flattenRequireJs.js b/lib/transforms/flattenRequireJs.js index <HASH>..<HASH> 100644 --- a/lib/transforms/flattenRequireJs.js +++ b/lib/transforms/flattenRequireJs.js @@ -77,7 +77,7 @@ module.exports = function (queryObj) { if (requireJsRelationTypes.indexOf(outgoingRelation.type) !== -1) { if (outgoingRelation.to.type === 'JavaScript') { assetGraph.removeRelation(outgoingRelation); - } else if (outgoingRelation.to.type === 'Css' || outgoingRelation.to.type === 'Less') { + } else if ((outgoingRelation.to.type === 'Css' || outgoingRelation.to.type === 'Less') && !/(?:^|\/)text!/.test(outgoingRelation.rawHref)) { var newHtmlStyle = new assetGraph.HtmlStyle({to: outgoingRelation.to}); if (htmlStyleInsertionPoint) { newHtmlStyle.attach(htmlAsset, 'after', htmlStyleInsertionPoint);
flattenRequireJs: Keep css/less as AMD modules if it's included via the text plugin.
assetgraph_assetgraph
train
js
369a819e8604a5ac4b68496e9776e76b26807ca3
diff --git a/lib/excon/connection.rb b/lib/excon/connection.rb index <HASH>..<HASH> 100644 --- a/lib/excon/connection.rb +++ b/lib/excon/connection.rb @@ -28,7 +28,14 @@ module Excon params[:headers] ||= @connection[:headers] params[:headers]['Host'] ||= params[:host] || @connection[:host] params[:body] ||= @connection[:body] - params[:headers]['Content-Length'] = (params[:body] && params[:body].size) || 0 + params[:headers]['Content-Length'] = case params[:body] + when File + File.size(params[:body].path) + when String + params[:body].length + else + 0 + end for key, value in params[:headers] request << "#{key}: #{value}\r\n" end
set content-length based on body type
excon_excon
train
rb
731f353bea870357848037916cbc68f6d545aa78
diff --git a/upload/catalog/model/total/sub_total.php b/upload/catalog/model/total/sub_total.php index <HASH>..<HASH> 100644 --- a/upload/catalog/model/total/sub_total.php +++ b/upload/catalog/model/total/sub_total.php @@ -7,7 +7,7 @@ class ModelTotalSubTotal extends Model { $sub_total = $this->cart->getSubTotal(); - if (isset($this->session->data['vouchers']) && $this->session->data['vouchers']) { + if (!empty($this->session->data['vouchers'])) { foreach ($this->session->data['vouchers'] as $voucher) { $sub_total += $voucher['amount']; } @@ -22,4 +22,4 @@ class ModelTotalSubTotal extends Model { $total += $sub_total; } -} \ No newline at end of file +}
merge 2 condition into !empty(....)
opencart_opencart
train
php
ac2230ea3b8c78d2c1c9436c0c6e6c4b975fd75d
diff --git a/estnltk/tests/test_text/test_standard_operators.py b/estnltk/tests/test_text/test_standard_operators.py index <HASH>..<HASH> 100644 --- a/estnltk/tests/test_text/test_standard_operators.py +++ b/estnltk/tests/test_text/test_standard_operators.py @@ -9,16 +9,14 @@ from estnltk.tests import new_text def test_object_teardown(): - # Deleting a text object should delete its references from layers? - # pro: memory is reclaimed and the layer can be attached - # con: deleting text object may create unexpected None objects - text = Text('test') + # One cannot delete text object when layers are referenced! + # This is a sad truth caused by reference counting memory model + text = Text('Surematu Kašei') layer = Layer(name='empty_layer') text.add_layer(layer) del text - assert layer.text_object is None - + assert layer.text_object.text == 'Surematu Kašei' def test_equal(): t_1 = Text('Tekst algab. Tekst lõpeb.')
Stated immortality of a text object in the presence of lingering layer references
estnltk_estnltk
train
py
9790189eb70705e8ea6be0d777c0d16b3c0c2db9
diff --git a/trashcli/put.py b/trashcli/put.py index <HASH>..<HASH> 100644 --- a/trashcli/put.py +++ b/trashcli/put.py @@ -73,33 +73,19 @@ class TrashPutCmd: return reporter.exit_code(result) def trash_all(self, args, user_trash_dir, logger, ignore_missing, reporter): - result = TrashResult(False) - for arg in args : - result = self.trash(arg, - user_trash_dir, - result, - logger, - ignore_missing, - reporter) - return result - - def trash(self, - file, - user_trash_dir, - result, - logger, - ignore_missing, - reporter) : trasher = Trasher(self.trash_directories_finder, self.file_trasher, self.volumes, self.parent_path) - return trasher.trash(file, - user_trash_dir, - result, - logger, - ignore_missing, - reporter) + result = TrashResult(False) + for arg in args : + result = trasher.trash(arg, + user_trash_dir, + result, + logger, + ignore_missing, + reporter) + return result class Trasher:
Refactor: removed TrashPutCmd.trash method
andreafrancia_trash-cli
train
py
9a11eb889cfafc0d27713b286eac8e700643f929
diff --git a/rehive/api/client.py b/rehive/api/client.py index <HASH>..<HASH> 100644 --- a/rehive/api/client.py +++ b/rehive/api/client.py @@ -10,7 +10,7 @@ class Client: """ Interface for interacting with the rehive api """ - API_ENDPOINT = os.environ.get("REHIVE_API_V3_URL", + API_ENDPOINT = os.environ.get("REHIVE_API_URL", "https://rehive.com/api/3/") def __init__(self,
Updated env variable name to get a custom rehive endpoint
rehive_rehive-python
train
py
90f5f187443baf0c8ecd3caec78799ae0b9760a3
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -124,8 +124,8 @@ def get_version_info(): vinfo = _version_helper.generate_git_version_info() except: vinfo = vdummy() - vinfo.version = '1.15.6' - vinfo.release = 'False' + vinfo.version = '1.16.0' + vinfo.release = 'True' with open('pycbc/version.py', 'w') as f: f.write("# coding: utf-8\n")
Prepare for new release (#<I>)
gwastro_pycbc
train
py
6da14a1ba21e6013557f8ed18e93403d3d793ec7
diff --git a/epic/bigwig/create_bigwigs.py b/epic/bigwig/create_bigwigs.py index <HASH>..<HASH> 100644 --- a/epic/bigwig/create_bigwigs.py +++ b/epic/bigwig/create_bigwigs.py @@ -81,7 +81,7 @@ def _create_bigwig(bed_column, outpath, genome_size_dict): unique_chromosomes = list(bed_column.Chromosome.drop_duplicates()) chromosomes = list(bed_column.Chromosome) starts = _to_int(list(bed_column.Bin)) - ends = _to_int(list(bed_column.End)) + ends = _to_int(list(bed_column.End + 1)) header = [(c, int(genome_size_dict[c])) for c in unique_chromosomes]
Add 1 in length to ends of bigwigs
biocore-ntnu_epic
train
py
4d0145723996f0d23b3274d1b61f49b955623341
diff --git a/h2o-algos/src/test/java/hex/glm/GLMTest.java b/h2o-algos/src/test/java/hex/glm/GLMTest.java index <HASH>..<HASH> 100644 --- a/h2o-algos/src/test/java/hex/glm/GLMTest.java +++ b/h2o-algos/src/test/java/hex/glm/GLMTest.java @@ -201,7 +201,7 @@ public class GLMTest extends TestUtil { Frame fr = ParseDataset.parse(parsed, raw); GLM job = null; try { - GLMParameters params = new GLMParameters(Family.gamma); + GLMParameters params = new GLMParameters(Family.poisson); // params._response = 1; params._response_column = fr._names[1]; params._train = parsed;
Fixed broken glm test, testAllNAs uses data with 0 in the response, can not use gamma family.
h2oai_h2o-3
train
java
66b7e401d06a03d5635d826dce0d5e8df20932cc
diff --git a/test/search_index_test.rb b/test/search_index_test.rb index <HASH>..<HASH> 100644 --- a/test/search_index_test.rb +++ b/test/search_index_test.rb @@ -12,8 +12,8 @@ class SearchIndexTest < ActiveSupport::TestCase private - def build_search_index(root = index_loc, index_depth = 2, fields = [:title, :body], min_word_size = 3) - SearchIndex.new([root], index_depth, fields, min_word_size) + def build_search_index(fields, config) + SearchIndex.new(fields, config) end end
Test now matches new search index setup.
dougal_acts_as_indexed
train
rb
25824bb84ac778b3aa0c0c5f90a64bb80f963958
diff --git a/tests/dummy/app/controllers/index.js b/tests/dummy/app/controllers/index.js index <HASH>..<HASH> 100644 --- a/tests/dummy/app/controllers/index.js +++ b/tests/dummy/app/controllers/index.js @@ -1,6 +1,6 @@ import Controller from '@ember/controller'; import RSVP from 'rsvp'; -import { later, scheduleOnce } from '@ember/runloop'; +import { cancel, later, scheduleOnce } from '@ember/runloop'; export default Controller.extend({ asyncContent: null, @@ -21,10 +21,14 @@ export default Controller.extend({ this._super(...arguments); scheduleOnce('afterRender', () => { - later(() => { + this._logoTimer = later(() => { this.set('showLogoTooltip', true); }, 1000); }); }, + willDestroy() { + this._super(...arguments); + cancel(this._logoTimer); + } });
Fix 'calling set on destroyed object' error in dummy app under Fastboot
sir-dunxalot_ember-tooltips
train
js
fcca6a7c2f464dd283fda4c4b04575c904f36613
diff --git a/lib/mixpanel-node.js b/lib/mixpanel-node.js index <HASH>..<HASH> 100644 --- a/lib/mixpanel-node.js +++ b/lib/mixpanel-node.js @@ -61,7 +61,7 @@ var create_client = function(token, config) { metrics.send_request = function(options, callback) { callback = callback || function() {}; - var content = (new Buffer(JSON.stringify(options.data))).toString('base64'), + var content = Buffer.from(JSON.stringify(options.data)).toString('base64'), endpoint = options.endpoint, method = (options.method || 'GET').toUpperCase(), query_params = {
fix Buffer() deprecation warning i(node:<I>) [DEP<I>] DeprecationWarning: Buffer() is deprecated due to security and usability issues. Please use the Buffer.alloc(), Buffer.allocUnsafe(), or Buffer.from() methods instead.
mixpanel_mixpanel-node
train
js
4a3a8f078a4ecfdee16d07fe21886b1e5bd98b06
diff --git a/tests/multicolumn_map_expectations/test_multicolumn_map_expectations.py b/tests/multicolumn_map_expectations/test_multicolumn_map_expectations.py index <HASH>..<HASH> 100644 --- a/tests/multicolumn_map_expectations/test_multicolumn_map_expectations.py +++ b/tests/multicolumn_map_expectations/test_multicolumn_map_expectations.py @@ -35,7 +35,8 @@ def pytest_generate_tests(metafunc): " and context " + c) else: for d in test_configuration['datasets']: - my_dataset = get_dataset(c, d["data"]) + schemas = d["schemas"] if "schemas" in d else None + my_dataset = get_dataset(c, d["data"], schemas=schemas) for test in d["tests"]: parametrized_tests.append({
Updated test runner for multi-column-map to pass schemas to get_dataset
great-expectations_great_expectations
train
py
158f7f69e042362a4f9ea865510e002b37427fcb
diff --git a/Lib/fontParts/base/bPoint.py b/Lib/fontParts/base/bPoint.py index <HASH>..<HASH> 100644 --- a/Lib/fontParts/base/bPoint.py +++ b/Lib/fontParts/base/bPoint.py @@ -223,6 +223,7 @@ class BaseBPoint(BaseObject, TransformationMixin): offCurves[-1].y = y elif value != (0, 0): segment.type = "curve" + offCurves = segment.offCurve offCurves[-1].x = x offCurves[-1].y = y @@ -284,6 +285,7 @@ class BaseBPoint(BaseObject, TransformationMixin): offCurves[0].y = y elif value != (0, 0): nextSegment.type = "curve" + offCurves = segment.offCurve offCurves[0].x = x offCurves[0].y = y
offCurve need to be called again the temp list offCurves is not going to fill itself with points after setting the segment.type to curve, so call it again to retrieve the off curves and then change the x, y values
robotools_fontParts
train
py
0db521ba7f39afd215329b58485b73194f867f36
diff --git a/ph-http/src/main/java/com/helger/http/servlet/ServletHelper.java b/ph-http/src/main/java/com/helger/http/servlet/ServletHelper.java index <HASH>..<HASH> 100644 --- a/ph-http/src/main/java/com/helger/http/servlet/ServletHelper.java +++ b/ph-http/src/main/java/com/helger/http/servlet/ServletHelper.java @@ -95,16 +95,17 @@ public final class ServletHelper { ret = aRequest.getQueryString (); } - catch (final NullPointerException ex) + catch (final Throwable t) { // fall through /** * <pre> + * java.lang.NullPointerException: null * at org.eclipse.jetty.server.Request.getQueryString(Request.java:1119) ~[jetty-server-9.3.13.v20161014.jar:9.3.13.v20161014] * at com.helger.web.servlet.request.RequestHelper.getURL(RequestHelper.java:340) ~[ph-web-8.6.2.jar:8.6.2] * </pre> */ - s_aLogger.warn ("Failed to determine query string of HTTP request", ex); + s_aLogger.warn ("Failed to determine query string of HTTP request", t); } return ret; }
Catching Throwable to be safe :)
phax_ph-web
train
java
6d0545e3b39e65d5eaa854fb4d8bec17d8dafd56
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb index <HASH>..<HASH> 100644 --- a/spec/i18n_spec.rb +++ b/spec/i18n_spec.rb @@ -87,7 +87,7 @@ describe 'RedAlert' do end it "should have an english No button" do - @ac.actions[1].title.should == "Pas" + @ac.actions[1].title.should == "Non" end it "should have an english Cancel button" do @@ -95,7 +95,7 @@ describe 'RedAlert' do end it 'should have French placeholder text for the first field' do - @ac.textFields[0].placeholder.should == "S'identifier" + @ac.textFields[0].placeholder.should == "Identifiant" end it 'should have French placeholder text for the second field' do
correct spec due to my translation change
GantMan_RedAlert
train
rb
db2542390a1f0cdd4ed2ab39706695845796e462
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -662,7 +662,7 @@ Unirest = function (method, uri, headers, body, callback) { if (!(value instanceof Buffer || typeof value === 'string')) { if (is(value).a(Object)) { if (value instanceof fs.FileReadStream) { - return value.path; + return value; } else { return Unirest.serializers.json(value) } diff --git a/tests/basic.js b/tests/basic.js index <HASH>..<HASH> 100644 --- a/tests/basic.js +++ b/tests/basic.js @@ -1,5 +1,5 @@ -var should = require("should"); var fs = require("fs"); +var should = require("should"); var unirest = require('../index'); describe('Unirest', function () {
returning back the readStream into the handleFieldValue and managing it (or not) into the handleFormData
Kong_unirest-nodejs
train
js,js
83dbbabaeb0acb640730cf0cfbed36cefe55bac6
diff --git a/mobly/controllers/android_device_lib/jsonrpc_client_base.py b/mobly/controllers/android_device_lib/jsonrpc_client_base.py index <HASH>..<HASH> 100644 --- a/mobly/controllers/android_device_lib/jsonrpc_client_base.py +++ b/mobly/controllers/android_device_lib/jsonrpc_client_base.py @@ -218,7 +218,7 @@ class JsonRpcClientBase(object): ProtocolError: Raised when there is an error in the protocol. """ self._counter = self._id_counter() - self._conn = socket.create_connection(('127.0.0.1', self.host_port), + self._conn = socket.create_connection(('localhost', self.host_port), _SOCKET_CONNECTION_TIMEOUT) self._conn.settimeout(_SOCKET_READ_TIMEOUT) self._client = self._conn.makefile(mode='brw')
Change jsonrpc_client_base.py to connect to localhost (#<I>) connect to localhost instead of <I> so snippet client works on ipv6 only environments
google_mobly
train
py
602739a5c3bbb433f56d5bc021193e3d88b2ceeb
diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py index <HASH>..<HASH> 100644 --- a/salt/modules/yumpkg.py +++ b/salt/modules/yumpkg.py @@ -364,9 +364,9 @@ def group_install(name=None, pkgs = [] for group in pkg_groups: group_detail = group_info(group) - for package in group_detail['mandatory packages'].keys(): + for package in group_detail.get('mandatory packages', {}).keys(): pkgs.append(package) - for package in group_detail['default packages'].keys(): + for package in group_detail.get('default packages', {}).keys(): if package not in skip_pkgs: pkgs.append(package) for package in include: @@ -670,7 +670,7 @@ def group_info(groupname): yumbase = yum.YumBase() (installed, available) = yumbase.doGroupLists() for group in installed + available: - if group.name == groupname: + if group.name.lower() == groupname.lower(): return {'mandatory packages': group.mandatory_packages, 'optional packages': group.optional_packages, 'default packages': group.default_packages,
Fix TypeError in pkg.group_install Package groups are case-insensitive, so convert the group names to lowercase in group_info to ensure that matches are found. However, if the group does not exist, this same traceback will happen. Resolve this by using dict.get. This fixes #<I>.
saltstack_salt
train
py
8f0cf5050061a66b9f9fa3bebe2d6c394c6ef6f8
diff --git a/core/src/main/java/com/crawljax/oraclecomparator/comparators/AttributeComparator.java b/core/src/main/java/com/crawljax/oraclecomparator/comparators/AttributeComparator.java index <HASH>..<HASH> 100644 --- a/core/src/main/java/com/crawljax/oraclecomparator/comparators/AttributeComparator.java +++ b/core/src/main/java/com/crawljax/oraclecomparator/comparators/AttributeComparator.java @@ -27,7 +27,7 @@ public class AttributeComparator extends AbstractComparator { String strippedDom = dom; for (String attribute : ignoreAttributes) { String regExp = "\\s" + attribute + "=\"[^\"]*\""; - strippedDom = dom.replaceAll(regExp, ""); + strippedDom = strippedDom.replaceAll(regExp, ""); } return strippedDom; }
Bugfix: Apply all ignoreAttributes. Found a bug where if there were more than one ignoreAttributes, only the last one was applied.
crawljax_crawljax
train
java
576980097ec463fdc1cc8fcf0e398b1f9ab65adf
diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java index <HASH>..<HASH> 100644 --- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java +++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java @@ -1117,6 +1117,12 @@ public class XMPPTCPConnection extends AbstractXMPPConnection { } smResumedSyncPoint.reportSuccess(); smEnabledSyncPoint.reportSuccess(); + // If there where stanzas resent, then request a SM ack for them. + // Writer's sendStreamElement() won't do it automatically based on + // predicates. + if (!stanzasToResend.isEmpty()) { + requestSmAcknowledgementInternal(); + } LOGGER.fine("Stream Management (XEP-198): Stream resumed"); break; case AckAnswer.ELEMENT:
Request SM ack when re-sending after stream resumption Fixes SMACK-<I>.
igniterealtime_Smack
train
java
cf1fa58aeb3ed686aad57238d9a60db981cae30c
diff --git a/packages/vaex-core/vaex/core/_version.py b/packages/vaex-core/vaex/core/_version.py index <HASH>..<HASH> 100644 --- a/packages/vaex-core/vaex/core/_version.py +++ b/packages/vaex-core/vaex/core/_version.py @@ -1,2 +1,2 @@ -__version_tuple__ = (0, 3, 1) -__version__ = '0.3.1' +__version_tuple__ = (0, 3, 2) +__version__ = '0.3.2'
Release <I> of vaex-core
vaexio_vaex
train
py
4e37b1f053f3411d7f3b86416656a36396c53a0e
diff --git a/test/integration/client/prepared-statement-tests.js b/test/integration/client/prepared-statement-tests.js index <HASH>..<HASH> 100644 --- a/test/integration/client/prepared-statement-tests.js +++ b/test/integration/client/prepared-statement-tests.js @@ -17,6 +17,32 @@ test("simple, unnamed prepared statement", function(){ }); }); +test("use interval in prepared statement", function(){ + var client = helper.client(); + + client.query('SELECT interval \'15 days 2 months 3 years 6:12:05\' as interval', assert.success(function(result) { + var interval = result.rows[0].interval; + + var query = client.query({ + text: 'select cast($1 as interval) as interval', + values: [interval] + }); + + assert.emits(query, 'row', function(row) { + assert.equal(row.interval.seconds, 5); + assert.equal(row.interval.minutes, 12); + assert.equal(row.interval.hours, 6); + assert.equal(row.interval.days, 15); + assert.equal(row.interval.months, 2); + assert.equal(row.interval.years, 3); + }); + + assert.emits(query, 'end', function() { + client.end(); + }); + })); +}); + test("named prepared statement", function() { var client = helper.client();
Add test to make sure interval objects returned can be passed back into a prepared statement
brianc_node-postgres
train
js
c06c1dd50c83323806de67024c55a063820c3b87
diff --git a/mgorus.go b/mgorus.go index <HASH>..<HASH> 100644 --- a/mgorus.go +++ b/mgorus.go @@ -56,7 +56,7 @@ func NewHookerWithAuthDb(mgoUrl, authdb, db, collection, user, pass string) (*ho func (h *hooker) Fire(entry *logrus.Entry) error { data := make(logrus.Fields) data["Level"] = entry.Level.String() - data["Datetime"] = entry.Time + data["Time"] = entry.Time data["Message"] = entry.Message for k, v := range entry.Data {
:bear: :bug: reverted to uppercase
weekface_mgorus
train
go
b2cac8401aa43bd2376ba70c387d03aa397f47a2
diff --git a/tests/src/test/java/alluxio/hadoop/FileSystemAclIntegrationTest.java b/tests/src/test/java/alluxio/hadoop/FileSystemAclIntegrationTest.java index <HASH>..<HASH> 100644 --- a/tests/src/test/java/alluxio/hadoop/FileSystemAclIntegrationTest.java +++ b/tests/src/test/java/alluxio/hadoop/FileSystemAclIntegrationTest.java @@ -420,6 +420,8 @@ public final class FileSystemAclIntegrationTest { // chown and chmod to Alluxio file would not affect the permission of UFS file. sTFS.setOwner(fileA, newOwner, newGroup); sTFS.setPermission(fileA, FsPermission.createImmutable((short) 0700)); + Assert.assertEquals("", sUfs.getOwner(PathUtils.concatPath(sUfsRoot, fileA))); + Assert.assertEquals("", sUfs.getGroup(PathUtils.concatPath(sUfsRoot, fileA))); Assert.assertEquals(Constants.DEFAULT_FILE_SYSTEM_MODE, sUfs.getMode(PathUtils.concatPath(sUfsRoot, fileA))); }
[SMALLFIX] Also check new owner/group is unchanged.
Alluxio_alluxio
train
java
b69b7f4be5b8d7fa207100d71e57d7c620334185
diff --git a/src/Osiset/BasicShopifyAPI/BasicShopifyAPI.php b/src/Osiset/BasicShopifyAPI/BasicShopifyAPI.php index <HASH>..<HASH> 100755 --- a/src/Osiset/BasicShopifyAPI/BasicShopifyAPI.php +++ b/src/Osiset/BasicShopifyAPI/BasicShopifyAPI.php @@ -354,7 +354,16 @@ class BasicShopifyAPI implements SessionAware, ClientAware // Grab the HMAC, remove it from the params, then sort the params for hashing $hmac = $params['hmac']; $params = array_filter($params, function ($v, $k) { - return in_array($k, ['code', 'shop', 'timestamp', 'state', 'locale', 'nonce', 'protocol']); + return in_array($k, [ + 'code', + 'shop', + 'timestamp', + 'state', + 'locale', + 'nonce', + 'protocol', + 'session', + ]); }, ARRAY_FILTER_USE_BOTH); ksort($params);
Add missing session variable to hmac calculation
ohmybrew_Basic-Shopify-API
train
php
6be0a170c79a93e8a6a28c0f4ce3bc139f135aa2
diff --git a/src/PHPUnit/FullStackTestCase.php b/src/PHPUnit/FullStackTestCase.php index <HASH>..<HASH> 100644 --- a/src/PHPUnit/FullStackTestCase.php +++ b/src/PHPUnit/FullStackTestCase.php @@ -27,6 +27,11 @@ abstract class FullStackTestCase extends \PHPUnit_Framework_TestCase protected static function getTempComposerProjectPath() { + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + $path = sprintf("C:/ComposerTests/%s", str_replace('\\', '_', get_called_class())); + return new \SplFileInfo($path); + } + $path = sprintf( "%s/ComposerTests/%s", str_replace('\\', '/', sys_get_temp_dir()),
Shorter directory on Windows Windows temporary directory is very deep and causes some tests to fail
Cotya_composer-test-framework
train
php
48e93c8551f76ca1d35661d06c0c3a10662b256f
diff --git a/spec/spec_helper_spec.rb b/spec/spec_helper_spec.rb index <HASH>..<HASH> 100644 --- a/spec/spec_helper_spec.rb +++ b/spec/spec_helper_spec.rb @@ -139,6 +139,17 @@ describe Halite::SpecHelper do end # /context with step_into:false end # /describe #resource + describe '#provider' do + subject { provider(:halite_test) } + + context 'with defaults' do + provider(:halite_test) + it { is_expected.to be_a(Class) } + it { is_expected.to be < Chef::Provider } + its(:instance_methods) { are_expected.to include(:action_run) } + end # /context with defaults + end # /describe #provider + describe '#step_into' do context 'with a simple HWRP' do recipe do
Minimal tests for the provider helpers.
poise_halite
train
rb
ffc141e4bee0a7ae005ada157ff7cff121e0b1d9
diff --git a/admin/dst_update.php b/admin/dst_update.php index <HASH>..<HASH> 100644 --- a/admin/dst_update.php +++ b/admin/dst_update.php @@ -26,22 +26,6 @@ $ddd = olson_todst($CFG->dataroot.'/temp/olson.txt'); execute_sql('TRUNCATE TABLE '.$CFG->prefix.'timezone'); -$timezone = new stdClass; -$timezone->year = 1970; -for($i = -13; $i <= 13; $i += .5) { - $timezone->gmtoff = $i * HOURSECS; - $timezone->name = get_string('timezoneunspecifiedlocation').' / GMT'; - $timezone->sortkey = 'UNSPECIFIED_'.sprintf('%05d', 13 * HOURSECS + $timezone->gmtoff); - if($i < 0) { - $timezone->name .= $i; - } - else if($i > 0) { - $timezone->name .= '+'.$i; - } - insert_record('timezone', $timezone); -} - - foreach($ddd as $rec) { print_object($rec); insert_record('timezone', $rec);
Don't add trivial timezone records in the db, we 're going to handle them manually.
moodle_moodle
train
php
3ccc9c1ff1b4ee1b2f9585b6bc8ab2c59956edd1
diff --git a/publishable/database/dummy_seeds/PagesTableSeeder.php b/publishable/database/dummy_seeds/PagesTableSeeder.php index <HASH>..<HASH> 100644 --- a/publishable/database/dummy_seeds/PagesTableSeeder.php +++ b/publishable/database/dummy_seeds/PagesTableSeeder.php @@ -129,6 +129,9 @@ class PagesTableSeeder extends Seeder 'slugify' => [ 'origin' => 'title', ], + 'validation' => [ + 'rule' => 'unique:pages,slug', + ], ]), 'order' => 6, ])->save(); diff --git a/publishable/database/dummy_seeds/PostsTableSeeder.php b/publishable/database/dummy_seeds/PostsTableSeeder.php index <HASH>..<HASH> 100644 --- a/publishable/database/dummy_seeds/PostsTableSeeder.php +++ b/publishable/database/dummy_seeds/PostsTableSeeder.php @@ -185,6 +185,9 @@ class PostsTableSeeder extends Seeder 'origin' => 'title', 'forceUpdate' => true, ], + 'validation' => [ + 'rule' => 'unique:posts,slug', + ], ]), 'order' => 8, ])->save();
Unique slug rule for posts/pages Fixes #<I>
the-control-group_voyager
train
php,php
3bbbe6385122d3a0bba1e89d92653bca84875561
diff --git a/lib/declarative_authorization/maintenance.rb b/lib/declarative_authorization/maintenance.rb index <HASH>..<HASH> 100644 --- a/lib/declarative_authorization/maintenance.rb +++ b/lib/declarative_authorization/maintenance.rb @@ -171,7 +171,7 @@ module Authorization def request_with (user, method, xhr, action, params = {}, session = {}, flash = {}) - session = session.merge({:user => user, :user_id => user.id}) + session = session.merge({:user => user, :user_id => user && user.id}) with_user(user) do if xhr xhr method, action, params, session, flash
if user is nil, pass nil for user_id instead of causing an exception
stffn_declarative_authorization
train
rb
089abeaaf717d34e29057d0ebff48faab41f68f3
diff --git a/ratio.go b/ratio.go index <HASH>..<HASH> 100644 --- a/ratio.go +++ b/ratio.go @@ -84,7 +84,7 @@ func (rl *rateLimiter) record(p []byte) (int, error) { func (rl *rateLimiter) close() { if rl.op != nil { - rl.op.values <- values{rl.written, io.EOF} + rl.op.values <- values{rl.op.written, io.EOF} } } @@ -129,7 +129,7 @@ func (rl *rateLimiter) Write(p []byte) (int, error) { func (rl *rateLimiter) Close() error { select { case <-rl.stop: - return io.EOF + return nil default: } close(rl.stop)
don't EOF on Close
cyberdelia_ratio
train
go
c8629b781e4d1166bb7cf412dd9afddf54197246
diff --git a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java index <HASH>..<HASH> 100755 --- a/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java +++ b/client/src/main/java/com/orientechnologies/orient/client/remote/OStorageRemote.java @@ -478,8 +478,9 @@ public class OStorageRemote extends OStorageAbstract implements OStorageProxy, O } } -// In backward compatible code the context is missing check if is there. - if (context != null) { + //In backward compatible code the context is missing check if is there. + //we need to check the status closing here for avoid deadlocks (in future flow refactor this may be removed) + if (context != null && status != STATUS.CLOSING) { context.closeStorage(this); }
add additional check for avoid deadlocks in remote live query
orientechnologies_orientdb
train
java
b18353209d27b5ae3bec68204cdf951694b5a055
diff --git a/deeputil/misc.py b/deeputil/misc.py index <HASH>..<HASH> 100644 --- a/deeputil/misc.py +++ b/deeputil/misc.py @@ -489,19 +489,21 @@ class ExpiringCounter(object): # TODO Examples and Readme.md -import resource - def set_file_limits(n): """ Set the limit on number of file descriptors - that this process can open. + that this process can open. Only works on posix systems. """ - + try: - resource.setrlimit(resource.RLIMIT_NOFILE, (n, n)) - return True + if os.name == "posix": + # The resource module only exists on posix systems + resource.setrlimit(resource.RLIMIT_NOFILE, (n, n)) + return True + else: + return False except ValueError: return False
importing the resouce module is not portable to Windows systems. The import was moved inside a check of what system type is on. Also moved inside the function to reduce memory ussage if that specific function in the library isn't being used.
deep-compute_deeputil
train
py
f68273ba65f594c23fa4560a4bd30f62200ef393
diff --git a/gumble/client_incoming.go b/gumble/client_incoming.go index <HASH>..<HASH> 100644 --- a/gumble/client_incoming.go +++ b/gumble/client_incoming.go @@ -12,6 +12,7 @@ func clientIncoming(client *Client) { defer client.Close() conn := client.connection + data := make([]byte, 1024) for { var pType uint16 @@ -27,12 +28,14 @@ func clientIncoming(client *Client) { if pLengthInt > maximumPacketLength { return } - data := make([]byte, pLengthInt) - if _, err := io.ReadFull(conn, data); err != nil { + if pLengthInt > cap(data) { + data = make([]byte, pLengthInt) + } + if _, err := io.ReadFull(conn, data[:pLengthInt]); err != nil { return } if handle, ok := handlers[pType]; ok { - if err := handle(client, data); err != nil { + if err := handle(client, data[:pLengthInt]); err != nil { // TODO: log error? } }
change clientIncoming to use the same buffer for all messages
layeh_gumble
train
go
e5bfdbeb06ebb0b9caf4701bcc4e71494d3b9807
diff --git a/github/tests/Commit.py b/github/tests/Commit.py index <HASH>..<HASH> 100644 --- a/github/tests/Commit.py +++ b/github/tests/Commit.py @@ -54,6 +54,7 @@ class Commit(Framework.TestCase): self.assertEqual(self.commit.stats.additions, 0) self.assertEqual(self.commit.stats.total, 20) self.assertEqual(self.commit.url, "https://api.github.com/repos/jacquev6/PyGithub/commits/1292bf0e22c796e91cc3d6e24b544aece8c21f2a") + self.assertEqual(self.commit.commit.tree.sha, "4c6bd50994f0f9823f898b1c6c964ad7d4fa11ab") # test __repr__() based on this attributes self.assertEqual(self.commit.__repr__(), 'Commit(sha="1292bf0e22c796e91cc3d6e24b544aece8c21f2a")')
Add unit test for tree attribute of GitCommit (#<I>)
PyGithub_PyGithub
train
py
ea97dcfb763e39a3b8fb2146698bc3ec1882d9e0
diff --git a/jhipster-uml.js b/jhipster-uml.js index <HASH>..<HASH> 100755 --- a/jhipster-uml.js +++ b/jhipster-uml.js @@ -90,6 +90,7 @@ function createReflexives(reflexives) { otherEntityNameCapitalized: _.capitalize(element.className), ownerSide: true }); + newJson.fieldsContainOwnerOneToOne = true; fs.writeFileSync( '.jhipster/' + _.capitalize(element.className) + '.json', JSON.stringify(newJson, null, ' '));
Bug fix 'fieldsContainOneToOne' added by default in every new JSON file re-written if there is a case of reflexivity (nothing happens if already there)
jhipster_jhipster-uml
train
js
6dd21530dcd0837d651b999685546c93af4aecb8
diff --git a/site/bisheng.config.js b/site/bisheng.config.js index <HASH>..<HASH> 100644 --- a/site/bisheng.config.js +++ b/site/bisheng.config.js @@ -40,21 +40,13 @@ module.exports = { 'create-react-class': 'preact-compat/lib/create-react-class', 'react-router': 'react-router', }); - } else if (isDev) { + } else { config.externals = Object.assign({}, config.externals, { react: 'React', 'react-dom': 'ReactDOM', }); } - // config.babel.plugins.push([ - // require.resolve('babel-plugin-transform-runtime'), - // { - // polyfill: false, - // regenerator: true, - // }, - // ]); - config.plugins.push(new CSSSplitWebpackPlugin({ size: 4000 })); return config;
docs: always use externals
avetjs_avet
train
js
6890f21d64dbc69b6280c5037227087da11801f4
diff --git a/src/main/java/io/vlingo/actors/ActorProxyBase.java b/src/main/java/io/vlingo/actors/ActorProxyBase.java index <HASH>..<HASH> 100644 --- a/src/main/java/io/vlingo/actors/ActorProxyBase.java +++ b/src/main/java/io/vlingo/actors/ActorProxyBase.java @@ -8,8 +8,13 @@ import java.io.ObjectOutput; public abstract class ActorProxyBase<T> implements Externalizable { public static <T> T thunk(ActorProxyBase<?> proxy, Actor actor, T arg) { - if (proxy.isDistributable() && arg instanceof ActorProxyBase) { - final Stage stage = actor.lifeCycle.environment.stage; + return proxy.isDistributable() + ? thunk(actor.lifeCycle.environment.stage, arg) + : arg; + } + + public static <T> T thunk(Stage stage, T arg) { + if (arg instanceof ActorProxyBase) { @SuppressWarnings("unchecked") final ActorProxyBase<T> base = (ActorProxyBase<T>)arg; final Actor argActor = stage.directory.actorOf(base.address);
adds ActorProxy#thunk from stage
vlingo_vlingo-actors
train
java
0ab4a8b36461393427b7acf61b2cadcd95059d04
diff --git a/src/PlaygroundGame/Entity/Quiz.php b/src/PlaygroundGame/Entity/Quiz.php index <HASH>..<HASH> 100755 --- a/src/PlaygroundGame/Entity/Quiz.php +++ b/src/PlaygroundGame/Entity/Quiz.php @@ -66,6 +66,7 @@ class Quiz extends Game implements InputFilterAwareInterface /** * @ORM\OneToMany(targetEntity="QuizQuestion", mappedBy="quiz", cascade={"persist","remove"}) + * @ORM\OrderBy({"position" = "ASC"}) **/ private $questions;
getQuestion order by postion ASC
gregorybesson_PlaygroundGame
train
php
b0ffa32c788523e12fa031841d594b7896045158
diff --git a/clustering/web/cache/src/main/java/org/wildfly/clustering/web/cache/session/MutableSessionCreationMetaData.java b/clustering/web/cache/src/main/java/org/wildfly/clustering/web/cache/session/MutableSessionCreationMetaData.java index <HASH>..<HASH> 100644 --- a/clustering/web/cache/src/main/java/org/wildfly/clustering/web/cache/session/MutableSessionCreationMetaData.java +++ b/clustering/web/cache/src/main/java/org/wildfly/clustering/web/cache/session/MutableSessionCreationMetaData.java @@ -57,8 +57,10 @@ public class MutableSessionCreationMetaData implements SessionCreationMetaData { @Override public void setMaxInactiveInterval(Duration duration) { - this.metaData.setMaxInactiveInterval(duration); - this.mutator.mutate(); + if (!this.metaData.getMaxInactiveInterval().equals(duration)) { + this.metaData.setMaxInactiveInterval(duration); + this.mutator.mutate(); + } } @Override
Skip redundant mutate if maxInactiveInterval did not change.
wildfly_wildfly
train
java
12881131ed2e63e84ed819a00c1d8b248f552024
diff --git a/packages/vaex-server/vaex/server/tornado_server.py b/packages/vaex-server/vaex/server/tornado_server.py index <HASH>..<HASH> 100644 --- a/packages/vaex-server/vaex/server/tornado_server.py +++ b/packages/vaex-server/vaex/server/tornado_server.py @@ -167,7 +167,7 @@ GB = MB * 1024 class WebServer(threading.Thread): - def __init__(self, address="localhost", port=9000, webserver_thread_count=2, cache_byte_size=500 * MB, + def __init__(self, address="127.0.0.1", port=9000, webserver_thread_count=2, cache_byte_size=500 * MB, token=None, token_trusted=None, base_url=None, cache_selection_byte_size=500 * MB, datasets=[], compress=True, development=False, threads_per_job=4): threading.Thread.__init__(self)
fix(server): docker does not like localhost, <I> seems to work
vaexio_vaex
train
py
6ea918de562194ca0e16967674ebc6f80aabae8d
diff --git a/elasticsearch-extensions/lib/elasticsearch/extensions/version.rb b/elasticsearch-extensions/lib/elasticsearch/extensions/version.rb index <HASH>..<HASH> 100644 --- a/elasticsearch-extensions/lib/elasticsearch/extensions/version.rb +++ b/elasticsearch-extensions/lib/elasticsearch/extensions/version.rb @@ -1,5 +1,5 @@ module Elasticsearch module Extensions - VERSION = "0.0.11" + VERSION = "0.0.12" end end
[EXT] Release <I>
elastic_elasticsearch-ruby
train
rb
385f42dc572aca36806e1de49d5778fe40bf6924
diff --git a/tests/contrib/saltstack/test_saltstates.py b/tests/contrib/saltstack/test_saltstates.py index <HASH>..<HASH> 100644 --- a/tests/contrib/saltstack/test_saltstates.py +++ b/tests/contrib/saltstack/test_saltstates.py @@ -118,7 +118,7 @@ class JujuConfig2GrainsTestCase(unittest.TestCase): patcher.start() self.addCleanup(patcher.stop) - def _test_output_without_relation(self): + def test_output_without_relation(self): self.mock_config.return_value = charmhelpers.core.hookenv.Serializable({ 'group_code_owner': 'webops_deploy', 'user_code_runner': 'ubunet', @@ -136,7 +136,7 @@ class JujuConfig2GrainsTestCase(unittest.TestCase): "local_unit": "click-index/3", }, result) - def _test_output_with_relation(self): + def test_output_with_relation(self): self.mock_config.return_value = charmhelpers.core.hookenv.Serializable({ 'group_code_owner': 'webops_deploy', 'user_code_runner': 'ubunet',
Re-activated two tests that had been deactivated for debugging.
juju_charm-helpers
train
py
b50a1ea4fefd4417b8b5e58ec96b3f3dff93d1ae
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -VERSION = '1.0.1' +VERSION = '1.0.2' DESCRIPTION = 'Tx DBus' try:
version bump. Fixed support for Twisted <I>
cocagne_txdbus
train
py
357f1c6850c8ecbe1d1bfcc10267ed7d9a4f14e6
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb index <HASH>..<HASH> 100644 --- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb +++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb @@ -52,7 +52,7 @@ module ActiveRecord flunk rescue => e # assertion for *quoted* database properly - assert_match(/Access denied for user/, e.inspect) + assert_match(/Unknown database 'foo-bar': SHOW TABLES IN `foo-bar`/, e.inspect) end end diff --git a/activerecord/test/cases/adapters/mysql2/schema_test.rb b/activerecord/test/cases/adapters/mysql2/schema_test.rb index <HASH>..<HASH> 100644 --- a/activerecord/test/cases/adapters/mysql2/schema_test.rb +++ b/activerecord/test/cases/adapters/mysql2/schema_test.rb @@ -42,7 +42,7 @@ module ActiveRecord flunk rescue => e # assertion for *quoted* database properly - assert_match(/Access denied for user/, e.inspect) + assert_match(/Unknown database 'foo-bar': SHOW TABLES IN `foo-bar`/, e.inspect) end end
Fix message assertions for quoting database name in "show tables" for mysql
rails_rails
train
rb,rb
3ada558f7c4a56a6397d02a3266bfbc2d862053a
diff --git a/salt/modules/virt.py b/salt/modules/virt.py index <HASH>..<HASH> 100644 --- a/salt/modules/virt.py +++ b/salt/modules/virt.py @@ -368,7 +368,7 @@ def _get_on_reboot(dom): doc = minidom.parse(_StringIO(get_xml(dom))) for node in doc.getElementsByTagName('on_reboot'): on_restart = node.firstChild.nodeValue - return on_reboot + return on_restart def _get_on_crash(dom):
Variable renaming gone wrong. Fixing
saltstack_salt
train
py
68e74c9b82ab3763a5496cde0b645a21b61ec1c0
diff --git a/src/TypesGenerator.php b/src/TypesGenerator.php index <HASH>..<HASH> 100644 --- a/src/TypesGenerator.php +++ b/src/TypesGenerator.php @@ -296,7 +296,7 @@ class TypesGenerator // Second pass foreach ($classes as &$class) { - if ($class['parent'] && $class['parent'] !== 'Enum') { + if ($class['parent'] && 'Enum' !== $class['parent']) { if (isset($classes[$class['parent']])) { $classes[$class['parent']]['hasChild'] = true; $class['parentHasConstructor'] = $classes[$class['parent']]['hasConstructor'];
chore: fix CS (#<I>)
api-platform_schema-generator
train
php
befe885e2389882a167172b7bbe8d944e8bab535
diff --git a/lib/chef/resource/mount.rb b/lib/chef/resource/mount.rb index <HASH>..<HASH> 100644 --- a/lib/chef/resource/mount.rb +++ b/lib/chef/resource/mount.rb @@ -149,7 +149,6 @@ class Chef set_or_return( :username, arg, - :sensitive => true, :kind_of => [ String ] ) end
Fixed mistake added while removing old :password attribute definition
chef_chef
train
rb
417bca724b1762c3430ef5f845d91d19992ba142
diff --git a/app/scripts/TrackControl.js b/app/scripts/TrackControl.js index <HASH>..<HASH> 100644 --- a/app/scripts/TrackControl.js +++ b/app/scripts/TrackControl.js @@ -54,15 +54,17 @@ class TrackControl extends React.Component { <use xlinkHref="#cog" /> </svg> - <svg - ref={(c) => { this.imgAdd = c; }} - className="no-zoom" - onClick={() => this.props.onAddSeries(this.props.uid)} - style={this.props.imgStyleAdd} - styleName={buttonClassName} - > - <use xlinkHref="#plus" /> - </svg> + {this.props.onAddSeries && + <svg + ref={(c) => { this.imgAdd = c; }} + className="no-zoom" + onClick={() => this.props.onAddSeries(this.props.uid)} + style={this.props.imgStyleAdd} + styleName={buttonClassName} + > + <use xlinkHref="#plus" /> + </svg> + } <svg ref={(c) => { this.imgClose = c; }}
Only show plus when callback is available
higlass_higlass
train
js
3f3b8fe4e079338a09f5ada15b7fce08a6d6742c
diff --git a/angular-toggle-switch.js b/angular-toggle-switch.js index <HASH>..<HASH> 100644 --- a/angular-toggle-switch.js +++ b/angular-toggle-switch.js @@ -9,9 +9,6 @@ angular.module('toggle-switch', ['ng']).directive('toggleSwitch', function () { }, template: '<div class="switch" ng-click="toggle()"><div ng-class="{\'switch-off\': !model, \'switch-on\': model}"><span class="switch-left">{{ onLabel }}</span><span class="knob">&nbsp;</span><span class="switch-right">{{ offLabel }}</span></div></div>', link: function ($scope, element, attrs) { - if ($scope.model == null) { - $scope.model = false; - } $scope.onLabel = $scope.onLabel || 'On' $scope.offLabel = $scope.offLabel || 'Off' return $scope.toggle = function () {
Do not set model to false by default See #5 for more information
cgarvis_angular-toggle-switch
train
js
49b60a1c9a3a8c1ef3d500b796881c9a1deb2a65
diff --git a/admin/tool/messageinbound/classes/manager.php b/admin/tool/messageinbound/classes/manager.php index <HASH>..<HASH> 100644 --- a/admin/tool/messageinbound/classes/manager.php +++ b/admin/tool/messageinbound/classes/manager.php @@ -1012,7 +1012,7 @@ class manager { $messageparams = new \stdClass(); $messageparams->html = $message->html; $messageparams->plain = $message->plain; - $messagepreferencesurl = new \moodle_url("/message/edit.php", array('id' => $USER->id)); + $messagepreferencesurl = new \moodle_url("/message/notificationpreferences.php", array('id' => $USER->id)); $messageparams->messagepreferencesurl = $messagepreferencesurl->out(); $htmlmessage = get_string('messageprocessingsuccesshtml', 'tool_messageinbound', $messageparams); $plainmessage = get_string('messageprocessingsuccess', 'tool_messageinbound', $messageparams);
MDL-<I> Forum: Fixing issue with the 'preferences' link in emails
moodle_moodle
train
php
4b10acbebe5f6c3205dc481a98f997695d723e91
diff --git a/lib/ProMotion/screens/_tables/_table.rb b/lib/ProMotion/screens/_tables/_table.rb index <HASH>..<HASH> 100644 --- a/lib/ProMotion/screens/_tables/_table.rb +++ b/lib/ProMotion/screens/_tables/_table.rb @@ -106,7 +106,11 @@ module ProMotion # Set table_data_index if you want the right hand index column (jumplist) def sectionIndexTitlesForTableView(table_view) - self.table_data_index if self.respond_to?(:table_data_index) + if @promotion_table_data.filtered + nil + else + self.table_data_index if self.respond_to?(:table_data_index) + end end def tableView(table_view, cellForRowAtIndexPath:index_path)
Remove the table data index when searching. Put it back when searching is done.
infinitered_ProMotion
train
rb
720c23cc2db1611109cd4942d607e56f8baf53c3
diff --git a/bcbio/variation/recalibrate.py b/bcbio/variation/recalibrate.py index <HASH>..<HASH> 100644 --- a/bcbio/variation/recalibrate.py +++ b/bcbio/variation/recalibrate.py @@ -96,12 +96,14 @@ def _gatk_base_recalibrator(broad_runner, dup_align_bam, ref_file, platform, """Step 1 of GATK recalibration process, producing table of covariates. """ out_file = "%s.grp" % os.path.splitext(dup_align_bam)[0] + plot_file = "%s-plots.pdf" % os.path.splitext(dup_align_bam)[0] if not file_exists(out_file): if has_aligned_reads(dup_align_bam): with curdir_tmpdir() as tmp_dir: with file_transaction(out_file) as tx_out_file: params = ["-T", "BaseRecalibrator", "-o", tx_out_file, + "--plot_pdf_file", plot_file, "-I", dup_align_bam, "-R", ref_file, ]
Enable writing of GATK recalibration plots to replace old custom plots
bcbio_bcbio-nextgen
train
py
f57d7a9ccf3cf657b09dd7ac4f6bee54d3eda2f4
diff --git a/sporco/prox/_l21.py b/sporco/prox/_l21.py index <HASH>..<HASH> 100644 --- a/sporco/prox/_l21.py +++ b/sporco/prox/_l21.py @@ -12,6 +12,7 @@ from __future__ import division import numpy as np from ._lp import prox_l1, prox_l2, norm_l2 +from sporco.misc import renamed_function __author__ = """Brendt Wohlberg <brendt@ieee.org>""" @@ -48,6 +49,7 @@ def norm_l21(x, axis=-1): +@renamed_function(depname='prox_l1l2') def prox_sl1l2(v, alpha, beta, axis=None): r"""Compute the proximal operator of the sum of :math:`\ell_1` and :math:`\ell_2` norms (compound shrinkage/soft thresholding)
Added deprecation warning via renamed_function decorator
bwohlberg_sporco
train
py
3a15f694cbdc5ba75c260ac19335ff3d1efca387
diff --git a/reopen.go b/reopen.go index <HASH>..<HASH> 100644 --- a/reopen.go +++ b/reopen.go @@ -157,12 +157,13 @@ func (bw *BufferedFileWriter) Flush() { // flushDaemon periodically flushes the log file buffers. func (bw *BufferedFileWriter) flushDaemon(interval time.Duration) { - ticker := time.Tick(interval) + ticker := time.NewTicker(interval) for { select { case <-bw.quitChan: + ticker.Stop() return - case <-ticker: + case <-ticker.C: bw.Flush() } }
Close #6 goroutine leak due to time.Tick
client9_reopen
train
go
16852d236bac4ea6617b4bbda99410647ec51d21
diff --git a/workshift/signals.py b/workshift/signals.py index <HASH>..<HASH> 100644 --- a/workshift/signals.py +++ b/workshift/signals.py @@ -265,6 +265,7 @@ def update_assigned_hours(sender, instance, action, reverse, model, pk_set, **kw pool_hours.save(update_fields=["assigned_hours"]) notify.send( + None, verb="You were removed from", action_object=shift, recipient=assignee.user, @@ -280,6 +281,7 @@ def update_assigned_hours(sender, instance, action, reverse, model, pk_set, **kw pool_hours.save(update_fields=["assigned_hours"]) notify.send( + shift, verb="You were assigned to", action_object=shift, recipient=assignee.user,
Fixed bad call to notify.send
knagra_farnsworth
train
py
aebec4a00ffd62776a82619d2b876dbdf79435d6
diff --git a/spec/nsisam_spec.rb b/spec/nsisam_spec.rb index <HASH>..<HASH> 100644 --- a/spec/nsisam_spec.rb +++ b/spec/nsisam_spec.rb @@ -5,10 +5,12 @@ describe NSISam do before :all do @nsisam = NSISam::Client.new 'http://test:test@localhost:8888' @keys = Array.new + @fake_sam = NSISam::FakeServer.new.start end after :all do @keys.each { |key| @nsisam.delete(key) } + @fake_sam.stop end context "storing" do
using the fake sam server in the tests
nsi-iff_nsisam-ruby
train
rb
e959c9f1d59c6b6cbe22813fdb1431a1a8565fa0
diff --git a/pkg/kvstore/etcd.go b/pkg/kvstore/etcd.go index <HASH>..<HASH> 100644 --- a/pkg/kvstore/etcd.go +++ b/pkg/kvstore/etcd.go @@ -672,7 +672,7 @@ func connectEtcdClient(ctx context.Context, config *client.Config, cfgPath strin return } - ec.getLogger().Debugf("Session received") + ec.getLogger().Info("Initial etcd session established") if err := ec.checkMinVersion(ctx); err != nil { errChan <- fmt.Errorf("unable to validate etcd version: %s", err)
etcd: Print info message when connection is established
cilium_cilium
train
go
51ff0bad72e3e14b1803b123b58eb4881f2467a5
diff --git a/src/main/java/org/nustaq/serialization/FSTClazzInfo.java b/src/main/java/org/nustaq/serialization/FSTClazzInfo.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/nustaq/serialization/FSTClazzInfo.java +++ b/src/main/java/org/nustaq/serialization/FSTClazzInfo.java @@ -244,10 +244,10 @@ public final class FSTClazzInfo { if (c == null) { return res; } - Field[] declaredFields = BufferFieldMeta ? sharedFieldSets.get(c) : null ; + Field[] declaredFields = BufferFieldMeta && !conf.isStructMode() ? sharedFieldSets.get(c) : null ; if ( declaredFields == null ) { declaredFields = c.getDeclaredFields(); - if (BufferFieldMeta) + if (BufferFieldMeta && !conf.isStructMode()) sharedFieldSets.put(c,declaredFields); } List<Field> c1 = Arrays.asList(declaredFields);
fixed break of fastcast 3 (structs partially broken since <I>)
RuedigerMoeller_fast-serialization
train
java
e6de36fd263257f2a85c92801653e719b67c9fae
diff --git a/robe-admin/src/main/java/io/robe/admin/resources/AuthResource.java b/robe-admin/src/main/java/io/robe/admin/resources/AuthResource.java index <HASH>..<HASH> 100644 --- a/robe-admin/src/main/java/io/robe/admin/resources/AuthResource.java +++ b/robe-admin/src/main/java/io/robe/admin/resources/AuthResource.java @@ -87,6 +87,7 @@ public class AuthResource extends AbstractAuthResource<User> { Token token = TokenFactory.getInstance().createToken(user.get().getEmail(), DateTime.now(), attributes); token.setExpiration(token.getMaxAge()); credentials.remove("password"); + credentials.put("domain" , TokenBasedAuthResponseFilter.getTokenSentence("dummy")); return Response.ok().header("Set-Cookie", TokenBasedAuthResponseFilter.getTokenSentence(token.getTokenString())).entity(credentials).build(); } else {
ROBE-<I> cookie deletion
robeio_robe
train
java
3fb1d356184d0ba0058627dfa5209934ae39330b
diff --git a/src/Keboola/Syrup/Service/StorageApi/StorageApiService.php b/src/Keboola/Syrup/Service/StorageApi/StorageApiService.php index <HASH>..<HASH> 100644 --- a/src/Keboola/Syrup/Service/StorageApi/StorageApiService.php +++ b/src/Keboola/Syrup/Service/StorageApi/StorageApiService.php @@ -87,7 +87,7 @@ class StorageApiService 'token' => $request->headers->get('X-StorageApi-Token'), 'url' => $this->storageApiUrl, 'userAgent' => explode('/', $request->getPathInfo())[1], - 'jobPollRetryDelay' => createSimpleJobPollDelay($this->getBackoffTries(gethostname())) + 'backoffMaxTries' => $this->getBackoffTries(gethostname()) ] ) );
fix(StorageApiService): missing backoffMaxTries
keboola_syrup
train
php
5cea8be31339015da4d54ed5309cd16949053b19
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) setup( name='django-easy-timezones', - version='0.4.0', + version='0.5.0', packages=['easy_timezones'], install_requires=required, include_package_data=True,
<I> - include default IP file, adds starter test coverage, adds more complete ipv6 support
Miserlou_django-easy-timezones
train
py
4536302a69a889e192df1c8de9369737689ab7fb
diff --git a/vyper/parser/function_definitions/parse_function.py b/vyper/parser/function_definitions/parse_function.py index <HASH>..<HASH> 100644 --- a/vyper/parser/function_definitions/parse_function.py +++ b/vyper/parser/function_definitions/parse_function.py @@ -1,4 +1,6 @@ -from vyper.parser.context import Constancy, Context +# can't use from [module] import [object] because it breaks mocks in testing +from vyper.parser import context as ctx +from vyper.parser.context import Constancy from vyper.parser.function_definitions.parse_external_function import ( # NOTE black/isort conflict parse_external_function, ) @@ -37,7 +39,7 @@ def parse_function(code, sigs, origcode, global_ctx, is_contract_payable, _vars= # Create a local (per function) context. memory_allocator = MemoryAllocator() - context = Context( + context = ctx.Context( vars=_vars, global_ctx=global_ctx, sigs=sigs,
test: adjust import style to allow mocking
ethereum_vyper
train
py
8c1fef5a70362ff36159229c52d15ad97a9fb3df
diff --git a/classes/Boom/Model/Page.php b/classes/Boom/Model/Page.php index <HASH>..<HASH> 100644 --- a/classes/Boom/Model/Page.php +++ b/classes/Boom/Model/Page.php @@ -529,7 +529,7 @@ class Boom_Model_Page extends ORM_Taggable $this ->join(array('page_versions', 'version'), 'inner') ->on('page.id', '=', 'version.page_id') - ->join(array('page_versions', 'v2'), 'left outer') + ->join(array('page_versions', 'v2'), 'left') ->on('page.id', '=', 'v2.page_id') ->on('version.id', '<', 'v2.id') ->on('v2.stashed', '=', DB::expr(0))
Fixed page visible_from time not being set when a page is created
boomcms_boom-core
train
php
b72b001ff79fe12370b70fe99b3c344a09a03110
diff --git a/html5lib/tests/test_encoding.py b/html5lib/tests/test_encoding.py index <HASH>..<HASH> 100644 --- a/html5lib/tests/test_encoding.py +++ b/html5lib/tests/test_encoding.py @@ -54,8 +54,8 @@ def test_encoding(): try: import chardet def test_chardet(): - data = open(os.path.join(test_dir, "encoding" , "chardet", "test_big5.txt"), "rb").read() - encoding = inputstream.HTMLInputStream(data).charEncoding - assert encoding[0].lower() == "big5" + with open(os.path.join(test_dir, "encoding" , "chardet", "test_big5.txt"), "rb") as fp: + encoding = inputstream.HTMLInputStream(fp.read()).charEncoding + assert encoding[0].lower() == "big5" except ImportError: print("chardet not found, skipping chardet tests")
Fix #<I>: ResourceWarning on test_encoding (test_big5.txt unclosed)
html5lib_html5lib-python
train
py
0b8f3c63cc084073ba0df6f7c3db80a923ee723b
diff --git a/rest_framework_simplejwt/serializers.py b/rest_framework_simplejwt/serializers.py index <HASH>..<HASH> 100644 --- a/rest_framework_simplejwt/serializers.py +++ b/rest_framework_simplejwt/serializers.py @@ -94,6 +94,7 @@ class TokenObtainSlidingSerializer(TokenObtainSerializer): class TokenRefreshSerializer(serializers.Serializer): refresh = serializers.CharField() + access = serializers.ReadOnlyField() def validate(self, attrs): refresh = RefreshToken(attrs['refresh'])
Add ReadOnlyField to TokenRefreshSerializer (#<I>) To make TokenRefreshSerializer be more descriptive, by adding access field as a ReadOnlyField()
davesque_django-rest-framework-simplejwt
train
py
a0da0b64e648161ea24f7b72b2b3c29042f125c8
diff --git a/pygreen.py b/pygreen.py index <HASH>..<HASH> 100644 --- a/pygreen.py +++ b/pygreen.py @@ -37,7 +37,7 @@ class PyGreen: collection_size=100, ) # A list of regular expression. Files whose the name match - # one of those regular expressions will not be outputed when generating + # one of those regular expressions will not be outputted when generating # a static version of the web site self.file_exclusion = [r".*\.mako", r".*\.py", r"(^|.*\/)\..*"] def is_public(path): @@ -94,7 +94,7 @@ class PyGreen: def get(self, path): """ - Get the content of a file, indentified by its path relative to the folder configured + Get the content of a file, identified by its path relative to the folder configured in PyGreen. If the file extension is one of the extensions that should be processed through Mako, it will be processed. """
docs: Fix a few typos There are small typos in: - pygreen.py Fixes: - Should read `outputted` rather than `outputed`. - Should read `identified` rather than `indentified`.
nicolas-van_pygreen
train
py
9da86c16c697e1a23f2b129b38270391b58d16c4
diff --git a/Legobot/Connectors/IRC.py b/Legobot/Connectors/IRC.py index <HASH>..<HASH> 100644 --- a/Legobot/Connectors/IRC.py +++ b/Legobot/Connectors/IRC.py @@ -4,6 +4,7 @@ import logging import ssl import threading +import logging import time import irc.bot
Update IRC connector to handle newlines in responses
Legobot_Legobot
train
py
6db830605c606d251175943d402820218a0205f9
diff --git a/security/MemberAuthenticator.php b/security/MemberAuthenticator.php index <HASH>..<HASH> 100644 --- a/security/MemberAuthenticator.php +++ b/security/MemberAuthenticator.php @@ -30,7 +30,12 @@ class MemberAuthenticator extends Authenticator { * @see Security::setDefaultAdmin() */ public static function authenticate($RAW_data, Form $form = null) { - $SQL_user = Convert::raw2sql($RAW_data['Email']); + if(array_key_exists('Email', $RAW_data) && $RAW_data['Email']){ + $SQL_user = Convert::raw2sql($RAW_data['Email']); + } else { + return false; + } + $isLockedOut = false; $result = null;
MINOR Do a isset check before using the value. This happens if someone accidentially access /Security/LoginForm directly.
silverstripe_silverstripe-framework
train
php
a250455c90aa588ef726d8cc62de241d19174342
diff --git a/cmd/testing/tls_server.go b/cmd/testing/tls_server.go index <HASH>..<HASH> 100644 --- a/cmd/testing/tls_server.go +++ b/cmd/testing/tls_server.go @@ -4,16 +4,25 @@ import ( "bytes" "encoding/pem" "net/http/httptest" + "crypto/x509" ) -func ExtractRootCa(server *httptest.Server) (string, error) { +func ExtractRootCa(server *httptest.Server) (rootCaStr string, err error) { rootCa := new(bytes.Buffer) + + cert, err := x509.ParseCertificate(server.TLS.Certificates[0].Certificate[0]) + if err != nil { + panic(err.Error()) + } + // TODO: Replace above with following on Go 1.9 + //cert := server.Certificate() + block := &pem.Block{ Type: "CERTIFICATE", - Bytes: server.Certificate().Raw, + Bytes: cert.Raw, } - err := pem.Encode(rootCa, block) + err = pem.Encode(rootCa, block) if err != nil { return "", err }
Parse httptest server certificate manually to support go <I>
cloudfoundry_bosh-davcli
train
go
b6d77568bd472fd4e01385d099d8c7b42d40e038
diff --git a/utils/gerrit2el.py b/utils/gerrit2el.py index <HASH>..<HASH> 100755 --- a/utils/gerrit2el.py +++ b/utils/gerrit2el.py @@ -1,5 +1,28 @@ #!/usr/bin/python # -*- coding: utf-8 -*- +# +# Gerrit reviews loader for Elastic Search +# +# Copyright (C) 2015 Bitergia +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# Authors: +# Alvaro del Castillo San Felix <acs@bitergia.com> +# +# import json import os
Added copyright, license and author.
chaoss_grimoirelab-elk
train
py
fe105bfc3f00dfe78bc9008aaebebbfa9cc3b48c
diff --git a/terraform/context_input_test.go b/terraform/context_input_test.go index <HASH>..<HASH> 100644 --- a/terraform/context_input_test.go +++ b/terraform/context_input_test.go @@ -767,6 +767,15 @@ func TestContext2Input_dataSourceRequiresRefresh(t *testing.T) { p := testProvider("null") m := testModule(t, "input-module-data-vars") + p.GetSchemaReturn = &ProviderSchema{ + DataSources: map[string]*configschema.Block{ + "null_data_source": { + Attributes: map[string]*configschema.Attribute{ + "foo": {Type: cty.List(cty.String), Optional: true}, + }, + }, + }, + } p.ReadDataDiffFn = testDataDiffFn state := &State{
core: Fix TestContext2Input_submoduleTriggersInvalidCount This test now needs to provide a mock schema so its fixture can assign to the "foo" argument in null_data_source.
hashicorp_terraform
train
go
f8d3cf9af9f133f50017b7d13f21ee1a5881ffa3
diff --git a/lib/twitter-ads/account.rb b/lib/twitter-ads/account.rb index <HASH>..<HASH> 100644 --- a/lib/twitter-ads/account.rb +++ b/lib/twitter-ads/account.rb @@ -256,9 +256,8 @@ module TwitterAds # @return [Array] An Array of Tweet objects. # # @since 0.2.3 - def scoped_timeline(ids, opts = {}) - ids = ids.join(',') if ids.is_a?(Array) - params = { user_ids: ids }.merge!(opts) + def scoped_timeline(id, opts = {}) + params = { user_id: id }.merge!(opts) resource = SCOPED_TIMELINE % { id: @id } request = Request.new(client, :get, resource, params: params) response = request.perform
Rename user_ids to user_id in Account#timeline (#<I>) * Rename user_ids to user_id in Account#timeline
twitterdev_twitter-ruby-ads-sdk
train
rb
0939290315752a5de5cfd226ad65583f1d06b1f1
diff --git a/lib/airbrake/utils/params_cleaner.rb b/lib/airbrake/utils/params_cleaner.rb index <HASH>..<HASH> 100644 --- a/lib/airbrake/utils/params_cleaner.rb +++ b/lib/airbrake/utils/params_cleaner.rb @@ -106,12 +106,12 @@ module Airbrake data.to_hash.inject({}) do |result, (key, value)| result.merge!(key => clean_unserializable_data(value, stack + [data.object_id])) end - elsif data.respond_to?(:collect!) - data.collect! do |value| + elsif data.respond_to?(:collect) and not data.is_a?(IO) + data = data.collect do |value| clean_unserializable_data(value, stack + [data.object_id]) end elsif data.respond_to?(:to_ary) - data.to_ary.collect! do |value| + data = data.to_ary.collect do |value| clean_unserializable_data(value, stack + [data.object_id]) end elsif data.respond_to?(:to_s)
This should fix #<I> * Don't modify data in place with collect! * Don't try to "collect" over IO objects
airbrake_airbrake
train
rb
d50d4da0dfb70fcde0bff7a8ec109762dc281702
diff --git a/Gruntfile.js b/Gruntfile.js index <HASH>..<HASH> 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -76,6 +76,7 @@ module.exports = function (grunt) { port: 3000, livereload: true, middleware: function (connect, options, middlewares) { + middlewares = middlewares || []; return middlewares.concat([ require('connect-livereload')(), // livereload middleware connect.static(options.base), // serve static files
Fixed error when there is no existing middlewares.
summernote_summernote
train
js
1818845618637b692ecfeca09205a4f22708960f
diff --git a/pyspectral/radiance_tb_conversion.py b/pyspectral/radiance_tb_conversion.py index <HASH>..<HASH> 100644 --- a/pyspectral/radiance_tb_conversion.py +++ b/pyspectral/radiance_tb_conversion.py @@ -297,7 +297,7 @@ class SeviriRadTbConverter(RadTbConverter): def _get_rsr(self): """Overload the _get_rsr method, since RSR data are ignored here.""" - pass + LOG.debug("RSR data are ignored in this converter!") def radiance2tb(self, rad): """Get the Tb from the radiance using the simple non-linear regression method. diff --git a/pyspectral/tests/test_rad_tb_conversions.py b/pyspectral/tests/test_rad_tb_conversions.py index <HASH>..<HASH> 100644 --- a/pyspectral/tests/test_rad_tb_conversions.py +++ b/pyspectral/tests/test_rad_tb_conversions.py @@ -289,10 +289,6 @@ class TestSeviriConversions(unittest.TestCase): rads2 = retv2['radiance'] self.assertTrue(np.allclose(rads1, rads2)) - def tearDown(self): - """Clean up.""" - pass - class TestRadTbConversions(unittest.TestCase): """Testing the conversions between radiances and brightness temperatures."""
Fix a couple of Codefactor complaints
pytroll_pyspectral
train
py,py
b4701de0c0ca113fad078a4612843f91cc0f002a
diff --git a/lib/poolparty.rb b/lib/poolparty.rb index <HASH>..<HASH> 100644 --- a/lib/poolparty.rb +++ b/lib/poolparty.rb @@ -2,8 +2,9 @@ $LOAD_PATH<< File.dirname(__FILE__) # Load required gems #TODO: remove activesupport @required_software = Array.new -%w(rubygems ftools logging resolv digest/sha2 json pp).each do |lib| +%w(rubygems fileutils resolv digest/sha2 json pp logging).each do |lib| begin + NSLog('loading up: ' + lib) require lib rescue Exception => e @required_software << lib
ftools has been replaced with fileutils: <URL>
auser_poolparty
train
rb
d7167951b286ec64f33978de8879f37c4e6cf4b0
diff --git a/Gemfile.lock b/Gemfile.lock index <HASH>..<HASH> 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,7 +10,7 @@ GIT PATH remote: . specs: - rsvp (0.1.1) + rsvp (0.1.2) rails (~> 4.0, >= 4.0.2) GEM diff --git a/lib/rsvp/engine.rb b/lib/rsvp/engine.rb index <HASH>..<HASH> 100644 --- a/lib/rsvp/engine.rb +++ b/lib/rsvp/engine.rb @@ -6,6 +6,12 @@ module Rsvp g.test_framework :rspec end + config.to_prepare do + Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c| + require_dependency(c) + end + end + # Add engine db/migrate to paths so migrations run with wrapping application # Inspired by: http://pivotallabs.com/leave-your-migrations-in-your-rails-engines/ initializer :append_migrations do |app| diff --git a/lib/rsvp/version.rb b/lib/rsvp/version.rb index <HASH>..<HASH> 100644 --- a/lib/rsvp/version.rb +++ b/lib/rsvp/version.rb @@ -1,3 +1,3 @@ module Rsvp - VERSION = "0.1.3" + VERSION = "0.1.4" end
Added support for main app decorators.
ryanricard_rsvp
train
lock,rb,rb
4e7cd18a047043437f417488a610806da21bcd1a
diff --git a/lib/devise/controllers/helpers.rb b/lib/devise/controllers/helpers.rb index <HASH>..<HASH> 100644 --- a/lib/devise/controllers/helpers.rb +++ b/lib/devise/controllers/helpers.rb @@ -98,7 +98,7 @@ module Devise request.env["devise.allow_params_authentication"] = true end - # The scope root url to be used when he's signed in. By default, it first + # The scope root url to be used when they're signed in. By default, it first # tries to find a resource_root_path, otherwise it uses the root_path. def signed_in_root_path(resource_or_scope) scope = Devise::Mapping.find_scope!(resource_or_scope) diff --git a/lib/devise/models/timeoutable.rb b/lib/devise/models/timeoutable.rb index <HASH>..<HASH> 100644 --- a/lib/devise/models/timeoutable.rb +++ b/lib/devise/models/timeoutable.rb @@ -4,7 +4,7 @@ module Devise module Models # Timeoutable takes care of verifyng whether a user session has already # expired or not. When a session expires after the configured time, the user - # will be asked for credentials again, it means, he/she will be redirected + # will be asked for credentials again, it means, they will be redirected # to the sign in page. # # == Options
Remove a couple more gendered pronouns
plataformatec_devise
train
rb,rb
010cabf5219f1624903f505611c5eeb78d4fb217
diff --git a/driver.js b/driver.js index <HASH>..<HASH> 100644 --- a/driver.js +++ b/driver.js @@ -75,6 +75,11 @@ ee(Object.defineProperties(Driver.prototype, assign({ return this.__close(); }.bind(this)); }), + onDrain: d.gs(function () { + return deferred.map(keys(this._storages), function (name) { + return this[name].onDrain; + }, this._storages); + }), _load: d(function (id, value, stamp) { var proto;
Introduce `onDrain` for driver
medikoo_dbjs-persistence
train
js
74ba6b9cb64212baa17e3489a5db9a1d91029d67
diff --git a/src/Ouzo/Tools/Model/Template/Dialect/Dialect.php b/src/Ouzo/Tools/Model/Template/Dialect/Dialect.php index <HASH>..<HASH> 100644 --- a/src/Ouzo/Tools/Model/Template/Dialect/Dialect.php +++ b/src/Ouzo/Tools/Model/Template/Dialect/Dialect.php @@ -31,9 +31,4 @@ class Dialect { return array(); } - - public function columnType($columnName) - { - return $columnName; - } } \ No newline at end of file
Deleted column type from Dialect.
letsdrink_ouzo
train
php
210d64f22c5b38219375e627782223f14bd2180b
diff --git a/Model/ApiPayload.php b/Model/ApiPayload.php index <HASH>..<HASH> 100644 --- a/Model/ApiPayload.php +++ b/Model/ApiPayload.php @@ -273,7 +273,6 @@ class ApiPayload */ private function setSettings($settings) { - return; if ($settings) { foreach ($this->settings as $key => &$value) { if (!empty($settings->{$key}) && $settings->{$key}) { @@ -405,10 +404,6 @@ class ApiPayload 'api_date' => $this->tokenHelper->getDateFormatHelper()->format(new \DateTime()), ] ); - - if (!empty($this->additionalTokenContext)) { - $this->tokenHelper->addContext($this->additionalTokenContext); - } } /**
[ENG-<I>] Removed return that was set in settings. Removed $additionalTokenContext in prepareTokenHelper
TheDMSGroup_mautic-contact-client
train
php
7beb87974d619cc8149f51bb1aa3f153b86c996a
diff --git a/Classes/Indexer/NodeIndexer.php b/Classes/Indexer/NodeIndexer.php index <HASH>..<HASH> 100644 --- a/Classes/Indexer/NodeIndexer.php +++ b/Classes/Indexer/NodeIndexer.php @@ -248,7 +248,9 @@ class NodeIndexer extends AbstractNodeIndexer implements BulkNodeIndexerInterfac $handleNode = function (NodeInterface $node, Context $context) use ($targetWorkspaceName, $indexer) { $nodeFromContext = $context->getNodeByIdentifier($node->getIdentifier()); if ($nodeFromContext instanceof NodeInterface) { - $indexer($nodeFromContext, $targetWorkspaceName); + $this->searchClient->withDimensions(function () use ($indexer, $nodeFromContext, $targetWorkspaceName) { + $indexer($nodeFromContext, $targetWorkspaceName); + }, $nodeFromContext->getContext()->getTargetDimensions()); } else { $documentIdentifier = $this->calculateDocumentIdentifier($node, $targetWorkspaceName); if ($node->isRemoved()) {
TASK: Set the correct dimensions before processing the document
Flowpack_Flowpack.ElasticSearch.ContentRepositoryAdaptor
train
php
ad4b3e11fe41080d66ac1780b455246ae18bdc35
diff --git a/daemon/graphdriver/overlay2/mount.go b/daemon/graphdriver/overlay2/mount.go index <HASH>..<HASH> 100644 --- a/daemon/graphdriver/overlay2/mount.go +++ b/daemon/graphdriver/overlay2/mount.go @@ -32,12 +32,6 @@ type mountOptions struct { } func mountFrom(dir, device, target, mType, label string) error { - - r, w, err := os.Pipe() - if err != nil { - return fmt.Errorf("mountfrom pipe failure: %v", err) - } - options := &mountOptions{ Device: device, Target: target, @@ -47,7 +41,10 @@ func mountFrom(dir, device, target, mType, label string) error { } cmd := reexec.Command("docker-mountfrom", dir) - cmd.Stdin = r + w, err := cmd.StdinPipe() + if err != nil { + return fmt.Errorf("mountfrom error on pipe creation: %v", err) + } output := bytes.NewBuffer(nil) cmd.Stdout = output
overlay2: close read end of pipe on mount exec Use StdinPipe to ensure pipe is properly closed after startup Fixes #<I>
moby_moby
train
go
aaaa1a3fa932821bc65e87f6edfd0042a0e50fe7
diff --git a/traits/PasswordTrait.php b/traits/PasswordTrait.php index <HASH>..<HASH> 100644 --- a/traits/PasswordTrait.php +++ b/traits/PasswordTrait.php @@ -191,6 +191,8 @@ trait PasswordTrait /** * Set new password. + * If $password is empty, the specilty which represents the empty will be taken. + * Finally, it will trigger `static::$eventAfterSetPassword` event. * @param string $password the new password to be set. */ public function setPassword($password = null) diff --git a/traits/RegistrationTrait.php b/traits/RegistrationTrait.php index <HASH>..<HASH> 100644 --- a/traits/RegistrationTrait.php +++ b/traits/RegistrationTrait.php @@ -113,7 +113,7 @@ trait RegistrationTrait if (!$this->save()) { throw new IntegrityException('Registration Error(s) Occured: User Save Failed.', $this->getErrors()); } - if ($authManager = $this->getAuthManager() && !empty($authRoles)) { + if (($authManager = $this->getAuthManager()) && !empty($authRoles)) { if (is_string($authRoles) || $authRoles instanceof Role || !is_array($authRoles)) { $authRoles = [$authRoles]; }
fix registring with roles bug.
rhosocial_yii2-base-models
train
php,php
7c1f5871ed3e24b3f37ec1cd64a4525a5630f967
diff --git a/game_data_struct.py b/game_data_struct.py index <HASH>..<HASH> 100644 --- a/game_data_struct.py +++ b/game_data_struct.py @@ -225,6 +225,12 @@ def rotate_game_tick_packet_boost_omitted(game_tick_packet): game_tick_packet.gameball.AngularVelocity.Y = -1 * game_tick_packet.gameball.AngularVelocity.Y game_tick_packet.gameball.Acceleration.X = -1 * game_tick_packet.gameball.Acceleration.X game_tick_packet.gameball.Acceleration.Y = -1 * game_tick_packet.gameball.Acceleration.Y + + # ball touch data + game_tick_packet.gameball.Touch.sHitLocation.X = -1 * game_tick_packet.gameball.Touch.sHitLocation.X + game_tick_packet.gameball.Touch.sHitLocation.Y = -1 * game_tick_packet.gameball.Touch.sHitLocation.Y + game_tick_packet.gameball.Touch.sHitNormal.X = -1 * game_tick_packet.gameball.Touch.sHitNormal.X + game_tick_packet.gameball.Touch.sHitNormal.Y = -1 * game_tick_packet.gameball.Touch.sHitNormal.Y # Rotate Yaw 180 degrees is all that is necessary. ball_yaw = game_tick_packet.gameball.Rotation.Yaw
Added flip code to the ball touch data.
RLBot_RLBot
train
py
1b8d5b6ad37bcfe9d386c9f21e8229806af8bb57
diff --git a/spec/lib/file_reverse_reader_spec.rb b/spec/lib/file_reverse_reader_spec.rb index <HASH>..<HASH> 100644 --- a/spec/lib/file_reverse_reader_spec.rb +++ b/spec/lib/file_reverse_reader_spec.rb @@ -1,3 +1,5 @@ +# coding: utf-8 + require "enumerator" require 'spec_helper'
Add magic comment to spec on Ruby <I>.x
fluent_fluentd-ui
train
rb
db9c698157c2cc8f868d6be5f83b89765f3aaca4
diff --git a/src/components/Editor/ConditionalPanel.js b/src/components/Editor/ConditionalPanel.js index <HASH>..<HASH> 100644 --- a/src/components/Editor/ConditionalPanel.js +++ b/src/components/Editor/ConditionalPanel.js @@ -104,6 +104,13 @@ export class ConditionalPanel extends PureComponent<Props> { } renderToWidget(props: Props) { + if (this.cbPanel) { + if (this.props.line && this.props.line == props.line) { + return props.closeConditionalPanel(); + } + this.clearConditionalPanel(); + } + const { selectedLocation, line, editor } = props; const sourceId = selectedLocation ? selectedLocation.sourceId : "";
Prevent the re-rendering of a conditional breakpoint panel (cbp) when opening a new cbp or removing or disabling an open cbp. (#<I>)
firefox-devtools_debugger
train
js
a4efbea888bd73c6d943dfa3696cd57b3de938cb
diff --git a/custom/gnap-angular/js/develop/gnap/sidebar.directive.js b/custom/gnap-angular/js/develop/gnap/sidebar.directive.js index <HASH>..<HASH> 100644 --- a/custom/gnap-angular/js/develop/gnap/sidebar.directive.js +++ b/custom/gnap-angular/js/develop/gnap/sidebar.directive.js @@ -24,7 +24,8 @@ restrict: 'A', replace: true, templateUrl: 'template/gnap/sidebar/sidebar.html', - link: link + link: link, + transclude: true }; function link(scope) { @@ -139,6 +140,7 @@ " <div class=\"sidebar-collapse\" id=\"sidebar-collapse\" ng-click=\"toggleCollapsed()\">\n" + " <i ng-class=\"{\'icon-double-angle-left\': !settings.collapsed, \'icon-double-angle-right\': settings.collapsed}\"><\/i>\n" + " <\/div>\n" + + " <div ng-transclude><\/div>\n" + "<\/div>\n" + ""); /* jshint ignore:end */
Allow custom content to be transcluded at bottom of sidebar
infrabel_themes-gnap
train
js
a1e9d07fe67619324cd188e4e3b40a494ddeeafb
diff --git a/boot/boot.go b/boot/boot.go index <HASH>..<HASH> 100644 --- a/boot/boot.go +++ b/boot/boot.go @@ -148,7 +148,7 @@ func (b *Bootstrapper) bootTerraform() error { return err } - help("List the environments you would like (comma separated, e.g.: 'dev, test, prod')") + help("List the environments you would like (comma separated, e.g.: 'stage, prod')") envs := readEnvs(prompt.String(indent(" Environments: "))) fmt.Println()
change list of envs in init example
apex_apex
train
go
2fc1f5c787aad57f9ad1ad89c4df755f27865c0e
diff --git a/lib/odata/properties/integer.rb b/lib/odata/properties/integer.rb index <HASH>..<HASH> 100644 --- a/lib/odata/properties/integer.rb +++ b/lib/odata/properties/integer.rb @@ -59,11 +59,11 @@ module OData private def min_value - @min ||= -(2**15) + @min ||= -(2**31) end def max_value - @max ||= (2**15)-1 + @max ||= (2**31)-1 end end
Fixed errant implementation of min and max values in OData::Properties::Int<I>.
ruby-odata_odata
train
rb