diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/branch_io_cli/configuration/configuration.rb b/lib/branch_io_cli/configuration/configuration.rb
index <HASH>..<HASH> 100644
--- a/lib/branch_io_cli/configuration/configuration.rb
+++ b/lib/branch_io_cli/configuration/configuration.rb
@@ -359,7 +359,7 @@ EOF
return @branch_imports if @branch_imports
source_files = target.source_build_phase.files.map { |f| f.file_ref.real_path.to_s }
- source_files << bridging_header_path if bridging_header_path
+ source_files << bridging_header_path if bridging_header_path && File.exist?(bridging_header_path)
@branch_imports = source_files.compact.map do |f|
imports = branch_imports_from_file f
next {} if imports.empty?
@@ -377,6 +377,10 @@ EOF
imports << "#{line_no}: #{line.chomp}"
end
imports
+ rescue StandardError
+ # Quietly ignore anything that can't be opened for now.
+ # TODO: Get these errors into report output.
+ []
end
def method_missing(method_sym, *arguments, &block)
|
Better handling of source files that cannot be opened. (Usually from an unresolved setting like PROJECT_DIR/PROJECT_NAME/Bridging-Header.h)
|
diff --git a/src/components/storage/storage__local.js b/src/components/storage/storage__local.js
index <HASH>..<HASH> 100644
--- a/src/components/storage/storage__local.js
+++ b/src/components/storage/storage__local.js
@@ -7,8 +7,8 @@ var safePromise = function (resolver) {
otherwise(function (e) {
if (e && e.name === 'NS_ERROR_FILE_CORRUPTED') {
window.alert('Sorry, it looks like your browser storage has been corrupted. ' +
- 'Please clear your storage by going to Tools -> Clear Recent History -> Cookies' +
- ' and set time range to "Everything". This will remove the corrupted browser storage across all sites.');
+ 'Please clear your storage by going to Tools -> Clear Recent History -> Cookies' +
+ ' and set time range to "Everything". This will remove the corrupted browser storage across all sites.');
}
return when.reject(e);
});
@@ -75,8 +75,8 @@ LocalStorage.prototype.each = function (callback) {
value = localStorage.getItem(item);
promises.push(
when.attempt(JSON.parse, value).
- orElse(value).
- fold(callback, item)
+ orElse(value).
+ fold(callback, item)
);
}
}
|
RG-<I> Storage: don't expect that everything in localStorage is json: indent
Former-commit-id: 0e<I>f<I>d1fec<I>f5d<I>df0bafbb6a4d4
|
diff --git a/lib/zendesk_apps_support/validations/translations.rb b/lib/zendesk_apps_support/validations/translations.rb
index <HASH>..<HASH> 100644
--- a/lib/zendesk_apps_support/validations/translations.rb
+++ b/lib/zendesk_apps_support/validations/translations.rb
@@ -49,7 +49,7 @@ module ZendeskAppsSupport
end
def required_keys(file)
- return if file.relative_path != 'translations/en.json' || JSON.parse(file.read)['app']['name']
+ return if file.relative_path != 'translations/en.json' || JSON.parse(file.read).dig('app', 'name')
ValidationError.new('translation.missing_required_key',
file: file.relative_path,
|
fix error caused by unsafe hash check
|
diff --git a/karma.conf.js b/karma.conf.js
index <HASH>..<HASH> 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -33,7 +33,7 @@ module.exports = function(config) {
// test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
- reporters: ['progress'],
+ reporters: ['dots'],
// web server port
port: 9876,
|
Progress reporter is too noisy on TravisCI. Use dots reporter instead.
|
diff --git a/dispatch/static/manager/src/js/api/dispatch.js b/dispatch/static/manager/src/js/api/dispatch.js
index <HASH>..<HASH> 100644
--- a/dispatch/static/manager/src/js/api/dispatch.js
+++ b/dispatch/static/manager/src/js/api/dispatch.js
@@ -1,7 +1,7 @@
import fetch from 'isomorphic-fetch'
import url from 'url'
-const API_URL = 'http://localhost:8000/api/'
+const API_URL = 'http://192.168.56.101:80/api/'
const DEFAULT_HEADERS = {
'Content-Type': 'application/json'
|
also revert redux devtools stuff
|
diff --git a/config/ember-try.js b/config/ember-try.js
index <HASH>..<HASH> 100644
--- a/config/ember-try.js
+++ b/config/ember-try.js
@@ -75,8 +75,9 @@ module.exports = async function () {
},
},
},
- embroiderSafe(),
- embroiderOptimized(),
+ // Remove Embroider builds for now as there are compat issues
+ // embroiderSafe(),
+ // embroiderOptimized(),
],
};
};
|
Remove Embroider compatibility builds from Ember Try config
|
diff --git a/src/Validators/ConstRangeValidator.php b/src/Validators/ConstRangeValidator.php
index <HASH>..<HASH> 100644
--- a/src/Validators/ConstRangeValidator.php
+++ b/src/Validators/ConstRangeValidator.php
@@ -34,6 +34,11 @@ class ConstRangeValidator extends RangeValidator
*/
public $targetClass;
+ /**
+ * @var callable
+ */
+ public $filter;
+
public static $ranges = [];
/**
@@ -70,6 +75,18 @@ class ConstRangeValidator extends RangeValidator
}
/**
+ * @param mixed $value
+ * @return array|null
+ */
+ protected function validateValue($value)
+ {
+ if (is_callable($this->filter)) {
+ $value = call_user_func($this->filter, $value);
+ }
+ return parent::validateValue($value);
+ }
+
+ /**
* @inheritdoc
*/
public function validateAttribute($model, $attribute)
|
Add filter to ConstRangeValidator
|
diff --git a/lib/node-progress.js b/lib/node-progress.js
index <HASH>..<HASH> 100644
--- a/lib/node-progress.js
+++ b/lib/node-progress.js
@@ -88,6 +88,14 @@ ProgressBar.prototype.tick = function(len, tokens){
this.render(tokens);
};
+/**
+ * Method to render the progress bar with optional `tokens` to
+ * place in the progress bar's `fmt` field.
+ *
+ * @param {Object} tokens
+ * @api public
+ */
+
ProgressBar.prototype.render = function(tokens){
var percent = this.curr / this.total * 100
, complete = Math.round(this.width * (this.curr / this.total))
|
Added JSDoc for render method
|
diff --git a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSpellerRule.java b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSpellerRule.java
index <HASH>..<HASH> 100644
--- a/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSpellerRule.java
+++ b/languagetool-language-modules/de/src/main/java/org/languagetool/rules/de/GermanSpellerRule.java
@@ -92,7 +92,7 @@ public class GermanSpellerRule extends CompoundAwareHunspellRule {
put("Thanks", "Danke");
put("Allalei", "Allerlei");
put("geupdate[dt]$", "upgedatet");
- put("gefaked", "gefakt");
+ //put("gefaked", "gefakt"); -- don't suggest
put("[pP]roblemhaft(e[nmrs]?)?", w -> Arrays.asList(w.replaceFirst("haft", "behaftet"), w.replaceFirst("haft", "atisch")));
put("rosane[mnrs]?$", w -> Arrays.asList("rosa", w.replaceFirst("^rosan", "rosafarben")));
put("Erbung", w -> Arrays.asList("Vererbung", "Erbschaft"));
|
[de] don't suggest ugly form "gefakt" (even though technically correct)
|
diff --git a/pyowm/parsers/jsonparser.py b/pyowm/parsers/jsonparser.py
index <HASH>..<HASH> 100644
--- a/pyowm/parsers/jsonparser.py
+++ b/pyowm/parsers/jsonparser.py
@@ -100,7 +100,10 @@ def build_weather_from(d):
humidity = 0
# -- snow is not a mandatory field
if 'snow' in d:
- snow = d['snow'].copy()
+ if isinstance(d['snow'], int) or isinstance(d['snow'], float):
+ snow = {'all': d['snow']}
+ else:
+ snow = d['snow'].copy()
else:
snow = {}
# -- pressure
|
Fixed bug: snow item in JSON daily weather forecasts was treated as a dict while it could have been also a float
|
diff --git a/assess_autoload_credentials.py b/assess_autoload_credentials.py
index <HASH>..<HASH> 100755
--- a/assess_autoload_credentials.py
+++ b/assess_autoload_credentials.py
@@ -439,9 +439,9 @@ def write_openstack_config_file(tmp_dir, user, credential_details):
def ensure_openstack_personal_cloud_exists(client):
- if client.env.juju_home.endswith('/cloud-city'):
- raise ValueError(
- 'JUJU_HOME is wrongly set to: {}'.format(client.env.juju_home))
+ juju_home = client.env.juju_home
+ if not juju_home.startswith('/tmp'):
+ raise ValueError('JUJU_HOME is wrongly set to: {}'.format(juju_home))
if client.env.clouds['clouds']:
cloud_name = client.env.get_cloud()
regions = client.env.clouds['clouds'][cloud_name]['regions']
@@ -456,7 +456,7 @@ def ensure_openstack_personal_cloud_exists(client):
}
}
client.env.clouds['clouds'] = os_cloud
- client.env.dump_yaml(client.env.juju_home, config=None)
+ client.env.dump_yaml(juju_home, config=None)
def get_openstack_expected_details_dict(user, credential_details):
|
Improve sanity check for writing clouds.yaml.
|
diff --git a/lib/committee/test/methods.rb b/lib/committee/test/methods.rb
index <HASH>..<HASH> 100644
--- a/lib/committee/test/methods.rb
+++ b/lib/committee/test/methods.rb
@@ -1,9 +1,5 @@
module Committee::Test
module Methods
- def self.included(klass)
- klass.send(:include, Rack::Test::Methods)
- end
-
def assert_schema_conform
assert_schema_content_type
|
Less magic; require an explicit inclusion of `Rack::Test::Methods`
|
diff --git a/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheService.java b/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheService.java
index <HASH>..<HASH> 100644
--- a/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheService.java
+++ b/hazelcast/src/main/java/com/hazelcast/cache/impl/AbstractCacheService.java
@@ -330,7 +330,7 @@ public abstract class AbstractCacheService implements ICacheService, PreJoinAwar
closeSegments(cacheNameWithPrefix);
}
- final WanReplicationService wanService = nodeEngine.getService(WanReplicationService.SERVICE_NAME);
+ WanReplicationService wanService = nodeEngine.getWanReplicationService();
wanService.removeWanEventCounters(ICacheService.SERVICE_NAME, cacheNameWithPrefix);
cacheContexts.remove(cacheNameWithPrefix);
operationProviderCache.remove(cacheNameWithPrefix);
|
Acquire WanReplicationService from NodeEngine while deleting cache
The same cache deletion mechanism is used during node shutdown too,
and acquiring `WanReplicationService` can fail in that case.
|
diff --git a/wallace/db/base/attrs/datatypes.py b/wallace/db/base/attrs/datatypes.py
index <HASH>..<HASH> 100644
--- a/wallace/db/base/attrs/datatypes.py
+++ b/wallace/db/base/attrs/datatypes.py
@@ -81,10 +81,14 @@ class UUID(String):
is_uuid,
)
- def __set__(self, inst, val):
+ @classmethod
+ def typecast(cls, val):
if isinstance(val, uuid.UUID):
val = val.hex
- super(UUID, self).__set__(inst, val)
+ else:
+ val = uuid.UUID(val).hex
+
+ return super(UUID, cls).typecast(val)
class UUID4(UUID):
|
fix typecasting for UUID types
|
diff --git a/lib/ProMotion/classes/Screen.rb b/lib/ProMotion/classes/Screen.rb
index <HASH>..<HASH> 100644
--- a/lib/ProMotion/classes/Screen.rb
+++ b/lib/ProMotion/classes/Screen.rb
@@ -195,6 +195,7 @@ module ProMotion
end
def view_will_appear(animated)
+ self.will_appear if self.respond_to? :will_appear
end
def view_did_appear(animated)
|
Added will_appear method.
|
diff --git a/src/sortablejs.js b/src/sortablejs.js
index <HASH>..<HASH> 100644
--- a/src/sortablejs.js
+++ b/src/sortablejs.js
@@ -91,7 +91,7 @@ function init(Survey) {
};
var getChoicesNotInResults = function () {
var res = [];
- question.activeChoices.forEach(function (choice) {
+ question.visibleChoices.forEach(function (choice) {
if (!hasValueInResults(choice.value)) {
res.push(choice);
}
@@ -104,7 +104,7 @@ function init(Survey) {
if (!Array.isArray(val)) return res;
for (var i = 0; i < val.length; i++) {
var item = Survey.ItemValue.getItemByValue(
- question.activeChoices,
+ question.visibleChoices,
val[i]
);
if (!!item) {
|
Fix #<I> sortableList randomized order not working
|
diff --git a/src/com/opera/core/systems/scope/services/ums/SystemInputManager.java b/src/com/opera/core/systems/scope/services/ums/SystemInputManager.java
index <HASH>..<HASH> 100644
--- a/src/com/opera/core/systems/scope/services/ums/SystemInputManager.java
+++ b/src/com/opera/core/systems/scope/services/ums/SystemInputManager.java
@@ -177,14 +177,13 @@ class ClickDelayer
long currentTime = System.currentTimeMillis();
long doubleClickTime = WatirUtils.getSystemDoubleClickTimeMs();
long timeSinceLastClick = currentTime - lastClickTime;
+ long remainingTime = doubleClickTime - timeSinceLastClick;
- if (timeSinceLastClick < doubleClickTime) {
+ if (remainingTime > 0) {
logger.fine(String.format("Delaying click in order to avoid double-click - check your test (last click was %d ms ago, OS double click timeout is %d ms)", timeSinceLastClick, doubleClickTime));
try {
- long remainingTime = doubleClickTime - timeSinceLastClick;
// 100 ms chosen as a safe value for avoiding the double click, this may need adapting.
- long sleepTime = remainingTime + 100;
- Thread.sleep(sleepTime);
+ Thread.sleep(remainingTime + 100);
}
catch (InterruptedException e) {
logger.warning("*** Delay was interrupted ***");
|
Could refactor this a bit, to get rid of a few unnecessary assignments;
|
diff --git a/src/Connection.php b/src/Connection.php
index <HASH>..<HASH> 100644
--- a/src/Connection.php
+++ b/src/Connection.php
@@ -86,8 +86,7 @@ class Connection implements ConnectionInterface
// Set request options
$this->addOptions([
CURLOPT_URL => $url,
- CURLOPT_POST => false,
- CURLOPT_POSTFIELDS => [],
+ CURLOPT_HTTPGET => true,
]);
return $this->exec();
diff --git a/test/ConnectionTest.php b/test/ConnectionTest.php
index <HASH>..<HASH> 100644
--- a/test/ConnectionTest.php
+++ b/test/ConnectionTest.php
@@ -62,7 +62,7 @@ class ConnectionTest extends PHPUnit_Framework_TestCase
$this->assertEquals("James Average Student", $resp["DisplayName"]);
- $this->assertEquals(0, $connection->getOptions()[CURLOPT_POST]);
+ $this->assertEquals(1, $connection->getOptions()[CURLOPT_HTTPGET]);
}
public function testGetParams()
@@ -74,7 +74,7 @@ class ConnectionTest extends PHPUnit_Framework_TestCase
$this->assertEquals("James Average Student", $resp["DisplayName"]);
- $this->assertEquals(0, $connection->getOptions()[CURLOPT_POST]);
+ $this->assertEquals(1, $connection->getOptions()[CURLOPT_HTTPGET]);
}
public function testPost()
|
Set curl request type to get in get request.
|
diff --git a/tests/frontend/org/voltdb/iv2/TestScoreboard.java b/tests/frontend/org/voltdb/iv2/TestScoreboard.java
index <HASH>..<HASH> 100644
--- a/tests/frontend/org/voltdb/iv2/TestScoreboard.java
+++ b/tests/frontend/org/voltdb/iv2/TestScoreboard.java
@@ -41,9 +41,12 @@ public class TestScoreboard {
}
private CompleteTransactionTask createComp(long txnId, long timestamp) {
+ CompleteTransactionMessage msg = mock(CompleteTransactionMessage.class);
+ when(msg.isRollback()).thenReturn(!MpRestartSequenceGenerator.isForRestart(timestamp));
CompleteTransactionTask task = mock(CompleteTransactionTask.class);
when(task.getMsgTxnId()).thenReturn(txnId);
when(task.getTimestamp()).thenReturn(timestamp);
+ when(task.getCompleteMessage()).thenReturn(msg);
return task;
}
|
ENG-<I>: (#<I>)
Fix unit test after scoreboard uses completionmessage timestamp.
|
diff --git a/errors.go b/errors.go
index <HASH>..<HASH> 100644
--- a/errors.go
+++ b/errors.go
@@ -83,7 +83,7 @@ import (
"github.com/getlantern/context"
"github.com/getlantern/hidden"
"github.com/getlantern/ops"
- "github.com/getlantern/stack"
+ "github.com/go-stack/stack"
)
// Error wraps system and application defined errors in unified structure for
|
switch back to go-stack/stack
|
diff --git a/src/request.php b/src/request.php
index <HASH>..<HASH> 100644
--- a/src/request.php
+++ b/src/request.php
@@ -66,6 +66,23 @@ public static function get_method() {
}
/**
+ * get the http ($_POST) data
+ * mainly useful for data from non-POST requests like PUT/PATCH/DELETE
+ *
+ * @return array a like $_POST
+ */
+public static function get_data() {
+ if (static::get_method() == 'POST') {
+ return $_POST;
+ }
+
+ $data_string = file_get_contents('php://input');
+ parse_str($data_string, $data_array);
+
+ return $data_array;
+}
+
+/**
* get the primary http accepted output format for the current session
*
* @return string the most interesting part of the accept header ..
|
allows to fetch $_POST data for PUT/PATCH/DELETE requests
|
diff --git a/store/tikv/2pc.go b/store/tikv/2pc.go
index <HASH>..<HASH> 100644
--- a/store/tikv/2pc.go
+++ b/store/tikv/2pc.go
@@ -588,8 +588,8 @@ func (c *twoPhaseCommitter) shouldWriteBinlog() bool {
}
// TiKV recommends each RPC packet should be less than ~1MB. We keep each packet's
-// Key+Value size below 4KB.
-const txnCommitBatchSize = 4 * 1024
+// Key+Value size below 16KB.
+const txnCommitBatchSize = 16 * 1024
// batchKeys is a batch of keys in the same region.
type batchKeys struct {
diff --git a/store/tikv/client.go b/store/tikv/client.go
index <HASH>..<HASH> 100644
--- a/store/tikv/client.go
+++ b/store/tikv/client.go
@@ -39,7 +39,7 @@ type Client interface {
}
const (
- maxConnection = 150
+ maxConnection = 200
dialTimeout = 5 * time.Second
writeTimeout = 10 * time.Second
readTimeoutShort = 20 * time.Second // For requests that read/write several key-values.
|
Push more write flow to tikv (#<I>)
|
diff --git a/accordion.js b/accordion.js
index <HASH>..<HASH> 100644
--- a/accordion.js
+++ b/accordion.js
@@ -6,12 +6,18 @@
// we're in a CommonJS environment; otherwise we'll just fail out
if( vui === undefined ) {
if( typeof require === 'function' ) {
- module.exports = vui = require('../../vui');
+ vui = require('../../vui');
} else {
throw new Error('load vui first');
}
}
+ // Export the vui object if we're in a CommonJS environment.
+ // It will already be on the window otherwise
+ if( typeof module === 'object' && typeof module.exports === 'object' ) {
+ module.exports = vui;
+ }
+
$.widget( "vui.vui_accordion", {
options: {},
|
just checking for require isn't necessarily a CommonJS env. could be AMD based
|
diff --git a/lib/actv/version.rb b/lib/actv/version.rb
index <HASH>..<HASH> 100644
--- a/lib/actv/version.rb
+++ b/lib/actv/version.rb
@@ -1,3 +1,3 @@
module ACTV
- VERSION = "1.4.2"
+ VERSION = "1.4.3"
end
|
Bumps patch version to <I>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -131,6 +131,7 @@ var sig = module.exports = function(messenger, opts) {
// initialise the data event name
var dataEvent = (opts || {}).dataEvent || 'data';
var openEvent = (opts || {}).openEvent || 'open';
+ var closeEvent = (opts || {}).closeEvent || 'close';
var writeMethod = (opts || {}).writeMethod || 'write';
var closeMethod = (opts || {}).closeMethod || 'close';
var connected = false;
@@ -169,6 +170,10 @@ var sig = module.exports = function(messenger, opts) {
signaller.emit('open');
signaller.emit('connected');
});
+
+ messenger.on(closeEvent, function() {
+ signaller.emit('disconnected');
+ });
}
function connectToPrimus(url) {
|
Primus close event generates disconnected event, ref #<I>
|
diff --git a/Swat/SwatString.php b/Swat/SwatString.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatString.php
+++ b/Swat/SwatString.php
@@ -1089,13 +1089,8 @@ class SwatString extends SwatObject
*/
public static function hash($string)
{
- $hash = md5($string);
-
- $string = '';
- for ($i = 0; $i < strlen($hash) / 2; $i++)
- $string .= chr(hexdec(substr($hash, $i * 2, 2)));
-
- $hash = base64_encode($string);
+ $hash = md5($string, true);
+ $hash = base64_encode($hash);
// remove padding characters
$hash = str_replace('=', '', $hash);
|
This is over <I> times faster in KCacheGrind profiles and does the same thing. For widgets that use a lot of serialized values (SwatDateEntry for example) this used to add up to about <I>% of the overhead of using Swat. Kudos to Mark PK for noticing this.
svn commit r<I>
|
diff --git a/lib/specinfra/command/openbsd.rb b/lib/specinfra/command/openbsd.rb
index <HASH>..<HASH> 100644
--- a/lib/specinfra/command/openbsd.rb
+++ b/lib/specinfra/command/openbsd.rb
@@ -47,11 +47,25 @@ module SpecInfra
"egrep '^#{escape(recipient)}:.*#{escape(target)}' /etc/mail/aliases"
end
+ def check_link(link, target)
+ "stat -f %Y #{escape(link)} | grep -- #{escape(target)}"
+ end
+
def check_mode(file, mode)
regexp = "^#{mode}$"
"stat -f%Lp #{escape(file)} | grep #{escape(regexp)}"
end
+ def check_owner(file, owner)
+ regexp = "^#{owner}$"
+ "stat -f %Su #{escape(file)} | grep -- #{escape(regexp)}"
+ end
+
+ def check_grouped(file, group)
+ regexp = "^#{group}$"
+ "stat -f %Sg #{escape(file)} | grep -- #{escape(regexp)}"
+ end
+
def check_mounted(path)
regexp = "on #{path} "
"mount | grep #{escape(regexp)}"
|
Add OpenBSD specific commands for checking file status
|
diff --git a/src/SelectionControls/SelectionControlModel.php b/src/SelectionControls/SelectionControlModel.php
index <HASH>..<HASH> 100644
--- a/src/SelectionControls/SelectionControlModel.php
+++ b/src/SelectionControls/SelectionControlModel.php
@@ -49,6 +49,7 @@ class SelectionControlModel extends ControlModel
{
$list = parent::getExposableModelProperties();
$list[] = "selectedItems";
+ $list[] = "supportsMultipleSelection";
return $list;
}
|
Selection controls pass their supportsMultipleSelection to the viewbridge
|
diff --git a/core/node/dns.go b/core/node/dns.go
index <HASH>..<HASH> 100644
--- a/core/node/dns.go
+++ b/core/node/dns.go
@@ -26,7 +26,7 @@ func DNSResolver(cfg *config.Config) (*madns.Resolver, error) {
hasEth := false
for domain, url := range cfg.DNS.Resolvers {
- if !dns.IsFqdn(domain) {
+ if domain != "." && !dns.IsFqdn(domain) {
return nil, fmt.Errorf("invalid domain %s; must be FQDN", domain)
}
|
the dot is not really an FQDN
|
diff --git a/src/angular-materialize.js b/src/angular-materialize.js
index <HASH>..<HASH> 100644
--- a/src/angular-materialize.js
+++ b/src/angular-materialize.js
@@ -767,6 +767,7 @@
// Internal Pagination Click Action
function internalAction(scope, page) {
+ page = page.valueOf();
// Block clicks we try to load the active page
if (scope.page == page) {
return;
|
Fixed that the pagination-action sometimes returned an object, instead of a number. Fixes #<I> (again).
|
diff --git a/spec/integration/ssh_spec.rb b/spec/integration/ssh_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/integration/ssh_spec.rb
+++ b/spec/integration/ssh_spec.rb
@@ -39,25 +39,20 @@ describe Gas::Ssh do
it 'should detect when an id_rsa is already in the .gas directory', :current => true do
Gas::Ssh.corresponding_rsa_files_exist?(@uid).should be_true
end
-
end
describe "File System Changes..." do
-
before :all do
- @gas_dir = File.expand_path('~/.gas')
- @ssh_dir = File.expand_path('~/.ssh')
-
+ # @gas_dir = File.expand_path('~/.gas')
+ # @ssh_dir = File.expand_path('~/.ssh')
@nickname = "thisaccountmaybedeletedmysteriously"
@name = "tim T"
@email = "tim@timmy.com"
- `rm #{@gas_dir}/#{@nickname}_id_rsa`
- `rm #{@gas_dir}/#{@nickname}_id_rsa.pub`
+ #`rm #{@gas_dir}/#{@nickname}_id_rsa`
+ #`rm #{@gas_dir}/#{@nickname}_id_rsa.pub`
Gas.delete(@nickname)
-
- # make sure that nickname isn't in use
end
|
commented out some junk in a before filter that probably can be removed
|
diff --git a/src/js/JSONEditor.js b/src/js/JSONEditor.js
index <HASH>..<HASH> 100644
--- a/src/js/JSONEditor.js
+++ b/src/js/JSONEditor.js
@@ -171,7 +171,7 @@ function JSONEditor (container, options, json) {
*/
JSONEditor.modes = {}
-// debounce interval for JSON schema vaidation in milliseconds
+// debounce interval for JSON schema validation in milliseconds
JSONEditor.prototype.DEBOUNCE_INTERVAL = 150
JSONEditor.VALID_OPTIONS = [
|
docs: Fix simple typo, vaidation -> validation (#<I>)
There is a small typo in src/js/JSONEditor.js.
Should read `validation` rather than `vaidation`.
|
diff --git a/src/Router.php b/src/Router.php
index <HASH>..<HASH> 100644
--- a/src/Router.php
+++ b/src/Router.php
@@ -240,7 +240,7 @@ class Router {
self::$errorCallback = function () {
- var_dump(self::$uri);
+ /* Set errors */
};
}
|
Updated to version <I>
|
diff --git a/user/index.php b/user/index.php
index <HASH>..<HASH> 100644
--- a/user/index.php
+++ b/user/index.php
@@ -410,9 +410,9 @@ list($esql, $params) = get_enrolled_sql($context, null, $currentgroup, true);
$joins = array("FROM {user} u");
$wheres = array();
-$mainuserfields = user_picture::fields('u', array('username', 'email', 'city', 'country', 'lang', 'timezone', 'maildisplay'));
-$alreadyretrievedfields = explode(',', $mainuserfields);
-$extrasql = get_extra_user_fields_sql($context, 'u', '', $alreadyretrievedfields);
+$userfields = array('username', 'email', 'city', 'country', 'lang', 'timezone', 'maildisplay');
+$mainuserfields = user_picture::fields('u', $userfields);
+$extrasql = get_extra_user_fields_sql($context, 'u', '', $userfields);
if ($isfrontpage) {
$select = "SELECT $mainuserfields, u.lastaccess$extrasql";
|
MDL-<I> user: Add duplicate field check to avoid oracle db error.
|
diff --git a/elastic.js b/elastic.js
index <HASH>..<HASH> 100644
--- a/elastic.js
+++ b/elastic.js
@@ -186,6 +186,8 @@ angular.module('monospaced.elastic', [])
forceAdjust();
});
+ $timeout(adjust);
+
/*
* destroy
*/
|
restore inital run of adjust in timeout #<I>
|
diff --git a/src/pixi/display/MovieClip.js b/src/pixi/display/MovieClip.js
index <HASH>..<HASH> 100644
--- a/src/pixi/display/MovieClip.js
+++ b/src/pixi/display/MovieClip.js
@@ -73,6 +73,23 @@ PIXI.MovieClip.prototype = Object.create( PIXI.Sprite.prototype );
PIXI.MovieClip.prototype.constructor = PIXI.MovieClip;
/**
+* [read-only] totalFrames is the total number of frames in the MovieClip. This is the same as number of textures
+* assigned to the MovieClip.
+*
+* @property totalFrames
+* @type Number
+* @default 0
+* @readOnly
+*/
+Object.defineProperty( PIXI.MovieClip.prototype, 'totalFrames', {
+ get: function() {
+
+ return this.textures.length;
+ }
+});
+
+
+/**
* Stops the MovieClip
*
* @method stop
|
Added totalframes to MovieClip
|
diff --git a/src/main/java/org/influxdb/dto/Point.java b/src/main/java/org/influxdb/dto/Point.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/influxdb/dto/Point.java
+++ b/src/main/java/org/influxdb/dto/Point.java
@@ -276,11 +276,11 @@ public class Point {
}
if (column.tag()) {
- if(fieldValue != null) {
+ if (fieldValue != null) {
this.tags.put(fieldName, (String) fieldValue);
}
} else {
- if(fieldValue != null) {
+ if (fieldValue != null) {
this.fields.put(fieldName, fieldValue);
}
}
|
Fixing build
Adding space after if
|
diff --git a/src/Embera/Provider/Altru.php b/src/Embera/Provider/Altru.php
index <HASH>..<HASH> 100755
--- a/src/Embera/Provider/Altru.php
+++ b/src/Embera/Provider/Altru.php
@@ -52,6 +52,7 @@ class Altru extends ProviderAdapter implements ProviderInterface
/** inline {@inheritdoc} */
public function getFakeResponse()
{
+ $embedUrl = '';
if (preg_match('~answer_id=([0-9]+)~i', (string) $this->url, $matches)) {
$embedUrl = 'https://api.altrulabs.com/api/v1/social/embed_player/' . $matches['1'];
} else if (preg_match('~/player/([0-9]+)~i', (string) $this->url, $matches)) {
|
Added missing vars on Altru provider
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,7 +4,7 @@ import path from 'path';
import MagicString from 'magic-string';
import { createFilter } from 'rollup-pluginutils';
-const componentRegex = /@Component\({([\s\S]*)}\)$/gm;
+const componentRegex = /@Component\(\s?{([\s\S]*)}\s?\)$/gm;
const templateUrlRegex = /templateUrl\s*:(.*)/g;
const styleUrlsRegex = /styleUrls\s*:(\s*\[[\s\S]*?\])/g;
const stringRegex = /(['"])((?:[^\\]\\\1|.)*?)\1/g;
|
Accept whitespace before braces in @Component (#<I>)
* Accept whitespace before braces in @Component
Change componentRegex to also accept a single whitespace before { and after } to support further coding styles
* Reset package version
|
diff --git a/demo/demo-scriptinclude.js b/demo/demo-scriptinclude.js
index <HASH>..<HASH> 100755
--- a/demo/demo-scriptinclude.js
+++ b/demo/demo-scriptinclude.js
@@ -10,8 +10,16 @@ function init() {
foucTarget && (foucTarget.className = '');
// Add the card container listeners, using the necessary event trigger
- document.body.dispatchEvent(new CustomEvent('cardstrap', { detail: '.container'}));
+ document.body.dispatchEvent(new CustomEvent('cardstrap', {
+ detail: '.container'
+ }));
+
+ // Listen for any events coming out of evented components
+ eventedElement.addEventListener('card-comment', function(e) {
+ console.info(`${e.detail.username} says "${e.detail.comment}"`);
+ });
+ // Initialize the card instances
// Data in detail objects could come from a service endpoint
eventedElement.dispatchEvent(new CustomEvent('initCard', {
|
feat(demo): Add event listener for card comments.
|
diff --git a/src/Silex/Util/Compiler.php b/src/Silex/Util/Compiler.php
index <HASH>..<HASH> 100644
--- a/src/Silex/Util/Compiler.php
+++ b/src/Silex/Util/Compiler.php
@@ -82,7 +82,8 @@ class Compiler
$phar->stopBuffering();
- // $phar->compressFiles(\Phar::GZ);
+ // FIXME: phar compression feature is not yet implemented
+ //$phar->compressFiles(\Phar::GZ);
unset($phar);
}
|
Make reason of prenatal code visible.
Code is commented since ages, the reason is missing (because there is a reason).
|
diff --git a/eZ/Publish/Core/Persistence/Legacy/Content/Type/Handler.php b/eZ/Publish/Core/Persistence/Legacy/Content/Type/Handler.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/Core/Persistence/Legacy/Content/Type/Handler.php
+++ b/eZ/Publish/Core/Persistence/Legacy/Content/Type/Handler.php
@@ -476,6 +476,7 @@ class Handler implements BaseContentTypeHandler
* field (default) values.
*
* @param mixed $contentTypeId
+ * @param int $status One of Type::STATUS_DEFINED|Type::STATUS_DRAFT|Type::STATUS_MODIFIED
* @param \eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition $fieldDefinition
* @return void
*/
|
Fixed: missing param in phpdoc
|
diff --git a/Eloquent/Model.php b/Eloquent/Model.php
index <HASH>..<HASH> 100644
--- a/Eloquent/Model.php
+++ b/Eloquent/Model.php
@@ -8,12 +8,10 @@ use JsonSerializable;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Illuminate\Contracts\Support\Jsonable;
-use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Contracts\Routing\UrlRoutable;
use Illuminate\Contracts\Queue\QueueableEntity;
use Illuminate\Database\Eloquent\Relations\Pivot;
-use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Database\Query\Builder as QueryBuilder;
use Illuminate\Database\ConnectionResolverInterface as Resolver;
|
Remove useless imports. (#<I>)
|
diff --git a/eZ/Publish/API/REST/Server/View/Visitor.php b/eZ/Publish/API/REST/Server/View/Visitor.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/API/REST/Server/View/Visitor.php
+++ b/eZ/Publish/API/REST/Server/View/Visitor.php
@@ -44,7 +44,16 @@ class Visitor extends RMF\View
*/
public function display( RMF\Request $request, $result )
{
- $message = $this->visitor->visit( $result );
+ if ( $result === null )
+ {
+ $message = new Common\Message(
+ array( 'Status' => '200 No content', )
+ );
+ }
+ else
+ {
+ $message = $this->visitor->visit( $result );
+ }
foreach ( $message->headers as $name => $value )
{
|
Implemented: Correct handling of empty bodies.
The visitor now automatically detects if the return value of a
controller is null and then sends the correct "<I> No Content" header.
This solves the issue of "No Content" for now, let's see if we need
additional header handling from the controller side.
|
diff --git a/core/src/main/java/com/orientechnologies/orient/core/sql/method/misc/OSQLMethodFormat.java b/core/src/main/java/com/orientechnologies/orient/core/sql/method/misc/OSQLMethodFormat.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/com/orientechnologies/orient/core/sql/method/misc/OSQLMethodFormat.java
+++ b/core/src/main/java/com/orientechnologies/orient/core/sql/method/misc/OSQLMethodFormat.java
@@ -42,8 +42,8 @@ public class OSQLMethodFormat extends OAbstractSQLMethod {
final Object v = getParameterValue(iRecord, iMethodParams[0].toString());
if (v != null) {
- if (ioResult instanceof Long)
- ioResult = new Date((Long) ioResult);
+ if (ioResult instanceof Number)
+ ioResult = new Date(((Long) ioResult).longValue());
if (ioResult instanceof Date) {
final SimpleDateFormat format = new SimpleDateFormat(v.toString());
|
.format(): supported conversion from any Number
|
diff --git a/androguard/core/bytecodes/apk.py b/androguard/core/bytecodes/apk.py
index <HASH>..<HASH> 100644
--- a/androguard/core/bytecodes/apk.py
+++ b/androguard/core/bytecodes/apk.py
@@ -1024,7 +1024,7 @@ class APK:
]
def is_tag_matched(self, tag, **attribute_filter):
- """
+ r"""
Return true if the attributes matches in attribute filter.
An attribute filter is a dictionary containing: {attribute_name: value}.
|
fixs docstring in issue #<I> by pyupgrade
|
diff --git a/java/client/src/org/openqa/selenium/SessionNotCreatedException.java b/java/client/src/org/openqa/selenium/SessionNotCreatedException.java
index <HASH>..<HASH> 100644
--- a/java/client/src/org/openqa/selenium/SessionNotCreatedException.java
+++ b/java/client/src/org/openqa/selenium/SessionNotCreatedException.java
@@ -24,4 +24,8 @@ public class SessionNotCreatedException extends WebDriverException {
public SessionNotCreatedException(String msg) {
super(msg);
}
+
+ public SessionNotCreatedException(String msg, Throwable cause) {
+ super(message, cause);
+ }
}
|
adding ability to pass Throwable to creating SessionNotCreatedException ~ desired by ios-driver
|
diff --git a/lib/ui/modal/modal.js b/lib/ui/modal/modal.js
index <HASH>..<HASH> 100644
--- a/lib/ui/modal/modal.js
+++ b/lib/ui/modal/modal.js
@@ -237,15 +237,17 @@
proto.hide = function() {
+ var self = this;
+
var deferred = $q.defer();
this.templatePromise.then(function() {
- this.$element.one('hidden.bs.modal', function() {
+ self.$element.one('hidden.bs.modal', function() {
deferred.resolve(true);
});
- this.$element.modal('hide');
+ self.$element.modal('hide');
});
|
changed hide to reference self instead of this.
|
diff --git a/Framework/DoozR/Di/Factory.php b/Framework/DoozR/Di/Factory.php
index <HASH>..<HASH> 100644
--- a/Framework/DoozR/Di/Factory.php
+++ b/Framework/DoozR/Di/Factory.php
@@ -48,7 +48,7 @@
* @author Benjamin Carl <opensource@clickalicious.de>
* @copyright 2012 - 2013 Benjamin Carl
* @license http://www.opensource.org/licenses/bsd-license.php The BSD License
- * @version Git: $Id: $
+ * @version Git: $Id: 618b341e3281f9f88aa0a0e84a4778959303b18a $
* @link https://github.com/clickalicious/Di
* @see -
* @since -
|
fixed: Wrong hash placeholder
|
diff --git a/lfs/lfs.go b/lfs/lfs.go
index <HASH>..<HASH> 100644
--- a/lfs/lfs.go
+++ b/lfs/lfs.go
@@ -17,10 +17,6 @@ import (
"github.com/rubyist/tracerx"
)
-var (
- LargeSizeThreshold = 5 * 1024 * 1024
-)
-
// LocalMediaDir returns the root of lfs objects
func LocalMediaDir() string {
if localstorage.Objects() != nil {
|
lfs: remove unused LargeSizeThreshold constant
The constant was introduced in dca7f<I> ("really basic pre-commit hook
that rejects commits with files > 5MB", <I>-<I>-<I>) and is not used
anymore. Cleanup the code and remove it.
|
diff --git a/api/register.go b/api/register.go
index <HASH>..<HASH> 100644
--- a/api/register.go
+++ b/api/register.go
@@ -172,7 +172,7 @@ func (this *EngineGroup) getHandlerImp(handler APIHandler) gin.HandlerFunc {
session.Save(c.Request, c.Writer)
switch context.code {
case unresolvedCode:
- c.AbortWithStatus(http.StatusNoContent)
+ c.AbortWithStatus(http.StatusInternalServerError)
case http.StatusMovedPermanently:
c.Redirect(context.code, context.ret.(string))
case http.StatusTemporaryRedirect:
|
change unresolved statuscode StatusNoContent ->
StatusInternalServerError
|
diff --git a/spyder/plugins/editor/widgets/codeeditor.py b/spyder/plugins/editor/widgets/codeeditor.py
index <HASH>..<HASH> 100644
--- a/spyder/plugins/editor/widgets/codeeditor.py
+++ b/spyder/plugins/editor/widgets/codeeditor.py
@@ -2043,6 +2043,7 @@ class CodeEditor(TextEditBaseWidget):
self.highlight_line_warning(block_data)
def highlight_line_warning(self, block_data):
+ """Highlight errors and warnings in this editor."""
self.clear_extra_selections('code_analysis_highlight')
self.__highlight_selection('code_analysis_highlight',
block_data.selection,
|
Add docstring for highlight_line_warning
|
diff --git a/spyderlib/widgets/externalshell/namespacebrowser.py b/spyderlib/widgets/externalshell/namespacebrowser.py
index <HASH>..<HASH> 100644
--- a/spyderlib/widgets/externalshell/namespacebrowser.py
+++ b/spyderlib/widgets/externalshell/namespacebrowser.py
@@ -39,7 +39,8 @@ class NamespaceBrowser(QWidget):
self.shellwidget = None
self.is_internal_shell = None
- self.is_visible = False
+
+ self.is_visible = True # Do not modify: light mode won't work!
self.setup_in_progress = None
|
Spyder light mode's variable explorer was broken: fixed!
|
diff --git a/src/Http/ContentDelivery/PageBuilder/SnippetTransformation/PricesJsonSnippetTransformation.php b/src/Http/ContentDelivery/PageBuilder/SnippetTransformation/PricesJsonSnippetTransformation.php
index <HASH>..<HASH> 100644
--- a/src/Http/ContentDelivery/PageBuilder/SnippetTransformation/PricesJsonSnippetTransformation.php
+++ b/src/Http/ContentDelivery/PageBuilder/SnippetTransformation/PricesJsonSnippetTransformation.php
@@ -4,7 +4,6 @@ namespace LizardsAndPumpkins\Http\ContentDelivery\PageBuilder\SnippetTransformat
use LizardsAndPumpkins\Http\ContentDelivery\PageBuilder\PageSnippets;
use LizardsAndPumpkins\Context\Context;
-use LizardsAndPumpkins\Http\ContentDelivery\PageBuilder\SnippetTransformation\SnippetTransformation;
/**
* @todo remove when product listing uses ProductJsonServiceProvider
|
Issue #<I>: Remove unused import
|
diff --git a/linkedin/linkedin.py b/linkedin/linkedin.py
index <HASH>..<HASH> 100644
--- a/linkedin/linkedin.py
+++ b/linkedin/linkedin.py
@@ -15,6 +15,7 @@ from .utils import enum, to_utf8, raise_for_error, json, StringIO
__all__ = ['LinkedInAuthentication', 'LinkedInApplication', 'PERMISSIONS']
PERMISSIONS = enum('Permission',
+ COMPANY_ADMIN='rw_company_admin',
BASIC_PROFILE='r_basicprofile',
FULL_PROFILE='r_fullprofile',
EMAIL_ADDRESS='r_emailaddress',
|
Added rw_company_admin permission
This perimission is missing. It's documented here <URL>
|
diff --git a/jquery.powertip.js b/jquery.powertip.js
index <HASH>..<HASH> 100644
--- a/jquery.powertip.js
+++ b/jquery.powertip.js
@@ -101,8 +101,12 @@
},
mouseleave: function() {
if (tipElement.data('mouseOnToPopup')) {
- cancelHoverTimer(session.activeHover);
- setHoverTimer(session.activeHover, 'hide');
+ // check activeHover in case the mouse cursor entered
+ // the tooltip during the fadeOut and close cycle
+ if (session.activeHover) {
+ cancelHoverTimer(session.activeHover);
+ setHoverTimer(session.activeHover, 'hide');
+ }
session.mouseTarget = null;
}
}
|
Added check for activeHover on tip mouseleave.
Solves edge case where the mouse cursor enters the tooltip during the
fadeOut cycle, causing an undefined error when the fadeOut completes and
the mouseout fires.
|
diff --git a/app.js b/app.js
index <HASH>..<HASH> 100644
--- a/app.js
+++ b/app.js
@@ -91,7 +91,7 @@ mongoose.connection.on('error', function (err) {
});
mongoose.connection.on('disconnected', function() {
- mongoose.connect(settings.mongoURI);
+ throw new Error('Could not connect to database');
});
//
|
Throw exception if mongo cannot be reached
|
diff --git a/mockserver-core/src/main/java/org/mockserver/mock/action/ExpectationForwardCallback.java b/mockserver-core/src/main/java/org/mockserver/mock/action/ExpectationForwardCallback.java
index <HASH>..<HASH> 100644
--- a/mockserver-core/src/main/java/org/mockserver/mock/action/ExpectationForwardCallback.java
+++ b/mockserver-core/src/main/java/org/mockserver/mock/action/ExpectationForwardCallback.java
@@ -16,7 +16,9 @@ public interface ExpectationForwardCallback extends ExpectationCallback<HttpRequ
* @param httpRequest the request that satisfied the expectation condition
* @return the request that will be proxied
*/
- HttpRequest handle(HttpRequest httpRequest) throws Exception;
+ default HttpRequest handle(HttpRequest httpRequest) throws Exception {
+ return httpRequest;
+ }
/**
* Called for every response received from a proxied request, the return
|
adding default implementation for all methods so only the required ones need to be implemented
|
diff --git a/server/Publish.rb b/server/Publish.rb
index <HASH>..<HASH> 100644
--- a/server/Publish.rb
+++ b/server/Publish.rb
@@ -80,7 +80,7 @@ class Dbus_actuator < DBus::Object
def define_dbus_methods(methods)
methdef = "dbus_interface 'org.openplacos.server.actuator' do \n "
- methdef += "dbus_method :state, 'out return:a{sv}' do \n return @act.state \n end \n"
+ methdef += "dbus_method :state, 'out return:a{sv}' do \n return [@act.state] \n end \n"
methods.each_value { |name|
methdef += "dbus_method :" + name + ", 'out return:v' do \n return @act." + name + " \n end \n "
}
diff --git a/server/Top.rb b/server/Top.rb
index <HASH>..<HASH> 100755
--- a/server/Top.rb
+++ b/server/Top.rb
@@ -128,7 +128,7 @@ class Top
# store config if not done before
$database.store_config( @drivers, @measures, @actuators)
else
- $database = nil
+ #$database = nil
end
|
patch for state method and $database error
|
diff --git a/cpp_coveralls/coverage.py b/cpp_coveralls/coverage.py
index <HASH>..<HASH> 100644
--- a/cpp_coveralls/coverage.py
+++ b/cpp_coveralls/coverage.py
@@ -311,7 +311,7 @@ def collect(args):
src_report['coverage'] = parse_gcov_file(fobj)
src_files[src_path] = combine_reports(src_files.get(src_path), src_report)
- report['source_files'] = src_files.values()
+ report['source_files'] = list(src_files.values())
# Also collects the source files that have no coverage reports.
report['source_files'].extend(
collect_non_report_files(args, discovered_files))
|
Fixed issue with python 3 returning a view
|
diff --git a/Task/Generate.php b/Task/Generate.php
index <HASH>..<HASH> 100644
--- a/Task/Generate.php
+++ b/Task/Generate.php
@@ -207,6 +207,15 @@ class Generate extends Base {
* a key $property_name if data has been supplied for this property.
*/
protected function setComponentDataPropertyDefault($property_name, $property_info, &$component_data_local) {
+ // Don't clobber a default value that's already been set. This can happen
+ // if a parent property sets a default value for a child item.
+ // TODO: consider whether the child item should win if it has a default
+ // value or callback of its own -- or indeed if this combination ever
+ // happens.
+ if (isset($component_data_local[$property_name])) {
+ return;
+ }
+
// During the prepare stage, we always want to provide a default, for the
// convenience of the user in the UI.
if (isset($property_info['default'])) {
|
Fixed defaults set by parent properties into child items getting clobbered by child item setting defaults.
|
diff --git a/spec/unit/provider/directory_spec.rb b/spec/unit/provider/directory_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/provider/directory_spec.rb
+++ b/spec/unit/provider/directory_spec.rb
@@ -47,6 +47,9 @@ describe Chef::Provider::Directory do
end
describe "scanning file security metadata on unix" do
+ before do
+ Chef::Platform.stub!(:windows?).and_return(false)
+ end
let(:mock_stat) do
cstats = mock("stats")
cstats.stub!(:uid).and_return(500)
|
Stub windows detection in directory spec.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ with open('requirements.txt') as f:
setup(
name='pyicloud',
- version='0.7.0',
+ version='0.7.1',
url='https://github.com/picklepete/pyicloud',
description=(
'PyiCloud is a module which allows pythonistas to '
|
Release <I>; Validates Apple's server certificate (to eliminate an emitted warning).
|
diff --git a/src/services/EmailService.php b/src/services/EmailService.php
index <HASH>..<HASH> 100644
--- a/src/services/EmailService.php
+++ b/src/services/EmailService.php
@@ -2,7 +2,7 @@
namespace app\email\services;
-use infuse\Util;
+use infuse\Utility as U;
use App;
@@ -22,8 +22,8 @@ class EmailService
{
$this->app = $app;
- $this->fromEmail = Util::array_value( $settings, 'from_email' );
- $this->fromName = Util::array_value( $settings, 'from_name' );
+ $this->fromEmail = U::array_value( $settings, 'from_email' );
+ $this->fromName = U::array_value( $settings, 'from_name' );
if ($settings[ 'type' ] == 'smtp') {
$transport = \Swift_SmtpTransport::newInstance( $settings[ 'host' ], $settings[ 'port' ] )
|
renamed infuse/Util to Utility
|
diff --git a/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java b/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java
index <HASH>..<HASH> 100644
--- a/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java
+++ b/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java
@@ -37,7 +37,7 @@ public interface ChunkedInput<B> {
/**
* Fetches a chunked data from the stream. Once this method returns the last chunk
* and thus the stream has reached at its end, any subsequent {@link #isEndOfInput()}
- * call must return {@code false}.
+ * call must return {@code true}.
*
* @return the fetched chunk.
* {@code null} if there is no data left in the stream.
|
[#<I>] Correct javadoc of ChunkedInput
|
diff --git a/ipywidgets/widgets/widget.py b/ipywidgets/widgets/widget.py
index <HASH>..<HASH> 100644
--- a/ipywidgets/widgets/widget.py
+++ b/ipywidgets/widgets/widget.py
@@ -266,6 +266,12 @@ class Widget(LoggingConfigurable):
"""Return (state_without_buffers, state_with_buffers, buffer_paths, buffers) for binary message parts
state_with_buffers is a dict where any of it's decendents is is a binary_type.
+
+ As an example:
+ >>> state = {'plain': [0, 'text'], 'x': {'ar': memoryview(ar1)}, 'y': {shape: (10,10), data: memoryview(ar2)}}
+ >>> widget._split_state_buffers(state)
+ ({'plain': [0, 'text']}, {'x': {}, 'y': {'shape': (10, 10)}}, [['x', 'ar'], ['y', 'data']],
+ [<memory at 0x107ffec48>, <memory at 0x107ffed08>])
"""
def seperate_buffers(substate, path, buffer_paths, buffers):
# remove binary types from dicts and lists, and keep there key, e.g. {'x': {'ar': ar}, 'y': [ar2, ar3]}
|
better docstring for _split_state_buffers
|
diff --git a/admin/cron.php b/admin/cron.php
index <HASH>..<HASH> 100644
--- a/admin/cron.php
+++ b/admin/cron.php
@@ -20,6 +20,7 @@
echo "<pre>\n";
$timenow = time();
+ echo "Server Time: ".date('r',$timenow)."\n\n";
/// Run all cron jobs for each module
|
Output the time in the cron output
|
diff --git a/lib/HotModuleReplacementPlugin.js b/lib/HotModuleReplacementPlugin.js
index <HASH>..<HASH> 100644
--- a/lib/HotModuleReplacementPlugin.js
+++ b/lib/HotModuleReplacementPlugin.js
@@ -153,7 +153,7 @@ module.exports = class HotModuleReplacementPlugin {
const buf = [source];
buf.push("");
buf.push("// __webpack_hash__");
- buf.push(`${this.requireFn}.h = () => hotCurrentHash`);
+ buf.push(this.requireFn + ".h = function() { return hotCurrentHash; };");
return this.asString(buf);
});
|
- Fix bug while refactoring HotModuleReplacementPlugin as suggested in PR
|
diff --git a/p2p/muxer/yamux/transport.go b/p2p/muxer/yamux/transport.go
index <HASH>..<HASH> 100644
--- a/p2p/muxer/yamux/transport.go
+++ b/p2p/muxer/yamux/transport.go
@@ -2,6 +2,7 @@ package sm_yamux
import (
"io/ioutil"
+ "math"
"net"
"github.com/libp2p/go-libp2p-core/network"
@@ -24,7 +25,9 @@ func init() {
// We always run over a security transport that buffers internally
// (i.e., uses a block cipher).
config.ReadBufSize = 0
- config.MaxIncomingStreams = 256
+ // Effectively disable the incoming streams limit.
+ // This is now dynamically limited by the resource manager.
+ config.MaxIncomingStreams = math.MaxUint32
DefaultTransport = (*Transport)(config)
}
|
disable the incoming streams limit (#<I>)
This is now handled by the resource manager.
|
diff --git a/src/ComposerPlugin.php b/src/ComposerPlugin.php
index <HASH>..<HASH> 100644
--- a/src/ComposerPlugin.php
+++ b/src/ComposerPlugin.php
@@ -20,6 +20,8 @@ use Composer\IO\IOInterface;
use Composer\Plugin\PluginInterface;
use Composer\Script\Event;
use Composer\Script\ScriptEvents;
+use Composer\Util\ProcessExecutor;
+use Symfony\Component\Process\ExecutableFinder;
/** Plugin for PHP composer to automatically update the autoload map whenever
* dependencies are changed or updated.
@@ -58,6 +60,10 @@ final class ComposerPlugin
*/
public function onPostAutoloadDump(Event $event) {
$args = $event->isDevMode() ? '' : ' --no-dev';
- shell_exec('hhvm '.escapeshellarg($this->vendor.'/bin/hh-autoload').$args);
+ $finder = new ExecutableFinder();
+ $hhvm = $finder->find('hhvm', 'hhvm');
+ $executor = new ProcessExecutor($this->io);
+ $command = $hhvm . ' ' . ProcessExecutor::escape($this->vendor.'/bin/hh-autoload') . $args;
+ $executor->execute($command);
}
}
|
Update ComposerPlugin.php (#<I>)
|
diff --git a/test/test.py b/test/test.py
index <HASH>..<HASH> 100644
--- a/test/test.py
+++ b/test/test.py
@@ -27,7 +27,7 @@ for entry in os.listdir(sys.argv[1]):
# Run the test.
test_fname = gold_fname[:-len(suffix):] + '.py'
command = '%s %s'%(sys.executable, test_fname)
- #print(command)
+ print(command)
p = Popen(command, shell=True, stdout=PIPE, stderr=STDOUT)
test_lines = p.stdout.readlines()
|
Echo command to stdout.
|
diff --git a/worker/provisioner/container_initialisation_test.go b/worker/provisioner/container_initialisation_test.go
index <HASH>..<HASH> 100644
--- a/worker/provisioner/container_initialisation_test.go
+++ b/worker/provisioner/container_initialisation_test.go
@@ -177,12 +177,16 @@ func (s *ContainerSetupSuite) TestContainerProvisionerStarted(c *gc.C) {
}
}
-func (s *ContainerSetupSuite) TestKvmContainerUsesConstraintsArch(c *gc.C) {
+func (s *ContainerSetupSuite) TestLxcContainerUsesConstraintsArch(c *gc.C) {
+ // LXC should override the architecture in constraints with the
+ // host's architecture.
s.PatchValue(&version.Current.Arch, arch.PPC64EL)
s.testContainerConstraintsArch(c, instance.LXC, arch.PPC64EL)
}
-func (s *ContainerSetupSuite) TestLxcContainerUsesHostArch(c *gc.C) {
+func (s *ContainerSetupSuite) TestKvmContainerUsesHostArch(c *gc.C) {
+ // KVM should do what it's told, and use the architecture in
+ // constraints.
s.PatchValue(&version.Current.Arch, arch.PPC64EL)
s.testContainerConstraintsArch(c, instance.KVM, arch.AMD64)
}
|
worker/provisioner: fix test names
|
diff --git a/salt/client/ssh/state.py b/salt/client/ssh/state.py
index <HASH>..<HASH> 100644
--- a/salt/client/ssh/state.py
+++ b/salt/client/ssh/state.py
@@ -184,10 +184,10 @@ def prep_trans_tar(opts, file_client, chunks, file_refs, pillar=None, id_=None):
if id_ is None:
id_ = ''
try:
- cachedir = os.path.join(opts['cachedir'], 'salt-ssh', id_).rstrip(os.sep)
+ cachedir = os.path.join('salt-ssh', id_).rstrip(os.sep)
except AttributeError:
# Minion ID should always be a str, but don't let an int break this
- cachedir = os.path.join(opts['cachedir'], 'salt-ssh', str(id_)).rstrip(os.sep)
+ cachedir = os.path.join('salt-ssh', str(id_)).rstrip(os.sep)
for saltenv in file_refs:
# Location where files in this saltenv will be cached
|
allow file_client to figure out cachedir
We do not need to specify the entire path here. _cache_loc in salt.fileclient
will do that for us. If we specify cachedir here, it will use the
/var/tmp/*/running_data/var/cache path which we do not want to use when on the
master.
This is intelligent enough to use the /var/tmp path on the minion and a
/var/cache/salt/master type path on the master.
Fixes #<I>
|
diff --git a/src/Configurator/Helpers/RulesHelper.php b/src/Configurator/Helpers/RulesHelper.php
index <HASH>..<HASH> 100644
--- a/src/Configurator/Helpers/RulesHelper.php
+++ b/src/Configurator/Helpers/RulesHelper.php
@@ -44,8 +44,6 @@ abstract class RulesHelper
}
$k = '';
-
- // Look into each matrix whether current tag is allowed as child/descendant
foreach ($matrix as $tagMatrix)
{
$k .= $tagMatrix['allowedChildren'][$tagName];
|
Removed comment [ci skip]
|
diff --git a/ailment/analyses/simplifier.py b/ailment/analyses/simplifier.py
index <HASH>..<HASH> 100644
--- a/ailment/analyses/simplifier.py
+++ b/ailment/analyses/simplifier.py
@@ -1,6 +1,7 @@
from angr import Analysis, register_analysis
from angr.analyses.reaching_definitions import OP_AFTER
+from angr.analyses.reaching_definitions.external_codeloc import ExternalCodeLocation
from ..block import Block
from ..statement import Assignment
@@ -72,7 +73,8 @@ class Simplifier(Analysis):
used_tmp_indices = set(rd.one_result.tmp_uses.keys())
dead_virgins = rd.one_result._dead_virgin_definitions
- dead_virgins_stmt_idx = set([ d.codeloc.stmt_idx for d in dead_virgins ])
+ dead_virgins_stmt_idx = set([ d.codeloc.stmt_idx for d in dead_virgins
+ if not isinstance(d.codeloc, ExternalCodeLocation) ])
for idx, stmt in enumerate(block.statements):
if type(stmt) is Assignment:
|
Fix a bug where statements are incorrectly removed because we do not differentiate between internal codelocs and external codelocs.
|
diff --git a/gspread/models.py b/gspread/models.py
index <HASH>..<HASH> 100644
--- a/gspread/models.py
+++ b/gspread/models.py
@@ -1596,7 +1596,7 @@ class Worksheet(object):
.. _ValueInputOption: https://developers.google.com/sheets/api/reference/rest/v4/ValueInputOption
"""
- return self.insert_rows([values], index, value_input_option='RAW')
+ return self.insert_rows([values], index, value_input_option=value_input_option)
def insert_rows(self, values, row=1, value_input_option='RAW'):
"""Adds multiple rows to the worksheet at the specified index and
|
Fixed a bug with insert_row
Regardless of what the end user put as `value_input_option`, it always resulted in "RAW"
|
diff --git a/nfc/dev/pn53x.py b/nfc/dev/pn53x.py
index <HASH>..<HASH> 100644
--- a/nfc/dev/pn53x.py
+++ b/nfc/dev/pn53x.py
@@ -476,7 +476,7 @@ class Device(nfc.dev.Device):
pollrq = "\x00\xFF\xFF\x00\x03"
nfcid3 = "\x01\xfe" + os.urandom(8)
- for mode, speed in (("active", "424"), ("passive", "424")):
+ for mode, speed in (("passive", "424"), ("active", "424")):
try:
rsp = self.chipset.in_jump_for_dep(
mode, speed, pollrq, nfcid3, general_bytes)
|
poll first for NFC-DEP passive, then active mode
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -28,9 +28,15 @@ var HeaderSet = require('./header-set');
var Logger = require('./logger');
var Connection = require('./connection');
+var SerialConnection = require('./serial-connection');
var TcpConnection = require('./tcp-connection');
+var DataSource = require('./data-source');
+var SerialDataSource = require('./serial-data-source');
+var TcpDataSource = require('./tcp-data-source');
+
var DataSourceProvider = require('./data-source-provider');
+var SerialDataSourceProvider = require('./serial-data-source-provider');
var TcpDataSourceProvider = require('./tcp-data-source-provider');
var Converter = require('./converter');
@@ -63,9 +69,15 @@ module.exports = {
Logger: Logger,
Connection: Connection,
+ SerialConnection: SerialConnection,
TcpConnection: TcpConnection,
+ DataSource: DataSource,
+ SerialDataSource: SerialDataSource,
+ TcpDataSource: TcpDataSource,
+
DataSourceProvider: DataSourceProvider,
+ SerialDataSourceProvider: SerialDataSourceProvider,
TcpDataSourceProvider: TcpDataSourceProvider,
Converter: Converter,
|
- Added exports for serial classes and data sources
|
diff --git a/src/Model/Project.php b/src/Model/Project.php
index <HASH>..<HASH> 100644
--- a/src/Model/Project.php
+++ b/src/Model/Project.php
@@ -104,7 +104,10 @@ class Project extends Resource
*/
public function addDomain($name, $wildcard = false, array $ssl = [])
{
- $body = ['name' => $name, 'wildcard' => $wildcard, 'ssl' => $ssl];
+ $body = ['name' => $name, 'wildcard' => $wildcard];
+ if (!empty($ssl)) {
+ $body['ssl'] = $ssl;
+ }
return Domain::create($body, $this->getUri() . '/domains', $this->client);
}
diff --git a/src/Model/Resource.php b/src/Model/Resource.php
index <HASH>..<HASH> 100644
--- a/src/Model/Resource.php
+++ b/src/Model/Resource.php
@@ -126,7 +126,7 @@ class Resource implements \ArrayAccess
throw new \InvalidArgumentException($message);
}
- $request = $client->createRequest('post', $collectionUrl, ['body' => $body]);
+ $request = $client->createRequest('post', $collectionUrl, ['json' => $body]);
$response = self::send($request, $client);
$data = (array) $response->json();
$data['_full'] = true;
|
Fix - 'body' on create needs to be JSON; the API cannot cope with empty arrays
|
diff --git a/js/select/js/lumx.select_directive.js b/js/select/js/lumx.select_directive.js
index <HASH>..<HASH> 100644
--- a/js/select/js/lumx.select_directive.js
+++ b/js/select/js/lumx.select_directive.js
@@ -289,7 +289,7 @@ angular.module('lumx.select', [])
if ($scope.change)
{
- $scope.change({ newValue: angular.copy(newConvertedValue), oldValue: angular.copy($scope.model) });
+ $scope.change({ newValue: angular.copy(newConvertedValue), oldValue: angular.copy($scope.ngModel.$modelValue) });
}
$scope.ngModel.$setViewValue(angular.copy(newConvertedValue));
});
|
fix select: missing model to ngModel rename
|
diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py
index <HASH>..<HASH> 100644
--- a/charmhelpers/contrib/openstack/utils.py
+++ b/charmhelpers/contrib/openstack/utils.py
@@ -140,6 +140,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
('yakkety', 'newton'),
('zesty', 'ocata'),
('artful', 'pike'),
+ ('bionic', 'queens'),
])
@@ -157,6 +158,7 @@ OPENSTACK_CODENAMES = OrderedDict([
('2016.2', 'newton'),
('2017.1', 'ocata'),
('2017.2', 'pike'),
+ ('2018.1', 'queens'),
])
# The ugly duckling - must list releases oldest to newest
@@ -187,6 +189,8 @@ SWIFT_CODENAMES = OrderedDict([
['2.11.0', '2.12.0', '2.13.0']),
('pike',
['2.13.0', '2.15.0']),
+ ('queens',
+ ['2.16.0']),
])
# >= Liberty version->codename mapping
|
Add remaining series support for queens (#<I>)
|
diff --git a/src/public/assets/assets/scripts/admin/custom.js b/src/public/assets/assets/scripts/admin/custom.js
index <HASH>..<HASH> 100644
--- a/src/public/assets/assets/scripts/admin/custom.js
+++ b/src/public/assets/assets/scripts/admin/custom.js
@@ -103,7 +103,20 @@ var app = {
var order = urlParts[urlPartsLength-1];
var newUrl = "";
- order = (order == "asc") ? "desc" : "asc";
+ if (order == "asc")
+ {
+ order = "desc";
+ $(".fa.fa-sort-up.fa-fw").remove();
+ $(".fa.fa-sort-down.fa-fw").remove();
+ link.append(' <span class="fa fa-sort-down fa-fw"></span>')
+ }
+ else
+ {
+ order = "asc";
+ $(".fa.fa-sort-up.fa-fw").remove();
+ $(".fa.fa-sort-down.fa-fw").remove();
+ link.append(' <span class="fa fa-sort-up fa-fw"></span>')
+ }
for ( var i = 2; i < urlPartsLength - 1; i++ )
{
|
Icons
I added icons on the column where the user has been sorting the data on.
|
diff --git a/system/src/Grav/Console/CleanCommand.php b/system/src/Grav/Console/CleanCommand.php
index <HASH>..<HASH> 100644
--- a/system/src/Grav/Console/CleanCommand.php
+++ b/system/src/Grav/Console/CleanCommand.php
@@ -88,7 +88,7 @@ class CleanCommand extends Command {
protected function configure() {
$this
->setName("clean")
- ->setDescription("Handles cleaning chores for Grav")
+ ->setDescription("Handles cleaning chores for Grav distribution")
->setHelp('The <info>clean</info> clean extraneous folders and data');
}
|
Minor description update for the CLI Clean command
|
diff --git a/provision/docker/provisioner.go b/provision/docker/provisioner.go
index <HASH>..<HASH> 100644
--- a/provision/docker/provisioner.go
+++ b/provision/docker/provisioner.go
@@ -224,8 +224,8 @@ func (p *dockerProvisioner) Destroy(app provision.App) error {
go func(c container) {
defer containersGroup.Done()
unit := c.asUnit(app)
- errUnbind := app.UnbindUnit(&unit)
- if errUnbind != nil {
+ err := app.UnbindUnit(&unit)
+ if err != nil {
log.Errorf("Unable to unbind unit %q: %s", c.ID, err)
}
err = removeContainer(&c)
|
provision/docker: fix code and build
Using the proper error fixes the build (+race), and the error reporting
itself.
|
diff --git a/tests/integration/cli/sync_test.py b/tests/integration/cli/sync_test.py
index <HASH>..<HASH> 100644
--- a/tests/integration/cli/sync_test.py
+++ b/tests/integration/cli/sync_test.py
@@ -23,3 +23,9 @@ class TestSyncCLI(DustyIntegrationTestCase):
self.assertFileContentsInContainer('busyboxa',
'/repo/README.md',
'# fake-repo')
+
+ def test_sync_repo_is_destructive(self):
+ self.exec_in_container('busyboxa', 'touch /repo/testfile')
+ self.assertFileInContainer('busyboxa', '/repo/testfile')
+ self.run_command('sync fake-repo')
+ self.assertFileNotInContainer('busyboxa', '/repo/testfile')
|
Add test that sync is now destructive
|
diff --git a/test/plugin/test_out_elasticsearch.rb b/test/plugin/test_out_elasticsearch.rb
index <HASH>..<HASH> 100644
--- a/test/plugin/test_out_elasticsearch.rb
+++ b/test/plugin/test_out_elasticsearch.rb
@@ -4107,12 +4107,6 @@ class ElasticsearchOutputTest < Test::Unit::TestCase
stub_request(:post, url)
.with(
body: "{\"query\":{\"ids\":{\"values\":#{ids.uniq.to_json}}},\"_source\":false,\"sort\":[{\"_index\":{\"order\":\"desc\"}}]}",
- headers: {
- 'Accept'=>'*/*',
- 'Content-Type'=>'application/json',
- 'Host'=>'localhost:9200',
- 'User-Agent'=>'elasticsearch-ruby/7.12.0 (RUBY_VERSION: 2.7.0; linux x86_64; Faraday v1.4.1)'
- }
)
.to_return(lambda do |req|
{ :status => 200,
|
test: out_elasticsearch: Remove a needless headers from affinity stub
|
diff --git a/components/Validation/src/Validator/Types.php b/components/Validation/src/Validator/Types.php
index <HASH>..<HASH> 100644
--- a/components/Validation/src/Validator/Types.php
+++ b/components/Validation/src/Validator/Types.php
@@ -17,6 +17,7 @@
*/
use DateTime;
+use DateTimeInterface;
use Limoncello\Validation\Contracts\MessageCodes;
use Limoncello\Validation\Contracts\RuleInterface;
use Limoncello\Validation\Rules\CallableRule;
@@ -74,7 +75,7 @@ trait Types
protected static function isDateTime(): RuleInterface
{
return new CallableRule(function ($value) {
- return $value instanceof DateTime;
+ return $value instanceof DateTimeInterface;
}, MessageCodes::IS_DATE_TIME);
}
|
Check dates with DateTimeInterface rather than specific type DateTime.
|
diff --git a/grab/spider/base.py b/grab/spider/base.py
index <HASH>..<HASH> 100644
--- a/grab/spider/base.py
+++ b/grab/spider/base.py
@@ -781,14 +781,14 @@ class Spider(object):
# even if `proxy` options is set with another proxy server
grab.setup(connection_reuse=False)
if self.proxy_auto_change:
- self.proxy = self.change_proxy(task, grab)
-
- def change_proxy(self, task, grab):
- proxy = self.proxylist.get_random_proxy()
- grab.setup(proxy=proxy.get_address(),
- proxy_userpwd=proxy.get_userpwd(),
- proxy_type=proxy.proxy_type)
- return proxy
+ self.change_active_proxy(task)
+ if self.proxy:
+ grab.setup(proxy=self.proxy.get_address(),
+ proxy_userpwd=self.proxy.get_userpwd(),
+ proxy_type=self.proxy.proxy_type)
+
+ def change_active_proxy(self, task, grab):
+ self.proxy = self.proxylist.get_random_proxy()
def submit_task_to_transport(self, task, grab):
if self.only_cache:
|
Refactored the selection of active proxy for the spider tasks
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,9 +31,11 @@
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
-extensions = ['sphinx.ext.autodoc',
+extensions = [
+ 'sphinx.ext.autodoc',
'sphinx.ext.doctest',
- 'sphinx.ext.intersphinx']
+ 'sphinx.ext.intersphinx',
+]
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
@@ -49,7 +51,7 @@ master_doc = 'index'
# General information about the project.
project = 'Seaworthy'
-copyright = '2017, Jamie Hewland & Jeremy Thurgood'
+copyright = '2017, Praekelt.org'
author = 'Jamie Hewland & Jeremy Thurgood'
# The version info for the project you're documenting, acts as replacement for
@@ -168,7 +170,5 @@ texinfo_documents = [
]
-
-
# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}
|
docs: Clean up conf.py a bit
|
diff --git a/command.go b/command.go
index <HASH>..<HASH> 100644
--- a/command.go
+++ b/command.go
@@ -1269,7 +1269,7 @@ func SetCommandBufferPool(poolSize, initBufSize, maxBufferSize int) {
panic("There is no need to optimize the buffer pool anymore. Buffers have moved to Connection object.")
}
-func (cmd *baseCommand) execute(ifc command) (err error) {
+func (cmd *baseCommand) execute(ifc command) error {
policy := ifc.getPolicy(ifc).GetBasePolicy()
iterations := -1
@@ -1279,6 +1279,11 @@ func (cmd *baseCommand) execute(ifc command) (err error) {
// set timeout outside the loop
deadline := time.Now().Add(policy.Timeout)
+ socketTimeout, err := policy.socketTimeout()
+ if err != nil {
+ return err
+ }
+
// Execute command until successful, timed out or maximum iterations have been reached.
for {
// too many retries
@@ -1306,11 +1311,6 @@ func (cmd *baseCommand) execute(ifc command) (err error) {
continue
}
- socketTimeout, err := policy.socketTimeout()
- if err != nil {
- return err
- }
-
cmd.conn, err = ifc.getConnection(socketTimeout)
if err != nil {
Logger.Warn("Node " + cmd.node.String() + ": " + err.Error())
|
Get socket timeout once per command execution, do not redefine err var in command execution loop
|
diff --git a/lib/spec.js b/lib/spec.js
index <HASH>..<HASH> 100644
--- a/lib/spec.js
+++ b/lib/spec.js
@@ -19,6 +19,9 @@ var debug = require('debug')('electrolyte');
* @protected
*/
function Spec(id, dependencies, mod) {
+ var keys = Object.keys(mod)
+ , i, len;
+
this.id = id;
this.dependencies = dependencies;
this.singleton = mod['@singleton'];
@@ -26,6 +29,12 @@ function Spec(id, dependencies, mod) {
if (typeof this.implements == 'string') {
this.implements = [ this.implements ]
}
+ this.a = {};
+ for (i = 0, len = keys.length; i < len; ++i) {
+ if (keys[i].indexOf('@') == 0) {
+ this.a[keys[i]] = mod[keys[i]];
+ }
+ }
this._module = mod;
this._initialized = false;
|
Stash all annotations on the spec.
|
diff --git a/p2p/dial.go b/p2p/dial.go
index <HASH>..<HASH> 100644
--- a/p2p/dial.go
+++ b/p2p/dial.go
@@ -157,7 +157,7 @@ func (s *dialstate) removeStatic(n *discover.Node) {
}
func (s *dialstate) newTasks(nRunning int, peers map[discover.NodeID]*Peer, now time.Time) []task {
- if s.start == (time.Time{}) {
+ if s.start.IsZero() {
s.start = now
}
diff --git a/swarm/network/kademlia/kaddb.go b/swarm/network/kademlia/kaddb.go
index <HASH>..<HASH> 100644
--- a/swarm/network/kademlia/kaddb.go
+++ b/swarm/network/kademlia/kaddb.go
@@ -330,7 +330,7 @@ func (self *KadDb) load(path string, cb func(*NodeRecord, Node) error) (err erro
}
}
n++
- if (node.After == time.Time{}) {
+ if node.After.IsZero() {
node.After = time.Now()
}
self.index[node.Addr] = node
|
p2p, swarm/network/kademlia: use IsZero to check for zero time (#<I>)
|
diff --git a/tests/settings.py b/tests/settings.py
index <HASH>..<HASH> 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -8,5 +8,5 @@ DATABASES = {
SECRET_KEY = 'tests'
INSTALLED_APPS = (
- 'tests'
+ 'tests',
)
|
Fix 'INSTALLED_APPS setting must be a list or a tuple' error
|
diff --git a/src/LdapTools/DomainConfiguration.php b/src/LdapTools/DomainConfiguration.php
index <HASH>..<HASH> 100644
--- a/src/LdapTools/DomainConfiguration.php
+++ b/src/LdapTools/DomainConfiguration.php
@@ -265,7 +265,6 @@ class DomainConfiguration
public function setPort($port)
{
$this->config['port'] = $this->validateInteger($port, "port number");
- ;
return $this;
}
|
Fix incorrectly added semi-colon after CS fix script.
|
diff --git a/moco-core/src/main/java/com/github/dreamhead/moco/internal/WebsocketHandler.java b/moco-core/src/main/java/com/github/dreamhead/moco/internal/WebsocketHandler.java
index <HASH>..<HASH> 100644
--- a/moco-core/src/main/java/com/github/dreamhead/moco/internal/WebsocketHandler.java
+++ b/moco-core/src/main/java/com/github/dreamhead/moco/internal/WebsocketHandler.java
@@ -21,6 +21,10 @@ public class WebsocketHandler {
public void handleFrame(final ChannelHandlerContext ctx,
final WebSocketFrame message) {
+ if (this.websocketServer == null) {
+ return;
+ }
+
Optional<WebSocketFrame> frame = getResponseFrame(ctx, message);
frame.ifPresent(webSocketFrame -> ctx.channel().writeAndFlush(webSocketFrame));
}
|
added guard for handle frame in websocket handler
|
diff --git a/src/transports/remote.js b/src/transports/remote.js
index <HASH>..<HASH> 100644
--- a/src/transports/remote.js
+++ b/src/transports/remote.js
@@ -78,6 +78,10 @@ function jsonDepth(json, depth) {
}
if (typeof json === 'object') {
+ if (json instanceof Error) {
+ return json.stack || json.constructor.name + ': ' + json.message;
+ }
+
if (typeof json.toJSON === 'function') {
json = json.toJSON();
}
|
remote: Serialize Error instances correctly.
|
diff --git a/spec/compiler_spec.rb b/spec/compiler_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/compiler_spec.rb
+++ b/spec/compiler_spec.rb
@@ -32,8 +32,14 @@ module CorrespondenceMarkup
it "compiles with backslash quoting" do
parse("a\\[23\\] = b \\\\ c", :text).value.should == "a[23] = b \\ c"
+ parse("a\\[23\\] = b \\\\ c", :non_item).value.should == NonItem.new("a[23] = b \\ c")
+ parse("[31 a\\[23\\] = c]", :item).value.should == Item.new(31, "a[23] = c")
end
+ it "compiles with backslash quoting, matching forward only (no overlaps)" do
+ parse("\\[\\\\\\\\\\]", :text).value.should == "[\\\\]"
+ end
+
it "compiles structure" do
parse("[1 an item] in between stuff [2 a second item]", :structure).value.should ==
Structure.new([Item.new(1, "an item"), NonItem.new(" in between stuff "),
|
more backslash quoting tests
|
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -13,7 +13,6 @@ require 'active_support/core_ext/kernel/singleton_class'
require 'active_support/core_ext/module/introspection'
require 'active_support/core_ext/object/duplicable'
require 'active_support/core_ext/class/subclasses'
-require 'arel'
require 'active_record/attribute_decorators'
require 'active_record/errors'
require 'active_record/log_subscriber'
|
Remove duplicated `require 'arel'`
It appears first in `lib/active_record.rb`.
|
diff --git a/bcbio/qc/multiqc.py b/bcbio/qc/multiqc.py
index <HASH>..<HASH> 100644
--- a/bcbio/qc/multiqc.py
+++ b/bcbio/qc/multiqc.py
@@ -198,9 +198,9 @@ def _work_path_to_rel_final_path(path, upload_path_mapping, upload_base_dir):
return path
upload_path = None
for work_path, final_path in upload_path_mapping.items():
- if os.path.isfile(work_path) and path == work_path:
+ if path == work_path and os.path.isfile(work_path):
upload_path = final_path
- elif os.path.isdir(work_path) and path.startswith(work_path):
+ elif path.startswith(work_path) and os.path.isdir(work_path):
upload_path = path.replace(work_path, final_path)
if upload_path:
return os.path.relpath(upload_path, upload_base_dir)
|
MultiQC: avoid os.stat lookups when preparing final paths
Attempts to do less filesystem checks to avoid long runtimes on slow
filesystems. Fixes #<I>
|
diff --git a/test/test_generic_http_grabber.rb b/test/test_generic_http_grabber.rb
index <HASH>..<HASH> 100644
--- a/test/test_generic_http_grabber.rb
+++ b/test/test_generic_http_grabber.rb
@@ -1,9 +1,9 @@
-require File.dirname(__FILE__) + '/helper'
+#require File.dirname(__FILE__) + '/helper'
-class GenericHttpGrabberTest < Test::Unit::TestCase
+# class GenericHttpTest < Test::Unit::TestCase
- context "The GenericHttpGrabber" do
- end
+# # context "The GenericHttpGrabber" do
+# # end
-end
+# end
|
Commenting our GenericHttpGrabber test setup until we have tests.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.