diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/Field.php b/src/Field.php
index <HASH>..<HASH> 100644
--- a/src/Field.php
+++ b/src/Field.php
@@ -260,9 +260,7 @@ abstract class Field
$this->type = '';
}
- for($i = 1; $i < count($parts) && $parts[$i] != "Field"; $i++);
-
- for(; $i < count($parts); $i++)
+ for ($i = array_search('Field', $parts); 0 < $i && $i < count($parts); $i++)
{
$this->type .= '\\' . StringHelper::ucfirst($parts[$i]);
}
|
Code style for control statement fixed; followed by code simplification.
Actual one was causing Travis, build to fail due to inline-control-structure usage and no space before parens of for statements.
|
diff --git a/core/src/main/java/io/undertow/security/impl/SingleSignOnAuthenticationMechanism.java b/core/src/main/java/io/undertow/security/impl/SingleSignOnAuthenticationMechanism.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/io/undertow/security/impl/SingleSignOnAuthenticationMechanism.java
+++ b/core/src/main/java/io/undertow/security/impl/SingleSignOnAuthenticationMechanism.java
@@ -169,7 +169,11 @@ public class SingleSignOnAuthenticationMechanism implements AuthenticationMechan
if (reason == SessionDestroyedReason.INVALIDATED) {
for (Session associatedSession : sso) {
associatedSession.invalidate(null);
+ sso.remove(associatedSession);
}
+ }
+ // If there are no more associated sessions, remove the SSO altogether
+ if (!sso.iterator().hasNext()) {
manager.removeSingleSignOn(ssoId);
}
} finally {
|
UNDERTOW-<I> SSO not destroyed when the last associated session times out
|
diff --git a/tests/functional/TimeSeriesOperationsTest.php b/tests/functional/TimeSeriesOperationsTest.php
index <HASH>..<HASH> 100644
--- a/tests/functional/TimeSeriesOperationsTest.php
+++ b/tests/functional/TimeSeriesOperationsTest.php
@@ -116,7 +116,6 @@ class TimeSeriesOperationsTest extends TestCase
{
$row = static::generateRow(true);
$row[2] = (new Riak\TimeSeries\Cell("time"))->setTimestampValue(static::threeHoursAgo());
- $b64 = base64_encode($row[7]->getValue());
$command = (new Command\Builder\TimeSeries\StoreRows(static::$riak))
->inTable(static::$table)
@@ -137,7 +136,12 @@ class TimeSeriesOperationsTest extends TestCase
$this->assertEquals('200', $response->getCode(), $response->getMessage());
$this->assertCount(8, $response->getRow());
- $this->assertEquals($b64, $response->getRow()['blob_field']);
+ if (getenv('PB_INTERFACE')) {
+ $this->assertEquals($row[7]->getValue(), $response->getRow()[7]->getValue());
+ } else {
+ $b64 = base64_encode($row[7]->getValue());
+ $this->assertEquals($b64, $response->getRow()['blob_field']);
+ }
}
public function testFetchRow()
|
Handle PB / HTTP responses separately.
|
diff --git a/lib/cliff.js b/lib/cliff.js
index <HASH>..<HASH> 100644
--- a/lib/cliff.js
+++ b/lib/cliff.js
@@ -97,7 +97,7 @@ cliff.stringifyRows = function (rows, colors) {
for (i = 0; i < row.length; i += 1) {
item = cliff.stringifyLiteral(row[i]);
item = colorize ? item[colors[i]] : item;
- length = real_length(item);
+ length = realLength(item);
padding = length < lengths[i] ? lengths[i] - length + 2 : 2;
rowtext += item + new Array(padding).join(' ');
}
@@ -242,14 +242,14 @@ cliff.typeOf = function typeOf (value) {
return s;
}
-var real_length = function (str) {
+var realLength = function (str) {
return ("" + str).replace(/\u001b\[\d+m/g,'').length;
}
var longestElement = function (a) {
var l = 0;
for (var i = 0; i < a.length; i++) {
- var new_l = real_length(a[i]);
+ var new_l = realLength(a[i]);
if (l < new_l) {
l = new_l;
}
|
[minor] fixed some style issues
|
diff --git a/src/Illuminate/Database/Eloquent/Model.php b/src/Illuminate/Database/Eloquent/Model.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Database/Eloquent/Model.php
+++ b/src/Illuminate/Database/Eloquent/Model.php
@@ -435,6 +435,20 @@ abstract class Model implements Arrayable, ArrayAccess, HasBroadcastChannel, Jso
}
/**
+ * Qualify the column's lists name by the model's table.
+ *
+ * @param array|mixed $columns
+ * @return array
+ */
+ public function qualifyColumns(...$columns) {
+ $qualifiedArray = [];
+ foreach($columns as $column) {
+ $qualifiedArray[] = $this->qualifyColumn($column);
+ }
+ return $qualifiedArray;
+ }
+
+ /**
* Create a new instance of the given model.
*
* @param array $attributes
|
Define qualifyColumns method
|
diff --git a/node-perf-dash/www/controller/index.js b/node-perf-dash/www/controller/index.js
index <HASH>..<HASH> 100644
--- a/node-perf-dash/www/controller/index.js
+++ b/node-perf-dash/www/controller/index.js
@@ -71,7 +71,7 @@ var plotRules = {
// Rules to parse test options
var testOptions = {
'density': {
- options: ['opertation', 'mode', 'pods', 'background pods', 'interval (ms)', 'QPS'],
+ options: ['operation', 'mode', 'pods', 'background pods', 'interval (ms)', 'QPS'],
remark: '',
},
'resource': {
|
Fix typo: oper(t)ation
|
diff --git a/lib/Cpdf.php b/lib/Cpdf.php
index <HASH>..<HASH> 100644
--- a/lib/Cpdf.php
+++ b/lib/Cpdf.php
@@ -15,6 +15,9 @@
* @license Public Domain http://creativecommons.org/licenses/publicdomain/
* @package Cpdf
*/
+use FontLib\Font;
+use FontLib\Binary_Stream;
+
class Cpdf {
/**
@@ -2358,7 +2361,7 @@ EOT;
// Write new font
$tmp_name = "$fbfile.tmp.".uniqid();
- $font_obj->open($tmp_name, Font_Binary_Stream::modeWrite);
+ $font_obj->open($tmp_name, Binary_Stream::modeWrite);
$font_obj->encode(array("OS/2"));
$font_obj->close();
|
Update CPDF to work with php-font-lib v3
|
diff --git a/sum/checks.go b/sum/checks.go
index <HASH>..<HASH> 100644
--- a/sum/checks.go
+++ b/sum/checks.go
@@ -53,3 +53,17 @@ func (c Checks) Get(id string) *Check {
}
return nil
}
+
+func (c Checks) Versions() []tarsum.Version {
+ versionsMap := map[tarsum.Version]int{}
+ for _, check := range c {
+ if _, ok := versionsMap[check.Version]; !ok {
+ versionsMap[check.Version] = 0
+ }
+ }
+ versions := []tarsum.Version{}
+ for k := range versionsMap {
+ versions = append(versions, k)
+ }
+ return versions
+}
|
Convenience access for versions in checks
for a group of sum checks, expose a function that provides all the
tarsum.Version's present.
|
diff --git a/cheroot/server.py b/cheroot/server.py
index <HASH>..<HASH> 100644
--- a/cheroot/server.py
+++ b/cheroot/server.py
@@ -1602,6 +1602,7 @@ class HTTPServer(object):
pass
self.socket.bind(self.bind_addr)
+ self.bind_addr = self.socket.getsockname()[:2] # TODO: keep separate
def tick(self):
"""Accept a new connection and put it on the Queue."""
|
Hotfix saving actual bound addr for ephemeral port
While this workaround would work, I'd prefer keeping both requested
and actual bind addrs within the server object, which might need bits
of redesign.
|
diff --git a/input/observable.js b/input/observable.js
index <HASH>..<HASH> 100644
--- a/input/observable.js
+++ b/input/observable.js
@@ -114,8 +114,8 @@ Object.defineProperties(PropObserv.prototype, {
dom.classList.add('dbjs-input-component');
// Required
- dom.classList[desc.required ? 'add' : 'remove']('required');
- dom.classList[desc.required ? 'remove' : 'add']('optional');
+ dom.classList[desc.required ? 'add' : 'remove']('dbjs-required');
+ dom.classList[desc.required ? 'remove' : 'add']('dbjs-optional');
// Changed
input.on('change:changed', cb = function (value) {
|
Rename 'required' class, up to 'dbjs-required'
|
diff --git a/lavalink/websocket.py b/lavalink/websocket.py
index <HASH>..<HASH> 100644
--- a/lavalink/websocket.py
+++ b/lavalink/websocket.py
@@ -24,7 +24,7 @@ class WebSocket:
self._shards = self._node._lavalink._shard_count
self._user_id = self._node._lavalink._user_id
- self._loop = self._lavalink.loop
+ self._loop = self._node._lavalink._loop
self._loop.create_task(self.connect()) # TODO: Consider making add_node an async function to prevent creating a bunch of tasks?
@property
|
naniware doesn't exist smfh
|
diff --git a/guacamole-common-js/src/main/resources/guacamole.js b/guacamole-common-js/src/main/resources/guacamole.js
index <HASH>..<HASH> 100644
--- a/guacamole-common-js/src/main/resources/guacamole.js
+++ b/guacamole-common-js/src/main/resources/guacamole.js
@@ -439,10 +439,10 @@ Guacamole.Client = function(tunnel) {
var channelMask = parseInt(parameters[0]);
var layer = getLayer(parseInt(parameters[1]));
- var r = getLayer(parseInt(parameters[2]));
- var g = getLayer(parseInt(parameters[3]));
- var b = getLayer(parseInt(parameters[4]));
- var a = getLayer(parseInt(parameters[5]));
+ var r = parseInt(parameters[2]);
+ var g = parseInt(parameters[3]);
+ var b = parseInt(parameters[4]);
+ var a = parseInt(parameters[5]);
layer.setChannelMask(channelMask);
|
Accidentally used getLayer() in RGBA component ints.
|
diff --git a/lib/rrschedule.rb b/lib/rrschedule.rb
index <HASH>..<HASH> 100644
--- a/lib/rrschedule.rb
+++ b/lib/rrschedule.rb
@@ -40,7 +40,9 @@ module RRSchedule
team_b = t.reverse!.shift
t.reverse!
- matchup = {:team_a => team_a, :team_b => team_b}
+
+ x = [team_a,team_b].shuffle
+ matchup = {:team_a => x[0], :team_b => x[1]}
games << matchup
end
#done processing round
@@ -205,12 +207,12 @@ module RRSchedule
if @cur_rule_index < @rules.size-1
last_rule=@cur_rule
@cur_rule_index += 1
- @cur_rule = @rules[@cur_rule_index]
+ @cur_rule = @rules[@cur_rule_index]
#Go to the next date (except if the new rule is for the same weekday)
@cur_date = next_game_date(@cur_date+=1,@cur_rule.wday) if last_rule.wday != @cur_rule.wday
else
@cur_rule_index = 0
- @cur_rule = @rules[@cur_rule_index]
+ @cur_rule = @rules[@cur_rule_index]
@cur_date = next_game_date(@cur_date+=1,@cur_rule.wday)
end
@gt_stack = @cur_rule.gt.clone; @cur_gt = @gt_stack.shift
|
randomize team_a and team_b for each matchup. That way it's not always the same team that is 'home' or 'away'
|
diff --git a/src/Qcloud/Cos/Client.php b/src/Qcloud/Cos/Client.php
index <HASH>..<HASH> 100644
--- a/src/Qcloud/Cos/Client.php
+++ b/src/Qcloud/Cos/Client.php
@@ -22,7 +22,7 @@ use GuzzleHttp\Pool;
class Client extends GuzzleClient {
- const VERSION = '2.0.2';
+ const VERSION = '2.0.3';
private $httpCilent;
private $api;
@@ -252,12 +252,16 @@ class Client extends GuzzleClient {
return False;
}
}
-
+
public static function explodeKey($key) {
+
// Remove a leading slash if one is found
$split_key = explode('/', $key && $key[0] == '/' ? substr($key, 1) : $key);
// Remove empty element
- $split_key = array_filter($split_key);
+
+ $split_key = array_filter($split_key, function($var) {
+ return !($var == '' || $var == null);
+ });
return implode("/", $split_key);
}
|
update Client (#<I>)
|
diff --git a/lib/bummr/outdated.rb b/lib/bummr/outdated.rb
index <HASH>..<HASH> 100644
--- a/lib/bummr/outdated.rb
+++ b/lib/bummr/outdated.rb
@@ -1,5 +1,6 @@
require 'open3'
require 'singleton'
+require 'bundler'
module Bummr
class Outdated
|
Explicity require bundler to detect its version
|
diff --git a/spec/tester_spec.rb b/spec/tester_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/tester_spec.rb
+++ b/spec/tester_spec.rb
@@ -50,7 +50,7 @@ describe Zxcvbn::Tester do
context 'nil password' do
specify do
- expect { tester.test(nil) }.to_not raise_error
+ expect(tester.test(nil)).to have_attributes(entropy: 0, score: 0, crack_time: 0)
end
end
-end
\ No newline at end of file
+end
|
Tell us how it *is* expected to behave
|
diff --git a/src/components/picker/index.js b/src/components/picker/index.js
index <HASH>..<HASH> 100644
--- a/src/components/picker/index.js
+++ b/src/components/picker/index.js
@@ -61,6 +61,10 @@ class Picker extends TextInput {
*/
renderPicker: PropTypes.func,
/**
+ * Custom picker props (when using renderPicker, will apply on the button wrapper)
+ */
+ customPickerProps: PropTypes.object,
+ /**
* Add onPress callback for when pressing the picker
*/
onPress: PropTypes.func,
@@ -280,7 +284,7 @@ class Picker extends TextInput {
}
render() {
- const {useNativePicker, renderPicker, testID} = this.props;
+ const {useNativePicker, renderPicker, customPickerProps, testID} = this.props;
if (useNativePicker) return <NativePicker {...this.props} />;
@@ -288,7 +292,7 @@ class Picker extends TextInput {
const {value} = this.state;
return (
<View left>
- <Button link onPress={this.handlePickerOnPress} testID={testID}>
+ <Button {...customPickerProps} link onPress={this.handlePickerOnPress} testID={testID} style={{borderWidth: 1}}>
{renderPicker(value)}
</Button>
{this.renderExpandableModal()}
|
add customPickerProps prop to allow control the custom picker wrapper
|
diff --git a/src/User/User.php b/src/User/User.php
index <HASH>..<HASH> 100644
--- a/src/User/User.php
+++ b/src/User/User.php
@@ -282,7 +282,7 @@ class User extends \Hubzero\Database\Relational
*/
public function tokens()
{
- return $this->oneToMany('Hubzero\User\Token');
+ return $this->oneToMany('Hubzero\User\Token', 'user_id');
}
/**
@@ -293,7 +293,7 @@ class User extends \Hubzero\Database\Relational
*/
public function reputation()
{
- return $this->oneToOne('Hubzero\User\Reputation');
+ return $this->oneToOne('Hubzero\User\Reputation', 'user_id');
}
/**
|
Be explicit on foreign key name, in case class is being extended (#<I>)
|
diff --git a/lib/weblib.php b/lib/weblib.php
index <HASH>..<HASH> 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -503,14 +503,6 @@ class moodle_url {
*/
public function compare(moodle_url $url, $matchtype = URL_MATCH_EXACT) {
- // Set path to / if it is not set
- if ($this->path == '') {
- $this->path = '/';
- }
- if ($url->path == '') {
- $url->path = '/';
- }
-
$baseself = $this->out(true);
$baseother = $url->out(true);
|
navigation MDL-<I> Fixed regression created earlier
|
diff --git a/molgenis-data-annotators/src/main/java/org/molgenis/data/annotation/CrudRepositoryAnnotator.java b/molgenis-data-annotators/src/main/java/org/molgenis/data/annotation/CrudRepositoryAnnotator.java
index <HASH>..<HASH> 100644
--- a/molgenis-data-annotators/src/main/java/org/molgenis/data/annotation/CrudRepositoryAnnotator.java
+++ b/molgenis-data-annotators/src/main/java/org/molgenis/data/annotation/CrudRepositoryAnnotator.java
@@ -117,8 +117,8 @@ public class CrudRepositoryAnnotator
{
if (createCopy)
{
- DefaultEntityMetaData newEntityMetaData = new DefaultEntityMetaData(
- RandomStringUtils.randomAlphanumeric(30), entityMetaData);
+ DefaultEntityMetaData newEntityMetaData = new DefaultEntityMetaData(RandomStringUtils.randomAlphabetic(30),
+ entityMetaData);
if (newEntityMetaData.getAttribute(compoundAttributeMetaData.getName()) == null)
{
newEntityMetaData.addAttributeMetaData(compoundAttributeMetaData);
|
User alphabetic id's
|
diff --git a/openquake/calculators/export/loss_curves.py b/openquake/calculators/export/loss_curves.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/export/loss_curves.py
+++ b/openquake/calculators/export/loss_curves.py
@@ -21,7 +21,22 @@ from openquake.commonlib import writers
class LossCurveExporter(object):
"""
- Abstract Base Class with common methods for its subclasses
+ Exporter for the loss curves. The most importante method is
+ `.export(export_type, what)` where `export_type` is a string like 'csv',
+ and `what` is a string called export specifier. Here are some examples
+ for the export specifier:
+
+ sid-42/ # export loss curves of site #42 for all realizations
+ sid-42/rlz-003 # export all loss curves of site #42, realization #3
+ sid-42/stats # export statistical loss curves of site #42
+ sid-42/mean # export mean loss curves of site #42
+ sid-42/quantile-0.1 # export quantile loss curves of site #42
+
+ ref-a1/ # export loss curves of asset a1 for all realizations
+ ref-a1/rlz-003 # export loss curves of asset a1, realization 3
+ ref-a1/stats # export statistical loss curves of asset a1
+ ref-a1/mean # export mean loss curves of asset a1
+ ref-a1/quantile-0.1 # export quantile loss curves of asset a1
"""
def __init__(self, dstore):
self.dstore = dstore
|
Added a docstring [skip CI]
Former-commit-id: a5ad1d8eec<I>b<I>fa<I>b<I>e<I>aefea6ebd<I>b
|
diff --git a/unittests/autoconfig.py b/unittests/autoconfig.py
index <HASH>..<HASH> 100644
--- a/unittests/autoconfig.py
+++ b/unittests/autoconfig.py
@@ -8,6 +8,9 @@ import sys
import logging
import warnings
+# Prevents copy.deepcopy RecursionError in some tests (Travis build)
+sys.setrecursionlimit(10000)
+
this_module_dir_path = os.path.abspath(
os.path.dirname(sys.modules[__name__].__file__))
|
Increase recursion limit for python, needed to fix travis build error
Three tests are failing in declarations_comparison_tester with:
RecursionError: maximum recursion depth exceeded
This is an attempt to fix it, it is not sure it will help.
|
diff --git a/tpb/tpb.py b/tpb/tpb.py
index <HASH>..<HASH> 100644
--- a/tpb/tpb.py
+++ b/tpb/tpb.py
@@ -18,12 +18,7 @@ import re
import sys
import time
-from bs4 import BeautifulSoup
-
-from utils import URL
-#from constants import CATEGORIES
-#from constants import ORDERS
-from constants import *
+from .utils import URL
if sys.version_info >= (3, 0):
from urllib.request import urlopen
|
Fixed imports and restored .gitignore.
|
diff --git a/src/requirementslib/models/cache.py b/src/requirementslib/models/cache.py
index <HASH>..<HASH> 100644
--- a/src/requirementslib/models/cache.py
+++ b/src/requirementslib/models/cache.py
@@ -63,13 +63,11 @@ class DependencyCache(object):
def __init__(self, cache_dir=None):
if cache_dir is None:
cache_dir = CACHE_DIR
- if not vistir.compat.Path(CACHE_DIR).is_dir():
+ if not vistir.compat.Path(CACHE_DIR).absolute().is_dir():
try:
- _ensure_dir(cache_dir)
- except OSError:
- if os.path.isdir(os.path.abspath(cache_dir)):
- pass
- raise
+ vistir.path.mkdir_p(os.path.abspath(cache_dir))
+ except FileExistsError:
+ pass
py_version = '.'.join(str(digit) for digit in sys.version_info[:2])
cache_filename = 'depcache-py{}.json'.format(py_version)
|
wtf is going on with appveyor...
|
diff --git a/lib/trusty_cms/setup.rb b/lib/trusty_cms/setup.rb
index <HASH>..<HASH> 100644
--- a/lib/trusty_cms/setup.rb
+++ b/lib/trusty_cms/setup.rb
@@ -91,7 +91,7 @@ module TrustyCms
def prompt_for_admin_name
username = ask('Name (Administrator): ', String) do |q|
q.validate = /^.{0,100}$/
- q.responses[:not_valid] = "Invalid name. Must be at less than 100 characters long."
+ q.responses[:not_valid] = "Invalid name. Must be under 100 characters long."
q.whitespace = :strip
end
username = "Administrator" if username.blank?
@@ -109,13 +109,14 @@ module TrustyCms
end
def prompt_for_admin_password
- password = ask('Password (radiant): ', String) do |q|
+ default_password = 'trusty'
+ password = ask("Password (#{default_password}): ", String) do |q|
q.echo = false unless defined?(::JRuby) # JRuby doesn't support stty interaction
q.validate = /^(|.{5,40})$/
q.responses[:not_valid] = "Invalid password. Must be at least 5 characters long."
q.whitespace = :strip
end
- password = "radiant" if password.blank?
+ password = default_password if password.blank?
password
end
|
Let's make the default admin password trusty while we're at it :)
|
diff --git a/saltcloud/cloud.py b/saltcloud/cloud.py
index <HASH>..<HASH> 100644
--- a/saltcloud/cloud.py
+++ b/saltcloud/cloud.py
@@ -6,6 +6,7 @@ correct cloud modules
import os
import glob
import time
+import signal
import logging
import tempfile
import multiprocessing
@@ -204,10 +205,25 @@ class Cloud(object):
})
output = {}
- parallel_pmap = multiprocessing.Pool(len(providers)).map(
- func=run_paralel_map_providers_query,
- iterable=multiprocessing_data
+ providers_count = len(providers)
+ pool = multiprocessing.Pool(
+ providers_count < 10 and providers_count or 10,
+ init_pool_worker
)
+ try:
+ parallel_pmap = pool.map(
+ func=run_paralel_map_providers_query,
+ iterable=multiprocessing_data
+ )
+ except KeyboardInterrupt:
+ print 'Caught KeyboardInterrupt, terminating workers'
+ pool.terminate()
+ pool.join()
+ raise SaltCloudSystemExit('Keyboard Interrupt caught')
+ else:
+ pool.close()
+ pool.join()
+
for obj in parallel_pmap:
output.update(obj)
return output
@@ -1079,6 +1095,14 @@ class Map(Cloud):
return output
+def init_pool_worker():
+ '''
+ Make every worker ignore KeyboarInterrup's since it will be handled by the
+ parent process.
+ '''
+ signal.signal(signal.SIGINT, signal.SIG_IGN)
+
+
def create_multiprocessing(parallel_data):
'''
This function will be called from another process when running a map in
|
Properly handle keyboard interrupts when parallel loading providers.
|
diff --git a/src/Field/Configurator/CommonPreConfigurator.php b/src/Field/Configurator/CommonPreConfigurator.php
index <HASH>..<HASH> 100644
--- a/src/Field/Configurator/CommonPreConfigurator.php
+++ b/src/Field/Configurator/CommonPreConfigurator.php
@@ -104,7 +104,9 @@ final class CommonPreConfigurator implements FieldConfiguratorInterface
{
// don't autogenerate a label for these special fields (there's a dedicated configurator for them)
if (FormField::class === $field->getFieldFqcn()) {
- return $field->getLabel();
+ $label = $field->getLabel();
+
+ return null === $label ? $label: $this->translator->trans($label, $field->getTranslationParameters(), $translationDomain);
}
// if an Avatar field doesn't define its label, don't autogenerate it for the 'index' page
|
Translate the (optional) label of form panels
|
diff --git a/Twilio/Stream.php b/Twilio/Stream.php
index <HASH>..<HASH> 100644
--- a/Twilio/Stream.php
+++ b/Twilio/Stream.php
@@ -10,11 +10,11 @@ class Stream implements \Iterator {
function __construct(Page $page, $limit, $pageLimit) {
$this->page = $page;
+ $this->firstPage = $page;
$this->limit = $limit;
$this->currentRecord = 1;
$this->pageLimit = $pageLimit;
$this->currentPage = 1;
- $this->started = false;
}
/**
@@ -76,12 +76,11 @@ class Stream implements \Iterator {
* Rewind the Iterator to the first element
* @link http://php.net/manual/en/iterator.rewind.php
* @return void Any returned value is ignored.
- * @throws TwilioException on restart
*/
public function rewind() {
- if ($this->started) {
- throw new TwilioException('Streams can not be restarted');
- }
+ $this->page = $this->firstPage;
+ $this->currentPage = 1;
+ $this->currentRecord = 1;
}
protected function overLimit() {
|
Implement Stream rewind properly in PHP
|
diff --git a/salt/netapi/rest_cherrypy/app.py b/salt/netapi/rest_cherrypy/app.py
index <HASH>..<HASH> 100644
--- a/salt/netapi/rest_cherrypy/app.py
+++ b/salt/netapi/rest_cherrypy/app.py
@@ -508,8 +508,10 @@ def lowdata_fmt():
data = cherrypy.request.unserialized_data
- if (cherrypy.request.headers['Content-Type']
- == 'application/x-www-form-urlencoded'):
+ # if the data was sent as urlencoded, we need to make it a list.
+ # this is a very forgiving implementation as different clients set different
+ # headers for form encoded data (including charset or something similar)
+ if not isinstance(data, list):
# Make the 'arg' param a list if not already
if 'arg' in data and not isinstance(data['arg'], list):
data['arg'] = [data['arg']]
|
Fix regression in url encoded salt-api messages
Most clients that do url encoding include other data in the Content-Type field (requests for example sets "application/x-www-form-urlencoded; charset=utf-8"). This changes the api to be a more forgiving server which will make any non-list struct a list
|
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
|
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
|
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
|
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
|
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!
|
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
|
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
|
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>)
|
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.
|
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
|
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(....)
|
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
|
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
|
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
|
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>)
|
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
|
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.
|
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.
|
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
|
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.
|
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
|
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
|
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 :)
|
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
|
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
|
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
|
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>.
|
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.
|
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>.
|
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
|
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
|
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
|
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.
|
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
|
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
|
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.
|
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.
|
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>
|
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
|
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
|
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
|
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.
|
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
|
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>)
|
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)
|
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
|
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
|
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
|
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.
|
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
|
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>
|
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.
|
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>
|
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
|
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
|
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>)
|
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
|
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
|
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"> </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
|
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
|
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.
|
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
|
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
|
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
|
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
|
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
|
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
|
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>)
|
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
|
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
|
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
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.