diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/datasette/app.py b/datasette/app.py
index <HASH>..<HASH> 100644
--- a/datasette/app.py
+++ b/datasette/app.py
@@ -442,7 +442,7 @@ class RowTableShared(BaseView):
'<a href="/{database}-{database_hash}/{table}/{id}">{label}</a> <em>{id}</em>'.format(
database=database,
database_hash=database_hash,
- table=escape_sqlite_table_name(other_table),
+ table=urllib.parse.quote_plus(other_table),
id=value,
label=label,
)
|
Fixed quoting on foreign-key links to tables with spaces in name
|
diff --git a/spec/unit/pdk/cli/util/command_redirector_spec.rb b/spec/unit/pdk/cli/util/command_redirector_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/pdk/cli/util/command_redirector_spec.rb
+++ b/spec/unit/pdk/cli/util/command_redirector_spec.rb
@@ -1,4 +1,5 @@
require 'spec_helper'
+require 'pdk/cli/util/command_redirector'
describe PDK::CLI::Util::CommandRedirector do
subject(:command_redirector) do
|
(maint) Ensure pdk/cli/util/command_redirector works standalone
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ def readme():
return f.read()
setup(name='pyTelegramBotAPI',
- version='1.4.1',
+ version='1.4.2',
description='Python Telegram bot api. ',
long_description=readme(),
author='eternnoir',
|
Version Update.
Change log:
- Add disable_notification parameter.
- Added setters for message/inline/chosen-inline handlers.
|
diff --git a/init.js b/init.js
index <HASH>..<HASH> 100644
--- a/init.js
+++ b/init.js
@@ -10,7 +10,7 @@ var S_loadSyncScript=function(path){
};
//http://kangax.github.io/es5-compat-table/
//http://kangax.github.io/es5-compat-table/es6/ Promise: FF >= 30, Chrome >= 33
-if (!Object.keys || !(typeof Promise !== 'undefined' && typeof Promise.all === 'function')) {
+if (!Object.keys || !(typeof Promise !== 'undefined' && typeof Promise.all === 'function') || !String.prototype.startsWith) {
Object.keys || S_loadSyncScript('dist/es5-compat.js');
S_loadSyncScript('dist/es6-compat.js');
-}
\ No newline at end of file
+}
|
<I> Update init.js
In Chromium <I> Promise is defined but String.prototype.startsWith is still not
|
diff --git a/search_queries_query_string.go b/search_queries_query_string.go
index <HASH>..<HASH> 100644
--- a/search_queries_query_string.go
+++ b/search_queries_query_string.go
@@ -201,6 +201,10 @@ func (q QueryStringQuery) Source() interface{} {
query["tie_breaker"] = *q.tieBreaker
}
+ if q.useDisMax != nil {
+ query["use_dis_max"] = *q.useDisMax
+ }
+
if q.defaultOper != "" {
query["default_operator"] = q.defaultOper
}
|
Forgot that use_dis_max
|
diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareTraitInjectionOperation.java b/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareTraitInjectionOperation.java
index <HASH>..<HASH> 100644
--- a/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareTraitInjectionOperation.java
+++ b/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareTraitInjectionOperation.java
@@ -92,7 +92,7 @@ public class GrailsAwareTraitInjectionOperation extends
boolean implementsTrait = false;
boolean traitNotLoaded = false;
try {
- implementsTrait = classNode.implementsInterface(traitClassNode);
+ implementsTrait = classNode.declaresInterface(traitClassNode);
} catch (Throwable e) {
// if we reach this point, the trait injector could not be loaded due to missing dependencies (for example missing servlet-api). This is ok, as we want to be able to compile against non-servlet environments.
traitNotLoaded = true;
|
Use declaresInterface instead of implementsInterface
This allows subclasses to implement the same trait as their super classes which allows them to get their own copies of static methods. grails-data-mapping needs this.
|
diff --git a/go/vt/sqlparser/token.go b/go/vt/sqlparser/token.go
index <HASH>..<HASH> 100644
--- a/go/vt/sqlparser/token.go
+++ b/go/vt/sqlparser/token.go
@@ -257,6 +257,7 @@ var keywords = map[string]int{
"lines": LINES,
"linestring": LINESTRING,
"load": LOAD,
+ "local": LOCAL,
"localtime": LOCALTIME,
"localtimestamp": LOCALTIMESTAMP,
"lock": LOCK,
@@ -264,7 +265,7 @@ var keywords = map[string]int{
"longblob": LONGBLOB,
"longtext": LONGTEXT,
"loop": UNUSED,
- "low_priority": UNUSED,
+ "low_priority": LOW_PRIORITY,
"manifest": MANIFEST,
"master_bind": UNUSED,
"match": MATCH,
|
Added tokens LOW_PRIORITY and LOCAL
|
diff --git a/pullv/repo/base.py b/pullv/repo/base.py
index <HASH>..<HASH> 100644
--- a/pullv/repo/base.py
+++ b/pullv/repo/base.py
@@ -47,7 +47,7 @@ class BaseRepo(collections.MutableMapping, RepoLoggingAdapter):
"""Base class for repositories.
Extends :py:class:`collections.MutableMapping` and
- :py:class`logging.LoggerAdapter`.
+ :py:class:`logging.LoggerAdapter`.
"""
|
Typo in intersphinx link to logging.LoggerAdapter.
|
diff --git a/rst2ansi/ansi.py b/rst2ansi/ansi.py
index <HASH>..<HASH> 100644
--- a/rst2ansi/ansi.py
+++ b/rst2ansi/ansi.py
@@ -208,7 +208,7 @@ class ANSITranslator(nodes.NodeVisitor):
def visit_document(self, node):
self.push_ctx()
- def depart_document(self, node):
+ def _print_references(self):
self.push_style(styles = ['bold'])
self.append('References:')
self.pop_style()
@@ -225,6 +225,8 @@ class ANSITranslator(nodes.NodeVisitor):
self.references = []
self.pop_ctx()
+ def depart_document(self, node):
+ self._print_references()
self.depart_section(node)
self.pop_ctx()
|
Refactored reference list into its own function
|
diff --git a/radiotool/algorithms/retarget.py b/radiotool/algorithms/retarget.py
index <HASH>..<HASH> 100644
--- a/radiotool/algorithms/retarget.py
+++ b/radiotool/algorithms/retarget.py
@@ -258,8 +258,8 @@ def retarget(song, duration, music_labels=None, out_labels=None, out_penalty=Non
first_pause = i
break
- max_beats = 200
- min_beats = 40
+ max_beats = int(60. / song.analysis["avg_beat_duration"]) # ~ 1 minute
+ min_beats = int(30. / song.analysis["avg_beat_duration"]) # ~ 30 seconds
max_beats = min(max_beats, penalty.shape[1])
tc2 = N.nan_to_num(trans_cost)
|
change defaults for max and min music beats
|
diff --git a/tests/jenkins.py b/tests/jenkins.py
index <HASH>..<HASH> 100644
--- a/tests/jenkins.py
+++ b/tests/jenkins.py
@@ -62,6 +62,9 @@ def run(platform, provider, commit, clean):
sys.stdout.flush()
sys.exit(proc.returncode)
+ print('VM Bootstrapped. Exit code: {0}'.format(proc.returncode))
+ sys.stdout.flush()
+
# Run tests here
cmd = 'salt -t 1800 {0} state.sls testrun pillar="{{git_commit: {1}}}" --no-color'.format(
vm_name,
@@ -78,6 +81,7 @@ def run(platform, provider, commit, clean):
)
proc.poll_and_read_until_finish()
stdout, stderr = proc.communicate()
+
if stderr:
print(stderr)
if stdout:
|
Some more information about the bootstrap process.
|
diff --git a/pandas/core/groupby.py b/pandas/core/groupby.py
index <HASH>..<HASH> 100644
--- a/pandas/core/groupby.py
+++ b/pandas/core/groupby.py
@@ -1579,7 +1579,7 @@ class NDFrameGroupBy(GroupBy):
if self.axis != 0: # pragma: no cover
raise ValueError('Can only pass dict with axis=0')
- obj = self._obj_with_exclusions
+ obj = self.obj
if any(isinstance(x, (list, tuple, dict)) for x in arg.values()):
new_arg = OrderedDict()
|
ENH: don't make unnecessary data copy in groupby
|
diff --git a/karma.conf.js b/karma.conf.js
index <HASH>..<HASH> 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -2,6 +2,7 @@ process.env.ethTest = 'BasicTests'
module.exports = function (config) {
config.set({
+ browserNoActivityTimeout: 60000,
frameworks: ['browserify', 'detectBrowsers', 'tap'],
files: [
'./tests/genesis.js',
|
uped the browser timeout for travis
|
diff --git a/src/Sniffs/ForbiddenSuperGlobalSniff.php b/src/Sniffs/ForbiddenSuperGlobalSniff.php
index <HASH>..<HASH> 100644
--- a/src/Sniffs/ForbiddenSuperGlobalSniff.php
+++ b/src/Sniffs/ForbiddenSuperGlobalSniff.php
@@ -16,7 +16,9 @@ final class ForbiddenSuperGlobalSniff implements Sniff
/**
* @var string[]
*/
- private $superglobalVariables = ['$_COOKIE', '$_GET', '$_FILES', '$_POST', '$_REQUEST', '$_SERVER'];
+ private $superglobalVariables = [
+ '$_COOKIE', '$_GET', '$_FILES', '$_POST', '$_REQUEST', '$_SERVER', '$_SESSION', '$_ENV', '$GLOBALS',
+ ];
/**
* @return int[]
|
ForbiddenSuperGlobalSniff - add few missing global vars
|
diff --git a/tests/Integration/WhereConstraints/WhereConstraintsDirectiveTest.php b/tests/Integration/WhereConstraints/WhereConstraintsDirectiveTest.php
index <HASH>..<HASH> 100644
--- a/tests/Integration/WhereConstraints/WhereConstraintsDirectiveTest.php
+++ b/tests/Integration/WhereConstraints/WhereConstraintsDirectiveTest.php
@@ -204,7 +204,7 @@ class WhereConstraintsDirectiveTest extends DBTestCase
'name' => '',
]);
- $this->query('
+ $this->graphQL('
{
users(
where: {
|
Fix WhereConstraintsDirectiveTest.php
|
diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js
index <HASH>..<HASH> 100644
--- a/javascript/HtmlEditorField.js
+++ b/javascript/HtmlEditorField.js
@@ -874,7 +874,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
//get the uploaded file ID when this event triggers, signaling the upload has compeleted successfully
editFieldIDs.push($(this).data('id'));
});
- var uploadedFiles = $('.ss-uploadfield-files').children('.ss-uploadfield-item');
+ var uploadedFiles = form.find('.ss-uploadfield-files').children('.ss-uploadfield-item');
uploadedFiles.each(function(){
var uploadedID = $(this).data('fileid');
if ($.inArray(uploadedID, editFieldIDs) == -1) {
|
BUG Fix insert media form inserting images from other UploadFields (fixes #<I>)
The insert media form would pick up unwanted images from other
UploadFields. Limiting where it is looking to only the closest form
fixes this.
|
diff --git a/lib/demo.js b/lib/demo.js
index <HASH>..<HASH> 100644
--- a/lib/demo.js
+++ b/lib/demo.js
@@ -15,6 +15,6 @@ export class Demo {
this.template = template || path.resolve(__dirname, 'default-template.jade');
const specs = opt.specs && path.resolve(this.path, opt.specs);
- this.specs = specs || path.resolve(this.path, 'specs/**/*.js');
+ this.specs = specs || path.resolve(this.path, 'spec/**/*.js');
}
}
|
rename default spec folder from specs to spec
|
diff --git a/yelp_kafka_tool/kafka_consumer_manager/commands/offset_manager.py b/yelp_kafka_tool/kafka_consumer_manager/commands/offset_manager.py
index <HASH>..<HASH> 100644
--- a/yelp_kafka_tool/kafka_consumer_manager/commands/offset_manager.py
+++ b/yelp_kafka_tool/kafka_consumer_manager/commands/offset_manager.py
@@ -55,6 +55,14 @@ class OffsetManagerBase(object):
sys.exit(1)
# Get all the topics that this consumer is subscribed to.
+ print(
+ "Getting all topics in cluster {cluster_name} "
+ "for consumer {groupid}".format(
+ cluster_name=cluster_config.name,
+ groupid=groupid,
+ ),
+ file=sys.stderr,
+ )
topics = cls.get_topics_from_consumer_group_id(
cluster_config,
groupid,
|
KAFKA-<I>: Add print out of cluster name before getting information about a topic.
|
diff --git a/packages/keyhub-vault-web/src/vault.js b/packages/keyhub-vault-web/src/vault.js
index <HASH>..<HASH> 100644
--- a/packages/keyhub-vault-web/src/vault.js
+++ b/packages/keyhub-vault-web/src/vault.js
@@ -417,6 +417,7 @@ export default function loadVault(window, document, mainElement) {
// callback to the parent window with result
const run = () =>
callback(null, {
+ address,
publicKey,
signature,
phoneNumber,
@@ -470,6 +471,7 @@ export default function loadVault(window, document, mainElement) {
// callback to the parent window with result
const run = () =>
callback(null, {
+ address,
publicKey,
signature,
})
|
return the address to main app on newKey action
|
diff --git a/openquake/calculators/classical.py b/openquake/calculators/classical.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/classical.py
+++ b/openquake/calculators/classical.py
@@ -244,8 +244,8 @@ class ClassicalCalculator(base.HazardCalculator):
oq = self.oqparam
N = len(self.sitecol)
trt_sources = self.csm.get_trt_sources(optimize_dupl=True)
- maxweight = min(self.csm.get_maxweight(
- trt_sources, weight, oq.concurrent_tasks), 1E6)
+ maxweight = self.csm.get_maxweight(
+ trt_sources, weight, oq.concurrent_tasks)
maxdist = int(max(oq.maximum_distance.values()))
if oq.task_duration is None: # inferred
# from 1 minute up to 1 day
|
Removed maxweight limit to 1E6 [skip CI]
|
diff --git a/www/src/py_dom.js b/www/src/py_dom.js
index <HASH>..<HASH> 100644
--- a/www/src/py_dom.js
+++ b/www/src/py_dom.js
@@ -284,7 +284,7 @@ DOMEvent.__new__ = function(cls, evt_name){
function dom2svg(svg_elt, coords){
// Used to compute the mouse position relatively to the upper left corner
- // of an SVG element, based on the coordinates coords.x, coords.y that are
+ // of an SVG element, based on the coordinates coords.x, coords.y that are
// relative to the browser screen.
var pt = svg_elt.createSVGPoint()
pt.x = coords.x
@@ -337,7 +337,8 @@ DOMEvent.__getattribute__ = function(self, attr){
return res.apply(self, arguments)
}
func.$infos = {
- __name__: res.toString().substr(9, res.toString().search("{"))
+ __name__: res.name,
+ __qualname__: res.name
}
return func
}
|
Add attributes to DOMEvent attributes that are functions
|
diff --git a/container/__init__.py b/container/__init__.py
index <HASH>..<HASH> 100644
--- a/container/__init__.py
+++ b/container/__init__.py
@@ -5,4 +5,4 @@ import logging
logger = logging.getLogger(__name__)
-__version__ = '0.1.0'
+__version__ = '0.2.0-pre'
|
Increment version to <I>-pre
|
diff --git a/gcalcli/argparsers.py b/gcalcli/argparsers.py
index <HASH>..<HASH> 100644
--- a/gcalcli/argparsers.py
+++ b/gcalcli/argparsers.py
@@ -283,7 +283,7 @@ def get_argument_parser():
"time part of the --when will be ignored.")
add.add_argument(
"--noprompt", action="store_false", dest="prompt", default=True,
- help="Prompt for missing data when adding events")
+ help="Don't prompt for missing data when adding events")
_import = sub.add_parser("import", parents=[remind_parser])
_import.add_argument(
|
now the help message is correct for noprompt
|
diff --git a/src/ducks/registry/index.js b/src/ducks/registry/index.js
index <HASH>..<HASH> 100644
--- a/src/ducks/registry/index.js
+++ b/src/ducks/registry/index.js
@@ -83,15 +83,25 @@ export const initializeRegistry = konnectors => {
.then(context => {
const konnectorsToExclude =
!!context.attributes && context.attributes.exclude_konnectors
+ const filteredKonnectors =
+ context.attributes && context.attributes.debug
+ ? konnectors
+ : konnectors.filter(
+ k => !k.categories.includes('banking') && k.slug !== 'debug'
+ )
+
if (konnectorsToExclude && konnectorsToExclude.length) {
return dispatch({
type: FETCH_REGISTRY_KONNECTORS_SUCCESS,
- konnectors: konnectors.filter(
+ konnectors: filteredKonnectors.filter(
k => !konnectorsToExclude.includes(k.slug)
)
})
}
- return dispatch({ type: FETCH_REGISTRY_KONNECTORS_SUCCESS, konnectors })
+ return dispatch({
+ type: FETCH_REGISTRY_KONNECTORS_SUCCESS,
+ konnectors: filteredKonnectors
+ })
})
.catch(() => {
dispatch({ type: FETCH_REGISTRY_KONNECTORS_ERROR, konnectors: [] })
|
feat: filter konnectors categories based on environment ✨
|
diff --git a/lib/views/base-line-graph.js b/lib/views/base-line-graph.js
index <HASH>..<HASH> 100644
--- a/lib/views/base-line-graph.js
+++ b/lib/views/base-line-graph.js
@@ -48,9 +48,7 @@ BaseLineGraph.prototype.setLayout = function (layoutConfig) {
// Should be called by child's onEvent handler
BaseLineGraph.prototype.update = function (value, highwater) {
- if (this.values.length >= this.maxLimit) {
- this.values.shift();
- }
+ this.values.shift();
this.values.push(value);
this.series.y = this.values.slice(-1 * this.layoutConfig.limit);
|
remove n/a branch in base line graph
values is always kept at length of maxLimit
|
diff --git a/node_api_client.go b/node_api_client.go
index <HASH>..<HASH> 100644
--- a/node_api_client.go
+++ b/node_api_client.go
@@ -262,6 +262,8 @@ type NodeInfoResponse struct {
IsHealthy bool `json:"isHealthy"`
// The human friendly name of the network ID on which the node operates on.
NetworkID string `json:"networkId"`
+ // The minimum pow score of the network.
+ MinPowScore float64 `json:"minPowScore"`
// The hex encoded ID of the latest known milestone.
LatestMilestoneID string `json:"latestMilestoneId"`
// The latest known milestone index.
diff --git a/node_api_client_test.go b/node_api_client_test.go
index <HASH>..<HASH> 100644
--- a/node_api_client_test.go
+++ b/node_api_client_test.go
@@ -44,6 +44,7 @@ func TestNodeAPI_Info(t *testing.T) {
Version: "1.0.0",
IsHealthy: true,
NetworkID: "alphanet@1",
+ MinPowScore: 4000.0,
LatestMilestoneID: "5e4a89c549456dbec74ce3a21bde719e9cd84e655f3b1c5a09058d0fbf9417fe",
LatestMilestoneIndex: 1337,
SolidMilestoneID: "598f7a3186bf7291b8199a3147bb2a81d19b89ac545788b4e5d8adbee7db0f13",
|
Add minPowScore to node info (#<I>)
|
diff --git a/pyblish_qml/host.py b/pyblish_qml/host.py
index <HASH>..<HASH> 100644
--- a/pyblish_qml/host.py
+++ b/pyblish_qml/host.py
@@ -677,7 +677,10 @@ def _install_blender(use_threaded_wrapper):
wm = context.window_manager
wm.event_timer_remove(self._timer)
# Quit the Pyblish QML GUI, else it will be unresponsive
- quit()
+ server = _state.get("currentServer")
+ if server:
+ proxy = ipc.server.Proxy(server)
+ proxy.quit()
log.info("Registering Blender + Pyblish operator")
bpy.utils.register_class(PyblishQMLOperator)
|
Explicitly call `proxy.quit()` to make clear the proxy needs to quit
|
diff --git a/lib/janus_gateway/plugin/rtpbroadcast/mountpoint.rb b/lib/janus_gateway/plugin/rtpbroadcast/mountpoint.rb
index <HASH>..<HASH> 100644
--- a/lib/janus_gateway/plugin/rtpbroadcast/mountpoint.rb
+++ b/lib/janus_gateway/plugin/rtpbroadcast/mountpoint.rb
@@ -6,10 +6,10 @@ module JanusGateway::Plugin
# @param [JanusGateway::Plugin::Rtpbroadcast] plugin
# @param [String] id
# @param [Array] streams
- def initialize(client, plugin, id, streams = nil, mountpoint_data = nil)
+ def initialize(client, plugin, id, streams = nil, channel_data = nil)
@plugin = plugin
@data = nil
- @mountpoint_data = mountpoint_data
+ @channel_data = channel_data
@streams = streams || [
{
@@ -41,7 +41,7 @@ module JanusGateway::Plugin
:description => id,
:recorded => true,
:streams => @streams,
- :channel_data => @mountpoint_data
+ :channel_data => @channel_data
}
}
).then do |data|
|
Renamed mountpoint_data with channel_data
|
diff --git a/lib/3scale_toolbox/entities/service.rb b/lib/3scale_toolbox/entities/service.rb
index <HASH>..<HASH> 100644
--- a/lib/3scale_toolbox/entities/service.rb
+++ b/lib/3scale_toolbox/entities/service.rb
@@ -220,7 +220,12 @@ module ThreeScaleToolbox
end
def policies
- remote.show_policies id
+ policy_chain = remote.show_policies id
+ if policy_chain.respond_to?(:has_key?) && (errors = policy_chain['errors'])
+ raise ThreeScaleToolbox::ThreeScaleApiError.new('Service policies not read', errors)
+ end
+
+ policy_chain
end
def update_policies(params)
@@ -355,7 +360,8 @@ module ThreeScaleToolbox
end,
'methods' => method_objects(hits_object).each_with_object({}) do |method, hash|
hash[method.system_name] = method.to_crd
- end
+ end,
+ 'policies' => policies
}
}
end
|
product to_crd policy chain
|
diff --git a/scripts/wee-routes.js b/scripts/wee-routes.js
index <HASH>..<HASH> 100644
--- a/scripts/wee-routes.js
+++ b/scripts/wee-routes.js
@@ -81,14 +81,31 @@ function _parseUrl(value) {
}
export default {
+ /**
+ * Register routes
+ *
+ * @param {Array} routes
+ * @returns {Object}
+ */
map(routes) {
_add(routes);
return this;
},
+
+ /**
+ * Reset all routes - mainly for testing purposes
+ */
reset() {
_routes = [];
},
+
+ /**
+ * Retrieve all routes or specific route by name/path
+ *
+ * @param {string} [value]
+ * @returns {Object|Array}
+ */
routes(value) {
if (value) {
let result = _getRoute(value);
|
Add code comments to currently defined public route methods
|
diff --git a/lib/risky/secondary_indexes.rb b/lib/risky/secondary_indexes.rb
index <HASH>..<HASH> 100644
--- a/lib/risky/secondary_indexes.rb
+++ b/lib/risky/secondary_indexes.rb
@@ -69,6 +69,8 @@ module Risky::SecondaryIndexes
end
def paginate_keys_by_index(index2i, value, opts = {})
+ opts.reject! { |k, v| v.nil? }
+
index = "#{index2i}_#{indexes2i[index2i.to_s][:type]}"
bucket.get_index(index, value, opts)
end
|
Don't send nil options to riak-client
|
diff --git a/lib/room.js b/lib/room.js
index <HASH>..<HASH> 100644
--- a/lib/room.js
+++ b/lib/room.js
@@ -192,9 +192,11 @@ class Room {
let user;
const usersArray = [];
- for (let i = 0; i < ids.length; i++) {
- user = this.getUser(ids[i]);
- if (user != null) usersArray.push(user);
+ if (ids) {
+ for (let i = 0; i < ids.length; i++) {
+ user = this.getUser(ids[i]);
+ if (user != null) usersArray.push(user);
+ }
}
return usersArray;
|
Fix: Do not assume we were given a valid array for room.usersToArray
Fixes #<I> (#<I>)
|
diff --git a/REST/TwitterClient.php b/REST/TwitterClient.php
index <HASH>..<HASH> 100755
--- a/REST/TwitterClient.php
+++ b/REST/TwitterClient.php
@@ -100,7 +100,7 @@ class TwitterClient
return $this;
} catch (Exception $e) {
- throw new ExternalApiException($e->getMessage(), $e->getCode());
+ throw new ExternalApiException($e->getMessage(), $e->getCode(), $e);
}
}
@@ -110,7 +110,7 @@ class TwitterClient
$res = $this->client->request($method, $uri, $body);
return json_decode($res->getBody(), true);
} catch(Exception $e){
- throw new ExternalApiException($e->getMessage(), $e->getCode());
+ throw new ExternalApiException($e->getMessage(), $e->getCode(), $e);
}
}
|
CampaignChain/campaignchain#<I> Use guzzlehttp/guzzle instead of guzzle/guzzle
|
diff --git a/Kwf/Media.php b/Kwf/Media.php
index <HASH>..<HASH> 100644
--- a/Kwf/Media.php
+++ b/Kwf/Media.php
@@ -225,6 +225,19 @@ class Kwf_Media
return Kwf_Config::getValue('mediaCacheDir').'/'.$class.'/'.$groupingFolder.'/'.$id.'/'.$type;
}
+ private static function _deleteFolder($path)
+ {
+ foreach (array_slice(scandir($path), 2) as $fileOrFolder) {
+ $fileOrFolderPath = $path.'/'.$fileOrFolder;
+ if (is_file($fileOrFolderPath)) {
+ unlink($fileOrFolderPath);
+ } else {
+ self::_deleteFolder($fileOrFolderPath);
+ }
+ }
+ rmdir($path);
+ }
+
public static function collectGarbage($debug)
{
$cacheFolder = Kwf_Config::getValue('mediaCacheDir');
@@ -233,6 +246,11 @@ class Kwf_Media
foreach ($mediaClasses as $mediaClass) {
if (is_file($cacheFolder.'/'.$mediaClass)) continue;
+ if (!class_exists($mediaClass)) {
+ self::_deleteFolder($cacheFolder.'/'.$mediaClass);
+ continue;
+ }
+
if (!is_instance_of($mediaClass, 'Kwf_Media_Output_ClearCacheInterface')) continue;
$classFolder = $cacheFolder.'/'.$mediaClass;
|
Delete mediaCache-folders for removed components
This is also required as is_instance_of throws exception if class
is not existing.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -191,7 +191,7 @@ if 'bdist_wheel' in sys.argv and '--plat-name' not in sys.argv:
sys.argv.append(name.replace('.', '_').replace('-', '_'))
setup(
- name="pyvex", version='9.0.gitrolling', description="A Python interface to libVEX and VEX IR",
+ name="pyvex", version='9.1.gitrolling', description="A Python interface to libVEX and VEX IR",
python_requires='>=3.6',
url='https://github.com/angr/pyvex',
packages=packages,
@@ -199,7 +199,7 @@ setup(
install_requires=[
'pycparser',
'cffi>=1.0.3',
- 'archinfo==9.0.gitrolling',
+ 'archinfo==9.1.gitrolling',
'bitstring',
'future',
],
|
Bump minor version to <I>
|
diff --git a/src/Jaeger/Tracer.php b/src/Jaeger/Tracer.php
index <HASH>..<HASH> 100644
--- a/src/Jaeger/Tracer.php
+++ b/src/Jaeger/Tracer.php
@@ -133,7 +133,7 @@ class Tracer implements OTTracer
$hostname = $this->getHostName();
$this->ipAddress = $this->getHostByName($hostname);
- if (empty($hostname) != false) {
+ if (!empty($hostname)) {
$this->tags[JAEGER_HOSTNAME_TAG_KEY] = $hostname;
}
}
|
Fix condition in tracer to set the hostname
|
diff --git a/config/application.rb b/config/application.rb
index <HASH>..<HASH> 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -26,6 +26,29 @@ module Peoplefinder
ActionView::Base.default_form_builder = GovukElementsFormBuilder::FormBuilder
+ # Use AES-256-GCM authenticated encryption for encrypted cookies.
+ # Also, embed cookie expiry in signed or encrypted cookies for increased security.
+ #
+ # This option is not backwards compatible with earlier Rails versions.
+ # It's best enabled when your entire app is migrated and stable on 5.2.
+ #
+ # Existing cookies will be converted on read then written with the new scheme.
+ config.action_dispatch.use_authenticated_cookie_encryption = true
+
+ # Use AES-256-GCM authenticated encryption as default cipher for encrypting messages
+ # instead of AES-256-CBC, when use_authenticated_message_encryption is set to true.
+ config.active_support.use_authenticated_message_encryption = true
+
+ # Add default protection from forgery to ActionController::Base instead of in
+ # ApplicationController.
+ config.action_controller.default_protect_from_forgery = true
+
+ # Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header.
+ config.active_support.use_sha1_digests = true
+
+ # Make `form_with` generate id attributes for any generated HTML tags.
+ config.action_view.form_with_generates_ids = true
+
# app title appears in the header bar
config.app_title = 'People Finder'
|
Added missing config value from previous upgrade back to application.rb
|
diff --git a/py/ec2_cmd.py b/py/ec2_cmd.py
index <HASH>..<HASH> 100755
--- a/py/ec2_cmd.py
+++ b/py/ec2_cmd.py
@@ -170,6 +170,8 @@ def wait_for_ssh(ips, port=22, skipAlive=True, requiredsuccess=3):
def dump_hosts_config(ec2_config, reservation, filename=DEFAULT_HOSTS_FILENAME):
+ if not filename: filename=DEFAULT_HOSTS_FILENAME
+
cfg = {}
cfg['aws_credentials'] = find_file(ec2_config['aws_credentials'])
cfg['username'] = ec2_config['username']
|
Missing None check in ec2 command
|
diff --git a/core/client/src/main/java/alluxio/hadoop/AbstractFileSystem.java b/core/client/src/main/java/alluxio/hadoop/AbstractFileSystem.java
index <HASH>..<HASH> 100644
--- a/core/client/src/main/java/alluxio/hadoop/AbstractFileSystem.java
+++ b/core/client/src/main/java/alluxio/hadoop/AbstractFileSystem.java
@@ -456,12 +456,10 @@ abstract class AbstractFileSystem extends org.apache.hadoop.fs.FileSystem {
List<URIStatus> statuses;
try {
statuses = sFileSystem.listStatus(uri);
+ } catch (FileDoesNotExistException fnte) {
+ throw new FileNotFoundException(HadoopUtils.getPathWithoutScheme(path));
} catch (AlluxioException e) {
- if (e instanceof FileDoesNotExistException) {
- throw new FileNotFoundException(HadoopUtils.getPathWithoutScheme(path));
- } else {
- throw new IOException(e);
- }
+ throw new IOException(e);
}
FileStatus[] ret = new FileStatus[statuses.size()];
|
Instead of doing instanceof, could we catch (FileDoesNotExistException ...) and then catch (AlluxioException ...)
|
diff --git a/sprockets/mixins/http/__init__.py b/sprockets/mixins/http/__init__.py
index <HASH>..<HASH> 100644
--- a/sprockets/mixins/http/__init__.py
+++ b/sprockets/mixins/http/__init__.py
@@ -6,6 +6,7 @@ requests.
"""
import asyncio
+import functools
import logging
import os
import socket
@@ -89,6 +90,7 @@ class HTTPResponse:
return len(self)
@property
+ @functools.lru_cache(1)
def body(self):
"""Returns the HTTP response body, deserialized if possible.
|
Include lru_cache
|
diff --git a/src/org/mozilla/javascript/Interpreter.java b/src/org/mozilla/javascript/Interpreter.java
index <HASH>..<HASH> 100644
--- a/src/org/mozilla/javascript/Interpreter.java
+++ b/src/org/mozilla/javascript/Interpreter.java
@@ -1703,6 +1703,8 @@ public class Interpreter {
debuggerFrame.onEnter(cx, scope, thisObj, args);
}
+ cx.interpreterSourceFile = idata.itsSourceFile;
+
Object result = undefined;
// If javaException != null on exit, it will be throw instead of
// normal return
|
Initialize cx.interpreterSourceFile with script o r function source name before starting bytecode execution so this information for the first script throw/runtime exception
|
diff --git a/randombytes.js b/randombytes.js
index <HASH>..<HASH> 100644
--- a/randombytes.js
+++ b/randombytes.js
@@ -1,9 +1,9 @@
var assert = require('nanoassert')
var randombytes = (function () {
var QUOTA = 65536 // limit for QuotaExceededException
- var crypto = typeof window !== 'undefined' ? (window.crypto || window.msCrypto) : null
+ var crypto = typeof global !== 'undefined' ? crypto = (global.crypto || global.msCrypto) : null
- function windowBytes (out, n) {
+ function browserBytes (out, n) {
for (var i = 0; i < n; i += QUOTA) {
crypto.getRandomValues(out.subarray(i, i + Math.min(n - i, QUOTA)))
}
@@ -18,7 +18,7 @@ var randombytes = (function () {
}
if (crypto && crypto.getRandomValues) {
- return windowBytes
+ return browserBytes
} else if (typeof require !== 'undefined') {
// Node.js.
crypto = require('cry' + 'pto');
|
Fix bug with undefined window in web workers
Fixes #8
|
diff --git a/src/ConfigHelper.js b/src/ConfigHelper.js
index <HASH>..<HASH> 100644
--- a/src/ConfigHelper.js
+++ b/src/ConfigHelper.js
@@ -101,6 +101,7 @@ let NATIVE_THREAD_PROPS_WHITELIST = {
writingDirection: true,
/* text color */
color: true,
+ tintColor: true,
};
function configureProps() {
|
Add tint color to native props (#<I>)
Add tint color to native props white list
|
diff --git a/src/middlewares/next-i18next-middleware.js b/src/middlewares/next-i18next-middleware.js
index <HASH>..<HASH> 100644
--- a/src/middlewares/next-i18next-middleware.js
+++ b/src/middlewares/next-i18next-middleware.js
@@ -13,25 +13,25 @@ export default function (nexti18next) {
const ignoreRoute = route(ignoreRegex)
const isI18nRoute = url => ignoreRoute(url) !== false
- let middleware = []
+ const middleware = []
if (!config.serverLanguageDetection) {
- middleware = middleware.concat([(req, res, next) => {
+ middleware.push((req, res, next) => {
if (isI18nRoute(req.url)) {
req.lng = config.defaultLanguage
}
next()
- }])
+ })
}
- middleware = middleware.concat([i18nextMiddleware.handle(i18n, { ignoreRoutes })])
+ middleware.push(i18nextMiddleware.handle(i18n, { ignoreRoutes }))
if (localeSubpaths) {
- middleware = middleware.concat([
+ middleware.push(
forceTrailingSlash(allLanguages, ignoreRegex),
lngPathDetector(ignoreRegex),
handleLanguageSubpath(allLanguages),
- ])
+ )
}
return middleware
|
Use push instead of concat in middleware
|
diff --git a/core/src/test/java/com/linecorp/armeria/common/stream/AbstractStreamMessageTest.java b/core/src/test/java/com/linecorp/armeria/common/stream/AbstractStreamMessageTest.java
index <HASH>..<HASH> 100644
--- a/core/src/test/java/com/linecorp/armeria/common/stream/AbstractStreamMessageTest.java
+++ b/core/src/test/java/com/linecorp/armeria/common/stream/AbstractStreamMessageTest.java
@@ -362,7 +362,7 @@ public abstract class AbstractStreamMessageTest {
}, true);
await().untilAsserted(() -> assertThat(stream.isOpen()).isFalse());
- assertThat(data.refCnt()).isZero();
+ await().untilAsserted(() -> assertThat(data.refCnt()).isZero());
}
@Test
@@ -396,7 +396,7 @@ public abstract class AbstractStreamMessageTest {
}, true);
await().untilAsserted(() -> assertThat(stream.isOpen()).isFalse());
- assertThat(data.refCnt()).isZero();
+ await().untilAsserted(() -> assertThat(data.refCnt()).isZero());
}
private void assertSuccess() {
|
Wait for refcnt assertions. (#<I>)
|
diff --git a/ratings/ratings_tests/tests.py b/ratings/ratings_tests/tests.py
index <HASH>..<HASH> 100644
--- a/ratings/ratings_tests/tests.py
+++ b/ratings/ratings_tests/tests.py
@@ -97,6 +97,10 @@ class RatingsTestCase(TestCase):
self.assertEqual(self.item1.ratings.count(), 1)
self.assertEqual(self.item1.ratings.all()[0], rating2)
+ # trying to remove multiple times is fine
+ self.item1.ratings.unrate(self.john)
+ self.assertEqual(self.item1.ratings.count(), 1)
+
# make sure the item2's rating is still intact
self.assertEqual(self.item2.ratings.count(), 1)
|
Adding a test to ensure that multiple calls to unrate() are safe
|
diff --git a/src/main/webapp/js/Plugins/view.js b/src/main/webapp/js/Plugins/view.js
index <HASH>..<HASH> 100644
--- a/src/main/webapp/js/Plugins/view.js
+++ b/src/main/webapp/js/Plugins/view.js
@@ -53,8 +53,8 @@ ORYX.Plugins.View = {
//Standard Values
this.zoomLevel = 1.0;
this.maxFitToScreenLevel=1.5;
- this.minZoomLevel = 0.1;
- this.maxZoomLevel = 2.5;
+ this.minZoomLevel = 0.4;
+ this.maxZoomLevel = 2.0;
this.diff=5; //difference between canvas and view port, s.th. like toolbar??
//Read properties
@@ -1493,7 +1493,7 @@ ORYX.Plugins.View = {
_checkSize:function(){
var canvasParent=this.facade.getCanvas().getHTMLContainer().parentNode;
var minForCanvas= Math.min((canvasParent.parentNode.getWidth()/canvasParent.getWidth()),(canvasParent.parentNode.getHeight()/canvasParent.getHeight()));
- return 1.05 > minForCanvas;
+ return 0.7 > minForCanvas;
},
/**
|
JBPM-<I>: cannot connect two node when you zoomed out.
|
diff --git a/typedload/__init__.py b/typedload/__init__.py
index <HASH>..<HASH> 100644
--- a/typedload/__init__.py
+++ b/typedload/__init__.py
@@ -16,6 +16,23 @@
#
# author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
+
+from typing import Any
+
+
__all__ = [
'dataloader',
+ 'load',
]
+
+
+def load(value: Any, type_: type) -> Any:
+ """
+ Quick function call to load data into a type.
+
+ It is useful to avoid creating the Loader object,
+ in case only the default parameters are used.
+ """
+ from . import dataloader
+ loader = dataloader.Loader()
+ return loader.load(value, type_)
|
Add load function to __init__
To allow a quicker usage, without creating the object.
|
diff --git a/aiohttp/server.py b/aiohttp/server.py
index <HASH>..<HASH> 100644
--- a/aiohttp/server.py
+++ b/aiohttp/server.py
@@ -239,9 +239,10 @@ class ServerHttpProtocol(aiohttp.StreamProtocol):
isinstance(handler, asyncio.Future)):
yield from handler
- except (asyncio.CancelledError,
- errors.ClientDisconnectedError):
- self.log_debug('Ignored premature client disconnection.')
+ except (asyncio.CancelledError, errors.ClientDisconnectedError):
+ if self.debug:
+ self.log_exception(
+ 'Ignored premature client disconnection.')
break
except errors.HttpProcessingError as exc:
if self.transport is not None:
@@ -275,6 +276,7 @@ class ServerHttpProtocol(aiohttp.StreamProtocol):
self.transport.close()
break
else:
+ # connection is closed
break
def handle_error(self, status=500,
|
log disconnection traceback in debug mode
|
diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
index <HASH>..<HASH> 100644
--- a/src/search/FindReplace.js
+++ b/src/search/FindReplace.js
@@ -193,8 +193,8 @@ define(function (require, exports, module) {
var queryDialog = Strings.CMD_FIND +
": <input type='text' style='width: 10em'/>" +
"<div class='navigator'>" +
- "<button id='find-prev' class='btn no-focus' title='" + Strings.BUTTON_PREV_HINT + "'>" + Strings.BUTTON_PREV + "</button>" +
- "<button id='find-next' class='btn no-focus' title='" + Strings.BUTTON_NEXT_HINT + "'>" + Strings.BUTTON_NEXT + "</button>" +
+ "<button id='find-prev' class='btn no-focus' tabindex='-1' title='" + Strings.BUTTON_PREV_HINT + "'>" + Strings.BUTTON_PREV + "</button>" +
+ "<button id='find-next' class='btn no-focus' tabindex='-1' title='" + Strings.BUTTON_NEXT_HINT + "'>" + Strings.BUTTON_NEXT + "</button>" +
"</div>" +
"<div class='message'>" +
"<span id='find-counter'></span> " +
|
disallow tabbing to prev and next buttons
|
diff --git a/firefox/src/java/org/openqa/selenium/firefox/FirefoxProfile.java b/firefox/src/java/org/openqa/selenium/firefox/FirefoxProfile.java
index <HASH>..<HASH> 100644
--- a/firefox/src/java/org/openqa/selenium/firefox/FirefoxProfile.java
+++ b/firefox/src/java/org/openqa/selenium/firefox/FirefoxProfile.java
@@ -290,6 +290,7 @@ public class FirefoxProfile {
prefs.put("extensions.update.enabled", "false");
prefs.put("extensions.update.notifyUser", "false");
prefs.put("network.manage-offline-status", "false");
+ prefs.put("network.http.max-connections-per-server", "10");
prefs.put("security.fileuri.origin_policy", "3");
prefs.put("security.fileuri.strict_origin_policy", "false");
prefs.put("security.warn_entering_secure", "false");
|
SimonStewart: Defaulting the max number of connections to use, as this is sometimes not set. This value has been plucked out of thin air, and may not match reality particularly well
r<I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ if __name__ == '__main__':
url=package_about['__url__'],
packages=find_packages(),
# dependencies
- install_requires=['typing'],
+ install_requires=['typing', 'pyyaml'],
# metadata for package search
license='MIT',
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
|
added YAML parser requirement
|
diff --git a/lib/xml/mapping_extensions/node_base.rb b/lib/xml/mapping_extensions/node_base.rb
index <HASH>..<HASH> 100644
--- a/lib/xml/mapping_extensions/node_base.rb
+++ b/lib/xml/mapping_extensions/node_base.rb
@@ -37,9 +37,9 @@ module XML
end
# Override this method to convert XML text to an object value
- # @param _xml_text [String] The XML string to parse
+ # @param xml_text [String] The XML string to parse
# @return [Object] The object value
- def to_value(_xml_text)
+ def to_value(xml_text) # rubocop:disable Lint/UnusedMethodArgument
fail NoMethodError, "#{self.class} should override #to_value to convert an XML string to an object value"
end
|
Don't use underscores for abstract method parameters just to keep RuboCop happy
|
diff --git a/docs/logging_snippets.py b/docs/logging_snippets.py
index <HASH>..<HASH> 100644
--- a/docs/logging_snippets.py
+++ b/docs/logging_snippets.py
@@ -365,5 +365,6 @@ def main():
for item in to_delete:
_backoff_not_found(item.delete)
+
if __name__ == '__main__':
main()
|
Putting 2 empty lines after function definiton in logging snippets.
|
diff --git a/physical/physical_test.go b/physical/physical_test.go
index <HASH>..<HASH> 100644
--- a/physical/physical_test.go
+++ b/physical/physical_test.go
@@ -125,6 +125,14 @@ func testBackend(t *testing.T, b Backend) {
t.Fatalf("err: %v", err)
}
+ // Get should return the child
+ out, err = b.Get("foo/bar")
+ if err != nil {
+ t.Fatalf("err: %v", err)
+ }
+ if out == nil {
+ t.Fatalf("missing child")
+ }
}
func testBackend_ListPrefix(t *testing.T, b Backend) {
|
physical: ensure backend does NOT do recursive delete
|
diff --git a/FlowCytometryTools/GUI/fc_widget.py b/FlowCytometryTools/GUI/fc_widget.py
index <HASH>..<HASH> 100644
--- a/FlowCytometryTools/GUI/fc_widget.py
+++ b/FlowCytometryTools/GUI/fc_widget.py
@@ -601,7 +601,7 @@ class FCGateManager(EventGenerator):
info = {'options': self.get_available_channels()}
for key in ['pageX', 'pageY']:
- if event.mouseevent.guiEvent is not None:
+ if event.mouseevent.guiEvent and hasattr(event.mouseevent.guiEvent, key):
info[key] = event.mouseevent.guiEvent[key]
else:
info[key] = 1 # put at top left part
|
FIX different guiEvent in wx backend
|
diff --git a/mss/windows.py b/mss/windows.py
index <HASH>..<HASH> 100644
--- a/mss/windows.py
+++ b/mss/windows.py
@@ -214,16 +214,12 @@ class MSS(MSSMixin):
# All monitors
sm_xvirtualscreen, sm_yvirtualscreen = 76, 77
sm_cxvirtualscreen, sm_cyvirtualscreen = 78, 79
- left = self.user32.GetSystemMetrics(sm_xvirtualscreen)
- right = self.user32.GetSystemMetrics(sm_cxvirtualscreen)
- top = self.user32.GetSystemMetrics(sm_yvirtualscreen)
- bottom = self.user32.GetSystemMetrics(sm_cyvirtualscreen)
self._monitors.append(
{
- "left": int(left),
- "top": int(top),
- "width": int(right - left),
- "height": int(bottom - top),
+ "left": int(self.user32.GetSystemMetrics(sm_xvirtualscreen)),
+ "top": int(self.user32.GetSystemMetrics(sm_yvirtualscreen)),
+ "width": int(self.user32.GetSystemMetrics(sm_cxvirtualscreen)),
+ "height": int(self.user32.GetSystemMetrics(sm_cyvirtualscreen)),
}
)
|
Windows: Fix the screen bounding AiO rectangle
Original patch by Chris Wheeler (@grintor).
|
diff --git a/lib/cuke_slicer/version.rb b/lib/cuke_slicer/version.rb
index <HASH>..<HASH> 100644
--- a/lib/cuke_slicer/version.rb
+++ b/lib/cuke_slicer/version.rb
@@ -1,4 +1,4 @@
module CukeSlicer
# The current version for the gem.
- VERSION = "2.1.0"
+ VERSION = "2.2.0"
end
|
Bump gem version
Updating gem version to '<I>' for the upcoming release.
|
diff --git a/lib/defaults.php b/lib/defaults.php
index <HASH>..<HASH> 100644
--- a/lib/defaults.php
+++ b/lib/defaults.php
@@ -34,6 +34,7 @@
'editorspelling' => 0,
'editorfontlist' => 'Trebuchet:Trebuchet MS,Verdana,Arial,Helvetica,sans-serif;Arial:arial,helvetica,sans-serif;Courier New:courier new,courier,monospace;Georgia:georgia,times new roman,times,serif;Tahoma:tahoma,arial,helvetica,sans-serif;Times New Roman:times new roman,times,serif;Verdana:verdana,arial,helvetica,sans-serif;Impact:impact;Wingdings:wingdings',
'editorhidebuttons' => '',
+ 'filterall' => false,
'filteruploadedfiles' => true,
'forcelogin' => false,
'forceloginforprofiles' => false,
@@ -80,7 +81,7 @@
'textfilters' => 'mod/glossary/dynalink.php',
'themelist' => '',
'timezone' => 99,
- 'theme' => 'standard',
+ 'theme' => 'standardwhite',
'unzip' => '',
'zip' => ''
);
|
Default theme is standardwhite, and added filterall
|
diff --git a/source/application/models/oxmanufacturerlist.php b/source/application/models/oxmanufacturerlist.php
index <HASH>..<HASH> 100644
--- a/source/application/models/oxmanufacturerlist.php
+++ b/source/application/models/oxmanufacturerlist.php
@@ -123,7 +123,7 @@ class oxManufacturerList extends oxList
foreach ($this as $sVndId => $oManufacturer) {
// storing active manufacturer object
- if ($sVndId == $sActCat) {
+ if ($sVndId === $sActCat) {
$this->setClickManufacturer($oManufacturer);
}
|
<I> Compare vendor and category id's more strictly in manufacturer tree building
Related with bug: <URL>
|
diff --git a/model/QtiItemCompiler.php b/model/QtiItemCompiler.php
index <HASH>..<HASH> 100755
--- a/model/QtiItemCompiler.php
+++ b/model/QtiItemCompiler.php
@@ -205,7 +205,7 @@ class QtiItemCompiler extends taoItems_models_classes_ItemCompiler
);
} catch (\tao_models_classes_FileNotFoundException $e) {
return new common_report_Report(
- common_report_Report::TYPE_ERROR, __('Unable to retrieve asset "%s"', $e->getFile())
+ common_report_Report::TYPE_ERROR, __('Unable to retrieve asset "%s"', $e->getFilePath())
);
}
}
|
display the correct path of the file not found
|
diff --git a/src/Entities/Traits/AccessTokenTrait.php b/src/Entities/Traits/AccessTokenTrait.php
index <HASH>..<HASH> 100644
--- a/src/Entities/Traits/AccessTokenTrait.php
+++ b/src/Entities/Traits/AccessTokenTrait.php
@@ -46,7 +46,7 @@ trait AccessTokenTrait
$this->jwtConfiguration = Configuration::forAsymmetricSigner(
new Sha256(),
InMemory::plainText($this->privateKey->getKeyContents(), $this->privateKey->getPassPhrase() ?? ''),
- InMemory::plainText('')
+ InMemory::plainText('empty', 'empty')
);
}
|
Fix compatibility with lcobucci/jwt ^<I>
|
diff --git a/xbbg/__init__.py b/xbbg/__init__.py
index <HASH>..<HASH> 100644
--- a/xbbg/__init__.py
+++ b/xbbg/__init__.py
@@ -1,3 +1,3 @@
"""Bloomberg data toolkit for humans"""
-__version__ = '0.1.24'
+__version__ = '0.1.25'
|
version <I>: fixed overrides in cache files
|
diff --git a/provision/juju/elb_test.go b/provision/juju/elb_test.go
index <HASH>..<HASH> 100644
--- a/provision/juju/elb_test.go
+++ b/provision/juju/elb_test.go
@@ -42,6 +42,7 @@ func (s *ELBSuite) SetUpSuite(c *C) {
}
func (s *ELBSuite) TearDownSuite(c *C) {
+ config.Unset("juju:use-elb")
db.Session.Close()
s.server.Quit()
}
|
provision/juju: unset juju:use-elb on ELBSuite.TearDownSuite
Cleaning some mess...
Related to #<I>.
|
diff --git a/src/Response/Card.php b/src/Response/Card.php
index <HASH>..<HASH> 100644
--- a/src/Response/Card.php
+++ b/src/Response/Card.php
@@ -7,11 +7,11 @@ use Illuminate\Contracts\Support\Arrayable;
class Card implements Arrayable
{
const DEFAULT_CARD_TYPE = 'Simple';
+ const LINK_ACCOUNT_CARD_TYPE = 'LinkAccount';
- private $validCardTypes = ['Simple'];
+ private $validCardTypes = ['Simple','LinkAccount'];
//The type of card
- //todo: as of now only Simple is valid but this is likely to change
//@see https://developer.amazon.com/public/solutions/devices/echo/alexa-app-kit/docs/alexa-appkit-app-interface-reference
private $type = 'Simple';
|
Add new LinkAccount card type as option
The link card type is used for letting Amazon know to display the authentication url in a card
|
diff --git a/great_expectations/dataset/pandas_dataset.py b/great_expectations/dataset/pandas_dataset.py
index <HASH>..<HASH> 100644
--- a/great_expectations/dataset/pandas_dataset.py
+++ b/great_expectations/dataset/pandas_dataset.py
@@ -789,6 +789,8 @@ class PandasDataSet(MetaPandasDataSet, pd.DataFrame):
@MetaPandasDataSet.column_map_expectation
def expect_column_values_to_match_strftime_format(self, series, strftime_format):
+ raise NotImplementedError
+
#def matches_format(val):
# return None
|
statement and block errors. It runs now.
|
diff --git a/dev/SapphireTest.php b/dev/SapphireTest.php
index <HASH>..<HASH> 100755
--- a/dev/SapphireTest.php
+++ b/dev/SapphireTest.php
@@ -615,7 +615,7 @@ class SapphireTest extends PHPUnit_Framework_TestCase {
// Some DataObjectsDecorators keep a static cache of information that needs to
// be reset whenever the database is cleaned out
- foreach(ClassInfo::subclassesFor('DataObjectDecorator') as $class) {
+ foreach(array_merge(ClassInfo::subclassesFor('DataObjectDecorator'), ClassInfo::subclassesFor('DataObject')) as $class) {
$toCall = array($class, 'on_db_reset');
if(is_callable($toCall)) call_user_func($toCall);
}
|
API CHANGE: Allow on_db_reset() methods on DataObjects as well as DataObjectDecortators (from r<I>)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@<I> <I>b<I>ca-7a2a-<I>-9d3b-<I>d<I>a<I>a9
|
diff --git a/src/Plugin.php b/src/Plugin.php
index <HASH>..<HASH> 100644
--- a/src/Plugin.php
+++ b/src/Plugin.php
@@ -94,6 +94,16 @@ class Plugin implements PluginInterface, EventSubscriberInterface
$this->output = $io;
}
+ public function deactivate(Composer $composer, IOInterface $io)
+ {
+ /* noop */
+ }
+
+ public function uninstall(Composer $composer, IOInterface $io)
+ {
+ /* noop */
+ }
+
/**
* Provide composer event listeners.
*
|
feat: Implement new Plugin method deactivate and uninstall
Currently, these methods do not do anything though.
|
diff --git a/client/client.go b/client/client.go
index <HASH>..<HASH> 100644
--- a/client/client.go
+++ b/client/client.go
@@ -2153,9 +2153,19 @@ DISCOLOOP:
// emitStats collects host resource usage stats periodically
func (c *Client) emitStats() {
+ // Determining NodeClass to be emitted
+ var emittedNodeClass string
+ if emittedNodeClass = c.Node().NodeClass; emittedNodeClass == "" {
+ emittedNodeClass = "none"
+ }
+
// Assign labels directly before emitting stats so the information expected
// is ready
- c.baseLabels = []metrics.Label{{Name: "node_id", Value: c.NodeID()}, {Name: "datacenter", Value: c.Datacenter()}}
+ c.baseLabels = []metrics.Label{
+ {Name: "node_id", Value: c.NodeID()},
+ {Name: "datacenter", Value: c.Datacenter()},
+ {Name: "node_class", Value: emittedNodeClass},
+ }
// Start collecting host stats right away and then keep collecting every
// collection interval
|
Added node class to tagged metrics
|
diff --git a/src/Extension/AuthorizationExtension.php b/src/Extension/AuthorizationExtension.php
index <HASH>..<HASH> 100644
--- a/src/Extension/AuthorizationExtension.php
+++ b/src/Extension/AuthorizationExtension.php
@@ -9,7 +9,7 @@ declare(strict_types = 1);
namespace Dot\Twig\Extension;
-use Mezzio\Authorization\AuthorizationInterface;
+use Dot\Authorization\AuthorizationInterface;
use Psr\Http\Message\ServerRequestInterface;
use Twig\Extension\AbstractExtension;
use Twig\TwigFunction;
|
Update AuthorizationExtension.php
Remove Mezzio AuthorizationInterface and changed it with Dot AuthorizationInterface
|
diff --git a/Model/GoogleAddress.php b/Model/GoogleAddress.php
index <HASH>..<HASH> 100644
--- a/Model/GoogleAddress.php
+++ b/Model/GoogleAddress.php
@@ -44,7 +44,7 @@ final class GoogleAddress extends Address
*
* @return GoogleAddress
*/
- public function withLocationType($locationType)
+ public function withLocationType(string $locationType = null)
{
$new = clone $this;
$new->locationType = $locationType;
@@ -63,7 +63,7 @@ final class GoogleAddress extends Address
/**
* @return array
*/
- public function getResultType()
+ public function getResultType(): array
{
return $this->resultType;
}
@@ -92,7 +92,7 @@ final class GoogleAddress extends Address
/**
* @param null|string $formattedAddress
*/
- public function withFormattedAddress($formattedAddress)
+ public function withFormattedAddress(string $formattedAddress = null)
{
$new = clone $this;
$new->formattedAddress = $formattedAddress;
@@ -111,7 +111,7 @@ final class GoogleAddress extends Address
/**
* @param null|string $subpremise
*/
- public function withSubpremise($subpremise)
+ public function withSubpremise(string $subpremise = null)
{
$new = clone $this;
$new->subpremise = $subpremise;
|
Added type hints (#<I>)
|
diff --git a/mozilla/util/connect/connector.js b/mozilla/util/connect/connector.js
index <HASH>..<HASH> 100644
--- a/mozilla/util/connect/connector.js
+++ b/mozilla/util/connect/connector.js
@@ -24,21 +24,19 @@ define(function(require, exports, module) {
*/
exports.connect = function(prefix, host, port) {
var builtinCommands = Components.utils.import('resource:///modules/devtools/BuiltinCommands.jsm', {});
-
- if (exports.defaultPort != builtinCommands.DEFAULT_DEBUG_PORT) {
- console.error('Warning contradictory default debug ports');
- }
-
- var connection = new builtinCommands.Connection(prefix, host, port);
- return connection.connect().then(function() {
- return connection;
- });
+ return builtinCommands.connect(prefix, host, port);
};
/**
* What port should we use by default?
*/
-exports.defaultPort = 4242;
+Object.defineProperty(exports, 'defaultPort', {
+ get: function() {
+ var Services = Components.utils.import("resource://gre/modules/Services.jsm", {});
+ return Services.prefs.getIntPref("devtools.debugger.chrome-debugging-port");
+ },
+ enumerable: true
+});
});
|
remotegcli-<I>: Connect to BuiltinCommands.jsm better
* Read defaultPort from preferences properly
* Move connect function into BuiltinCommands.jsm
|
diff --git a/copycat-core/src/main/java/net/kuujo/copycat/log/impl/MemoryLog.java b/copycat-core/src/main/java/net/kuujo/copycat/log/impl/MemoryLog.java
index <HASH>..<HASH> 100644
--- a/copycat-core/src/main/java/net/kuujo/copycat/log/impl/MemoryLog.java
+++ b/copycat-core/src/main/java/net/kuujo/copycat/log/impl/MemoryLog.java
@@ -141,7 +141,10 @@ public class MemoryLog extends AbstractLog implements Compactable {
public <T extends Entry> List<T> getEntries(long from, long to) {
List<T> entries = new ArrayList<>();
for (long i = from; i <= to; i++) {
- entries.add(getEntry(i));
+ T entry = getEntry(i);
+ if (entry != null) {
+ entries.add(entry);
+ }
}
return entries;
}
|
Ignore empty indices when reading multiple entries from the memory log.
|
diff --git a/core/Piwik.php b/core/Piwik.php
index <HASH>..<HASH> 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -2483,7 +2483,7 @@ class Piwik
. $period->getId() . '/'
. $period->getDateStart()->toString('Y-m-d') . ','
. $period->getDateEnd()->toString('Y-m-d');
- return $lockName .'/'. md5($lockName . $config->superuser['salt']);
+ return $lockName .'/'. md5($lockName . Piwik_Common::getSalt());
}
/**
|
fixes #<I> - salt was added in <I>; Zend_Config masked its absence
git-svn-id: <URL>
|
diff --git a/modules/orionode/lib/xfer.js b/modules/orionode/lib/xfer.js
index <HASH>..<HASH> 100644
--- a/modules/orionode/lib/xfer.js
+++ b/modules/orionode/lib/xfer.js
@@ -58,8 +58,12 @@ module.exports.router = function(options) {
module.exports.getXferFrom = getXferFrom;
module.exports.postImportXferTo = postImportXferTo;
-function getOptions(req) {
- return req.get("X-Xfer-Options").split(",");
+function getOptions(req, res) {
+ var opts = req.get("X-Xfer-Options");
+ if(typeof opts !== 'string') {
+ return writeError(500, res, "Transfer options have not been set in the original request");
+ }
+ return opts.split(",");
}
function reportTransferFailure(res, err) {
@@ -83,7 +87,7 @@ function postImportXfer(req, res) {
}
function postImportXferTo(req, res, file) {
- var xferOptions = getOptions(req);
+ var xferOptions = getOptions(req, res);
if (xferOptions.indexOf("sftp") !== -1) {
return writeError(500, res, "Not implemented yet.");
}
|
Bug <I> - Omitting X-Xfer-Options should not throw exception (#<I>)
|
diff --git a/includes/class-freemius.php b/includes/class-freemius.php
index <HASH>..<HASH> 100755
--- a/includes/class-freemius.php
+++ b/includes/class-freemius.php
@@ -713,16 +713,19 @@
return;
}
+ $has_unset_marketing_optin = false;
+
foreach ( $user_plugins as $key => $user_plugin ) {
- if (
- true == $user_plugin->is_marketing_allowed ||
- ( $was_notice_shown_before && ! is_null( $user_plugin->is_marketing_allowed ) )
- ) {
+ if ( true == $user_plugin->is_marketing_allowed ) {
unset( $plugin_ids_map[ $user_plugin->plugin_id ] );
}
+
+ if ( ! $has_unset_marketing_optin && is_null( $user_plugin->is_marketing_allowed ) ) {
+ $has_unset_marketing_optin = true;
+ }
}
- if ( empty( $plugin_ids_map ) ) {
+ if ( empty( $plugin_ids_map ) || ( $was_notice_shown_before && ! $has_unset_marketing_optin ) ) {
return;
}
|
[eu] [gdpr] [opt-in] [admin-notice] If the notice was already shown before, show it again only if there's at least one `is_marketing_allowed` value that is still `null`.
|
diff --git a/src/InfoViz/Native/ParallelCoordinates/index.js b/src/InfoViz/Native/ParallelCoordinates/index.js
index <HASH>..<HASH> 100644
--- a/src/InfoViz/Native/ParallelCoordinates/index.js
+++ b/src/InfoViz/Native/ParallelCoordinates/index.js
@@ -436,8 +436,8 @@ function parallelCoordinate(publicAPI, model) {
let yRightMax = 0;
// Ensure proper range for X
- const deltaOne = (axisOne.range[1] - axisOne.range[0]) / histogram.numberOfBins;
- const deltaTwo = (axisTwo.range[1] - axisTwo.range[0]) / histogram.numberOfBins;
+ const deltaOne = (axisOne.range[1] - axisOne.range[0]) / (histogram.numberOfBins || model.numberOfBins);
+ const deltaTwo = (axisTwo.range[1] - axisTwo.range[0]) / (histogram.numberOfBins || model.numberOfBins);
for (let i = 0; i < histogram.bins.length; ++i) {
bin = histogram.bins[i];
|
fix(ParallelCoordinates): Try to guard against using undefined value when computing deltas
|
diff --git a/lib/ronin/network/http.rb b/lib/ronin/network/http.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/network/http.rb
+++ b/lib/ronin/network/http.rb
@@ -94,7 +94,12 @@ module Ronin
new_options[:user] = url.user if url.user
new_options[:password] = url.password if url.password
- new_options[:path] = url.path
+ unless url.path.empty?
+ new_options[:path] = url.path
+ else
+ new_options[:path] = '/'
+ end
+
new_options[:path] << "?#{url.query}" if url.query
else
new_options[:port] ||= ::Net::HTTP.default_port
|
Make sure to default the :path option to '/', even when using URLs.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ classifiers = [
setup(
name = "PyProxyFS",
- version = "0.2",
+ version = "0.5",
description = "Simple filesystem abstraction",
long_description = """A proxy filesystem interface with a native
filesystem implementation and a very simple test in-memory filesystem.""",
diff --git a/src/pyproxyfs/__init__.py b/src/pyproxyfs/__init__.py
index <HASH>..<HASH> 100644
--- a/src/pyproxyfs/__init__.py
+++ b/src/pyproxyfs/__init__.py
@@ -99,6 +99,17 @@ class TestFS(Filesystem):
pass
def read(self):
return obj
+ def readline(self, size=-1):
+ if not getattr(self, "lineno", False):
+ setattr(self, "lineno", 0)
+ lines = obj.split("\n")
+ if self.lineno == len(lines):
+ return "\n"
+ if self.lineno > len(lines):
+ raise IOError()
+ line = lines[self.lineno]
+ self.lineno = self.lineno + 1
+ return "%s\n" % line
return grd()
def rename(self, old, new):
|
support readline for the test fs "file" object
|
diff --git a/programs/di_vgp.py b/programs/di_vgp.py
index <HASH>..<HASH> 100755
--- a/programs/di_vgp.py
+++ b/programs/di_vgp.py
@@ -84,7 +84,7 @@ def main():
else: # single line of data
if len(data)==4:
data=[data[0],data[1],0,data[2],data[3]]
- output = pmag.dia_vgp(data)
+ output = pmag.dia_vgp(*data)
if out=='': # spit to standard output
print('%7.1f %7.1f'%(output[0],output[1]))
else: # write to file
|
for di_vgp, pass in arguments to pmag.dia_vgp as single values if only one line in data file, #<I>
|
diff --git a/lifx.js b/lifx.js
index <HASH>..<HASH> 100644
--- a/lifx.js
+++ b/lifx.js
@@ -98,10 +98,10 @@ Lifx.prototype._setupPacketListener = function() {
// Got a notification of a light's status. Check if it's a new light, and handle it accordingly.
var bulb = self.bulbs[pkt.preamble.bulbAddress.toString('hex')];
if (bulb) {
- bulb.status = pkt.payload;
+ bulb.state = pkt.payload;
}
else {
- bulb = {addr:pkt.preamble.bulbAddress, name:pkt.payload.bulbLabel, status: pkt.payload};
+ bulb = {addr:pkt.preamble.bulbAddress, name:pkt.payload.bulbLabel, state: pkt.payload};
self.bulbs[bulb.addr.toString('hex')] = bulb;
self.emit('bulb', bulb);
}
|
changed bulb "status" to "state"
|
diff --git a/models/Client.js b/models/Client.js
index <HASH>..<HASH> 100644
--- a/models/Client.js
+++ b/models/Client.js
@@ -742,7 +742,11 @@ var Client = Modinha.define('clients', {
/**
* scopes
- * List of scopes required to access this client
+ * List of user-authorized scopes required to display this client at the
+ * applications endpoint.
+ *
+ * In the future, this value may be used to restrict users from signing into
+ * clients they have no permissions for.
*/
scopes: {
|
docs(Client): clarify purpose of client `scopes` property
|
diff --git a/topydo/ui/TodoListWidget.py b/topydo/ui/TodoListWidget.py
index <HASH>..<HASH> 100644
--- a/topydo/ui/TodoListWidget.py
+++ b/topydo/ui/TodoListWidget.py
@@ -122,6 +122,8 @@ class TodoListWidget(urwid.LineBox):
self._complete_selected_item()
elif p_key == 'p':
self.keystate = 'p'
+ elif p_key == 'd':
+ self._remove_selected_item()
elif p_key == 'j':
self.listbox.keypress(p_size, 'down')
elif p_key == 'k':
@@ -168,3 +170,17 @@ class TodoListWidget(urwid.LineBox):
except AttributeError:
# No todo item selected
pass
+
+ def _remove_selected_item(self):
+ """
+ Removes the highlighted todo item.
+ """
+ try:
+ todo = self.listbox.focus.todo
+ self.view.todolist.number(todo)
+
+ urwid.emit_signal(self, 'execute_command', "del {}".format(
+ str(self.view.todolist.number(todo))))
+ except AttributeError:
+ # No todo item selected
+ pass
|
Remove the highlighted todo by pressing 'd'
|
diff --git a/sirmordred/task_collection.py b/sirmordred/task_collection.py
index <HASH>..<HASH> 100644
--- a/sirmordred/task_collection.py
+++ b/sirmordred/task_collection.py
@@ -230,6 +230,8 @@ class TaskRawDataArthurCollection(Task):
# The same repo could appear in git and github data sources
# Two tasks in arthur can not have the same tag
tag = repo + "_" + self.backend_section
+ if self.backend_section in ["mediawiki"]:
+ tag = repo.split()[0]
return tag
|
[collection] Add support for mediawiki tag
Mediawiki supports two params now within the repo string,
this change add support to extract the right one as tag.
|
diff --git a/closure/goog/net/browserchannel.js b/closure/goog/net/browserchannel.js
index <HASH>..<HASH> 100644
--- a/closure/goog/net/browserchannel.js
+++ b/closure/goog/net/browserchannel.js
@@ -868,8 +868,9 @@ goog.net.BrowserChannel.prototype.disconnect = function() {
this, this.channelDebug_, this.sid_, rid, undefined /* opt_retryId */,
this.onlineHandler_);
request.sendUsingImgTag(uri);
- this.onClose_();
}
+
+ this.onClose_();
};
|
Recover the browser channel If it's stuck on connecting state.
And make this behavior behind the BROWSER_CHANNEL_STUCK_RECOVERY
experiment.
R=mpd,dobrev,rrhett
DELTA=<I> (<I> added, 0 deleted, 2 changed)
Revision created by MOE tool push_codebase.
MOE_MIGRATION=<I>
git-svn-id: <URL>
|
diff --git a/src/Model/Variable.php b/src/Model/Variable.php
index <HASH>..<HASH> 100644
--- a/src/Model/Variable.php
+++ b/src/Model/Variable.php
@@ -8,6 +8,7 @@ namespace Platformsh\Client\Model;
* @property-read string $id
* @property-read string $environment
* @property-read string $name
+ * @property-read bool $is_enabled
* @property-read bool $is_json
* @property-read string $created_at
* @property-read string $updated_at
|
Variables have is_enabled property
This is not deployed just yet
|
diff --git a/Kwf/ComposerExtraAssets/Plugin.php b/Kwf/ComposerExtraAssets/Plugin.php
index <HASH>..<HASH> 100644
--- a/Kwf/ComposerExtraAssets/Plugin.php
+++ b/Kwf/ComposerExtraAssets/Plugin.php
@@ -124,13 +124,13 @@ class Plugin implements PluginInterface, EventSubscriberInterface
$cmd = "$bowerBin --allow-root install";
passthru($cmd, $retVar);
if ($retVar) {
- $this->io->write("<error>bower install failed</error>");
+ throw new \RuntimeException('bower install failed');
}
$cmd = "$bowerBin --allow-root prune";
passthru($cmd, $retVar);
if ($retVar) {
- $this->io->write("<error>bower prune failed</error>");
+ throw new \RuntimeException('bower prune failed');
}
}
}
@@ -179,13 +179,13 @@ class Plugin implements PluginInterface, EventSubscriberInterface
$cmd = "npm install";
passthru($cmd, $retVar);
if ($retVar) {
- $this->io->write("<error>npm install failed</error>");
+ throw new \RuntimeException('npm install failed');
}
$cmd = "npm prune";
passthru($cmd, $retVar);
if ($retVar) {
- $this->io->write("<error>npm prune failed</error>");
+ throw new \RuntimeException('npm prune failed');
}
unlink('package.json');
|
When bower/npm fails throw exception
Don't silently ignore errors so composer update/install can report the correct error code and no half-installed situations can happen
|
diff --git a/azure-mgmt-batchai/azure/mgmt/batchai/version.py b/azure-mgmt-batchai/azure/mgmt/batchai/version.py
index <HASH>..<HASH> 100644
--- a/azure-mgmt-batchai/azure/mgmt/batchai/version.py
+++ b/azure-mgmt-batchai/azure/mgmt/batchai/version.py
@@ -5,5 +5,5 @@
# regenerated.
# --------------------------------------------------------------------------
-VERSION = "0.2.0"
+VERSION = "0.1.0"
|
BatchAI. Restoring the version number
|
diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js
index <HASH>..<HASH> 100644
--- a/lib/browser/chrome-extension.js
+++ b/lib/browser/chrome-extension.js
@@ -427,7 +427,7 @@ app.once('ready', function () {
}
}
} catch (error) {
- if (process.env.ELECTRON_ENABLE_LOGGING) {
+ if (process.env.ELECTRON_ENABLE_LOGGING && error.code !== 'ENOENT') {
console.error('Failed to load browser extensions from directory:', loadedDevToolsExtensionsPath)
console.error(error)
}
|
fix: do not print an error for an expected condition (#<I>) (#<I>)
|
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index <HASH>..<HASH> 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -7404,7 +7404,7 @@ class forum_portfolio_caller extends portfolio_module_caller_base {
$output .= $formattedtext;
- if (array_key_exists($post->id, $this->keyedfiles) && is_array($this->keyedfiles[$post->id])) {
+ if (is_array($this->keyedfiles) && array_key_exists($post->id, $this->keyedfiles) && is_array($this->keyedfiles[$post->id])) {
$output .= '<div class="attachments">';
$output .= '<br /><b>' . get_string('attachments', 'forum') . '</b>:<br /><br />';
$format = $this->get('exporter')->get('format');
|
MDL-<I>: mod/forum portfolio implementation: fixed warning.
|
diff --git a/src/main/java/com/apruve/PaymentRequest.java b/src/main/java/com/apruve/PaymentRequest.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/apruve/PaymentRequest.java
+++ b/src/main/java/com/apruve/PaymentRequest.java
@@ -251,7 +251,7 @@ public class PaymentRequest implements Serializable {
JSONObject json = JSONObject.fromObject(line);
PaymentRequest paymentRequest = new PaymentRequest();
paymentRequest.setAmountCents(json.get("amount_cents") != null ? new Integer(json.getString("amount_cents")) : null);
- paymentRequest.setCurrency(json.getString("currency"));
+ paymentRequest.setCurrency(json.get("currency") != null ? json.getString("currency") : null);
paymentRequest.setId(json.getString("id"));
paymentRequest.setRecurring(json.get("recurring") != null ? new Boolean(json.getString("recurring")) : null);
paymentRequest.setShippingCents(json.get("shipping_cents") != null ? new Integer(json.getString("shipping_cents")) : null);
|
Fixed json stack on missing currency.
|
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index <HASH>..<HASH> 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -3,6 +3,7 @@
/// This page prints a particular instance of glossary
require_once("../../config.php");
require_once("lib.php");
+require_once($CFG->libdir . '/completionlib.php');
require_once("$CFG->libdir/rsslib.php");
$id = optional_param('id', 0, PARAM_INT); // Course Module ID
|
"NOBUG, added lib/completionlib.php"
|
diff --git a/tests/test_config.py b/tests/test_config.py
index <HASH>..<HASH> 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -266,7 +266,7 @@ class TestConfig(TmpDirTestCase):
f.write(' - !!python/object/apply:sys.exit [66]\n')
pat = "could not determine a constructor for the tag.*python/object/apply"
- with self.assertRaisesRegexp(scuba.config.ConfigError, pat) as ctx:
+ with self.assertRaisesRegex(scuba.config.ConfigError, pat) as ctx:
scuba.config.load_config('.scuba.yml')
def test_load_config_safe(self):
|
Replace assertRaisesRegexp with assertRaisesRegex
The former is a deprecated alias.
|
diff --git a/lib/Less/Environment.php b/lib/Less/Environment.php
index <HASH>..<HASH> 100755
--- a/lib/Less/Environment.php
+++ b/lib/Less/Environment.php
@@ -431,7 +431,10 @@ class Less_Environment{
}
public static function escape ($str){
- return new Less_Tree_Anonymous(urlencode($str->value));
+
+ $revert = array('%21'=>'!', '%2A'=>'*', '%27'=>"'",'%3F'=>'?','%26'=>'&','%2C'=>',','%2F'=>'/','%40'=>'@','%2B'=>'+','%24'=>'$');
+
+ return new Less_Tree_Anonymous(strtr(rawurlencode($str->value), $revert));
}
|
escape() to match less.js
|
diff --git a/tests/framework/base/ActionFilterTest.php b/tests/framework/base/ActionFilterTest.php
index <HASH>..<HASH> 100644
--- a/tests/framework/base/ActionFilterTest.php
+++ b/tests/framework/base/ActionFilterTest.php
@@ -238,7 +238,7 @@ class Filter3 extends ActionFilter
class MockUser extends User
{
- public function init()
+ public function init(): void
{
// do not call parent to avoid the need to mock configuration
}
diff --git a/tests/framework/helpers/JsonTest.php b/tests/framework/helpers/JsonTest.php
index <HASH>..<HASH> 100644
--- a/tests/framework/helpers/JsonTest.php
+++ b/tests/framework/helpers/JsonTest.php
@@ -11,7 +11,7 @@ use yii\base\DynamicModel;
use yii\helpers\BaseJson;
use yii\helpers\Json;
use yii\web\JsExpression;
-use yii\web\tests\Post;
+use yii\web\tests\stubs\Post;
use yii\tests\TestCase;
/**
|
Fixing tests after changes in `yii-web` package
|
diff --git a/pvl/_collections.py b/pvl/_collections.py
index <HASH>..<HASH> 100644
--- a/pvl/_collections.py
+++ b/pvl/_collections.py
@@ -97,6 +97,9 @@ class OrderedMultiDict(dict, MutableMapping):
def __iter__(self):
return iter(self.__items)
+ def __len__(self):
+ return len(self.__items)
+
get = MutableMapping.get
update = MutableMapping.update
pop = MutableMapping.pop
|
Return length of items instead of unique keys.
|
diff --git a/openxc/tools/control.py b/openxc/tools/control.py
index <HASH>..<HASH> 100644
--- a/openxc/tools/control.py
+++ b/openxc/tools/control.py
@@ -96,6 +96,7 @@ def main():
controller_class, controller_kwargs = select_device(arguments)
controller = controller_class(**controller_kwargs)
+ controller.start()
if arguments.command == "version":
version(controller)
@@ -121,3 +122,7 @@ def main():
sys.exit("%s requires a signal name, message ID or filename" % arguments.command)
else:
print("Unrecognized command \"%s\"" % arguments.command)
+
+ # TODO need a better way to wait for log messages after writing
+ import time
+ time.sleep(1)
|
Wait after sending control commands for log messages.
|
diff --git a/daemon/graphdriver/driver.go b/daemon/graphdriver/driver.go
index <HASH>..<HASH> 100644
--- a/daemon/graphdriver/driver.go
+++ b/daemon/graphdriver/driver.go
@@ -26,6 +26,7 @@ const (
FsMagicSmbFs = FsMagic(0x0000517B)
FsMagicJffs2Fs = FsMagic(0x000072b6)
FsMagicZfs = FsMagic(0x2fc12fc1)
+ FsMagicXfs = FsMagic(0x58465342)
FsMagicUnsupported = FsMagic(0x00000000)
)
@@ -60,6 +61,7 @@ var (
FsMagicSmbFs: "smb",
FsMagicJffs2Fs: "jffs2",
FsMagicZfs: "zfs",
+ FsMagicXfs: "xfs",
FsMagicUnsupported: "unsupported",
}
)
|
Add xfs fs magic to graphdriver/driver.go
|
diff --git a/lib/superstore-sync.js b/lib/superstore-sync.js
index <HASH>..<HASH> 100644
--- a/lib/superstore-sync.js
+++ b/lib/superstore-sync.js
@@ -31,17 +31,20 @@ exports.get = function(key) {
};
exports.set = function(key, value) {
- try {
- localStorage[key] = JSON.stringify(value);
- } catch(err) {
+ if (persist) {
+ try {
+ localStorage[key] = JSON.stringify(value);
+ } catch(err) {
- // Known iOS Private Browsing Bug - fall back to non-persistent storage
- if (err.code === 22) {
- persist = false;
- } else {
- throw err;
+ // Known iOS Private Browsing Bug - fall back to non-persistent storage
+ if (err.code === 22) {
+ persist = false;
+ } else {
+ throw err;
+ }
}
}
+
store[key] = value;
keys[key] = true;
};
|
Only use localStorage if `persist` is truthy
Aids debugging when in iOS private browsing mode and catching
exceptions, and fasterer.
|
diff --git a/flask_jwt_extended/__init__.py b/flask_jwt_extended/__init__.py
index <HASH>..<HASH> 100644
--- a/flask_jwt_extended/__init__.py
+++ b/flask_jwt_extended/__init__.py
@@ -11,4 +11,4 @@ from .utils import (
unset_jwt_cookies, unset_refresh_cookies
)
-__version__ = '3.8.2'
+__version__ = '3.9.1'
|
Bump to <I>.
Skips <I>, as I already git tagged it, but forgot to actually bump the
version number. Whoops.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.