diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/table.rb b/lib/table.rb
index <HASH>..<HASH> 100644
--- a/lib/table.rb
+++ b/lib/table.rb
@@ -224,7 +224,7 @@ module Enumerable
# # +---------+-----------+--------+
#
def to_text_table(options = {})
- table = Text::Table.new :rows => self.to_a
+ table = Text::Table.new :rows => self.to_a.dup
table.head = table.rows.shift if options[:first_row_is_head]
table.foot = table.rows.pop if options[:last_row_is_foot]
table
|
fixed Enumerable#to_text_table modifying self when :first_row_is_head or :last_row_is_foot is set to true
|
diff --git a/lib/kafka/version.rb b/lib/kafka/version.rb
index <HASH>..<HASH> 100644
--- a/lib/kafka/version.rb
+++ b/lib/kafka/version.rb
@@ -1,3 +1,3 @@
module Kafka
- VERSION = "0.1.4"
+ VERSION = "0.1.5"
end
|
Bump to version <I>
|
diff --git a/pantheon/scripts/tokens.py b/pantheon/scripts/tokens.py
index <HASH>..<HASH> 100644
--- a/pantheon/scripts/tokens.py
+++ b/pantheon/scripts/tokens.py
@@ -52,7 +52,7 @@ def tokenize_corpora():
for text_fname in text_files:
json_fname = text_fname.split('.')[0] + '.json'
- if os.path.isfile(json_fname): continue
+ if os.path.isfile(corpora_dir + json_fname): continue
print("Tokenizing " + text_fname)
|
Fix mistake that results in all srcs being re-tokenized every time
|
diff --git a/staff/__init__.py b/staff/__init__.py
index <HASH>..<HASH> 100644
--- a/staff/__init__.py
+++ b/staff/__init__.py
@@ -1,7 +1,7 @@
__version_info__ = {
'major': 0,
'minor': 3,
- 'micro': 2,
+ 'micro': 3,
'releaselevel': 'final',
'serial': 0
}
|
bumped the version to <I>
|
diff --git a/src/Console/Shell.php b/src/Console/Shell.php
index <HASH>..<HASH> 100644
--- a/src/Console/Shell.php
+++ b/src/Console/Shell.php
@@ -184,7 +184,6 @@ class Shell
['tasks'],
['associative' => ['tasks']]
);
- $this->_io->setLoggers(true);
if (isset($this->modelClass)) {
$this->loadModel();
diff --git a/tests/TestCase/Console/ShellTest.php b/tests/TestCase/Console/ShellTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/Console/ShellTest.php
+++ b/tests/TestCase/Console/ShellTest.php
@@ -1318,7 +1318,7 @@ TEXT;
$io->expects($this->at(0))
->method('setLoggers')
->with(true);
- $io->expects($this->at(3))
+ $io->expects($this->at(2))
->method('setLoggers')
->with(ConsoleIo::QUIET);
|
Remove redundant setLoggers() call.
This call is no longer necessary as the logging levels are set in
ShellDispatcher.
Refs #<I>
|
diff --git a/c7n/resources/vpc.py b/c7n/resources/vpc.py
index <HASH>..<HASH> 100644
--- a/c7n/resources/vpc.py
+++ b/c7n/resources/vpc.py
@@ -654,10 +654,10 @@ class SGPermission(Filter):
OnlyPorts: [22, 443, 80]
- type: egress
- IpRanges:
- - value_type: cidr
- - op: in
- - value: x.y.z
+ Cidr:
+ value_type: cidr
+ op: in
+ value: x.y.z
"""
|
docs - fix documentation about matching Cidr on security-groups (#<I>)
|
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,6 +1,7 @@
const gulp = require('gulp');
const glob = require('glob');
const ts = require('gulp-typescript');
+const execa = require('execa');
const utils = require('./Tools/gulp/utils');
const tasks = {
@@ -54,7 +55,12 @@ gulp.task('updateIgnoredTypeScriptBuild', updateIgnoredTypeScriptBuildTask);
gulp.task('watch', function() {
gulp.watch(tasks.copyLib.src, tasks.copyLib.fn);
- gulp.watch(tscTaskSrc, gulp.series('tsc', 'updateIgnoredTypeScriptBuild'));
+ gulp.watch(tscTaskSrc, updateIgnoredTypeScriptBuildTask);
+
+ // For watching, we use the actual tsc tool because it's more robust and
+ // doesn't crash when there's an error
+ const promise = execa('npx', ['tsc', '--watch', '--project', 'tsconfig.json'], { cwd: `${__dirname}` });
+ promise.stdout.pipe(process.stdout);
});
gulp.task('build', gulp.series('copyLib', 'tsc', 'updateIgnoredTypeScriptBuild'));
|
Tools: Improve tsc watch
|
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
index <HASH>..<HASH> 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraph.java
@@ -372,7 +372,10 @@ public class ExecutionGraph {
int nextPos = nextVertexToFinish;
if (nextPos >= verticesInCreationOrder.size()) {
// already done, and we still get a report?
- LOG.error("Job entered finished state a repeated time.");
+ // this can happen when:
+ // - two job vertices finish almost simultaneously
+ // - The first one advances the position for the second as well (second is in final state)
+ // - the second (after it could grab the lock) tries to advance the position again
return;
}
|
Remove error message in execution graph for concurrent state changes that are fully acceptable.
|
diff --git a/lib/node-libnmap.js b/lib/node-libnmap.js
index <HASH>..<HASH> 100644
--- a/lib/node-libnmap.js
+++ b/lib/node-libnmap.js
@@ -180,7 +180,8 @@ var version = 'v0.0.7'
}
if (opts.ports) {
- if (!/(\d+){1,6}|((\d+){1,6}\-(\d+){1,6})/.test(opts.ports))
+ /* http://stackoverflow.com/a/21075138/901697 */
+ if (!/^(?:(?:^|[-,])(?:[1-9][0-9]{0,3}|[1-5][0-9]{4}|6(?:[0-4][0-9]{3}|5(?:[0-4][0-9]{2}|5(?:[0-2][0-9]|3[0-5])))))+$/.test(opts.ports))
throw 'Port(s) must match one of the following examples:'+
'512 (single) | 0-65535 (range) | 22-25,80,443,3306 (multiple)'
}
|
setup: verify()
methods:
setup:
verify(): Updated regex & comment to verify port ranges
|
diff --git a/packages/ember-routing/lib/vendor/route-recognizer.js b/packages/ember-routing/lib/vendor/route-recognizer.js
index <HASH>..<HASH> 100644
--- a/packages/ember-routing/lib/vendor/route-recognizer.js
+++ b/packages/ember-routing/lib/vendor/route-recognizer.js
@@ -186,9 +186,9 @@ define("route-recognizer",
charSpec = child.charSpec;
- if (chars = charSpec.validChars) {
+ if (typeof (chars = charSpec.validChars) !== 'undefined') {
if (chars.indexOf(char) !== -1) { returned.push(child); }
- } else if (chars = charSpec.invalidChars) {
+ } else if (typeof (chars = charSpec.invalidChars) !== 'undefined') {
if (chars.indexOf(char) === -1) { returned.push(child); }
}
}
|
Update route-recognizer with wildcard fixes
|
diff --git a/src/main/java/com/googlecode/lanterna/graphics/ThemedTextGraphics.java b/src/main/java/com/googlecode/lanterna/graphics/ThemedTextGraphics.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/googlecode/lanterna/graphics/ThemedTextGraphics.java
+++ b/src/main/java/com/googlecode/lanterna/graphics/ThemedTextGraphics.java
@@ -36,6 +36,7 @@ public interface ThemedTextGraphics extends TextGraphics {
* Takes a ThemeStyle as applies it to this TextGraphics. This will effectively set the foreground color, the
* background color and all the SGRs.
* @param themeStyle ThemeStyle to apply
+ * @return Itself
*/
- void applyThemeStyle(ThemeStyle themeStyle);
+ ThemedTextGraphics applyThemeStyle(ThemeStyle themeStyle);
}
|
Return yourself after call applyThemeStyle
|
diff --git a/packages/firestore/rollup.config.js b/packages/firestore/rollup.config.js
index <HASH>..<HASH> 100644
--- a/packages/firestore/rollup.config.js
+++ b/packages/firestore/rollup.config.js
@@ -194,7 +194,11 @@ const browserBuilds = [
// MARK: Node builds
const nodeBuildPlugins = [
- ...es5BuildPlugins,
+ typescriptPlugin({
+ typescript,
+ cacheRoot: `./.cache/node/`
+ }),
+ json(),
// Needed as we also use the *.proto files
copy({
assets: ['./src/protos']
|
Remove mangling from Node build (#<I>)
|
diff --git a/lib/base.js b/lib/base.js
index <HASH>..<HASH> 100644
--- a/lib/base.js
+++ b/lib/base.js
@@ -51,8 +51,8 @@ class TeamspeakQuery extends EventEmitter {
*/
disconnect() {
return new Promise((resolve, reject) => {
- while(this.queue.length)
- this.queue.pop();
+ const error = new Error('TeamspeakQuery.disconnect was called');
+ this.rejectPending(error, true);
this.queue.unshift({ cmd: 'quit', resolve, reject });
this.checkQueue();
@@ -62,6 +62,27 @@ class TeamspeakQuery extends EventEmitter {
}
/**
+ * Reject all pending commands. This can be useful for when an error occurs
+ * in a stream and it should be propagated.
+ *
+ * @param {any} reason Gets passed onto Promise.reject for the
+ respective command
+ * @param {boolean} includeCurrent Whether to also reject the command,
+ * which is currently waiting for a response.
+ */
+ rejectPending(reason, includeCurrent) {
+ if (includeCurrent && this._current) {
+ this._current.reject(reason);
+ }
+
+ while(this.queue.length) {
+ let item = this.queue.pop();
+
+ item.reject(reason);
+ }
+ }
+
+ /**
* Clean up any resources that might live on after the connection
* was closed.
*/
|
Add TeamspeakQuery.rejectPending/2 method
Calling this function will reject all pending commands with the given reason. This might be useful for TeamspeakQuery.Custom
|
diff --git a/uri_test.go b/uri_test.go
index <HASH>..<HASH> 100644
--- a/uri_test.go
+++ b/uri_test.go
@@ -26,15 +26,6 @@ var uriTests = []testURI{
canon: "amqp://user:pass@host:10000/vhost",
},
- // this fails due to net/url not parsing pct-encoding in host
- // testURI{url: "amqp://user%61:%61pass@ho%61st:10000/v%2Fhost",
- // username: "usera",
- // password: "apass",
- // host: "hoast",
- // port: 10000,
- // vhost: "v/host",
- // },
-
{
url: "amqp://",
username: defaultURI.Username,
|
Remove commented URI test
We trust the community to feedback if % in URIs are an issue
|
diff --git a/detectem/core.py b/detectem/core.py
index <HASH>..<HASH> 100644
--- a/detectem/core.py
+++ b/detectem/core.py
@@ -249,20 +249,24 @@ class Detector():
for plugin in generic_plugins:
pm = self.apply_plugin_matchers(plugin, entry)
- if pm:
- plugin_data = plugin.get_information(entry)
+ if not pm:
+ continue
- # Only add to results if it's a valid result
- if 'name' in plugin_data:
- self._results.add_result(
- Result(
- name=plugin_data['name'],
- homepage=plugin_data['homepage'],
- from_url=get_url(entry),
- type=GENERIC_TYPE,
- plugin=plugin.name,
- )
+ plugin_data = plugin.get_information(entry)
+
+ # Only add to results if it's a valid result
+ if 'name' in plugin_data:
+ self._results.add_result(
+ Result(
+ name=plugin_data['name'],
+ homepage=plugin_data['homepage'],
+ from_url=get_url(entry),
+ type=GENERIC_TYPE,
+ plugin=plugin.name,
)
+ )
+
+ hints += self.get_hints(plugin)
for hint in hints:
self._results.add_result(hint)
|
Add support for hints from generic plugins
|
diff --git a/src/main/java/org/tehuti/metrics/stats/Percentiles.java b/src/main/java/org/tehuti/metrics/stats/Percentiles.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/tehuti/metrics/stats/Percentiles.java
+++ b/src/main/java/org/tehuti/metrics/stats/Percentiles.java
@@ -108,6 +108,13 @@ public class Percentiles extends SampledStat implements CompoundStat {
super(0.0, now);
this.histogram = new Histogram(scheme);
}
+
+ @Override
+ public void reset(long now) {
+ super.reset(now);
+ histogram.clear();
+ }
+
}
}
|
Fixed Percentiles so samples get cleared properly.
|
diff --git a/modules/sheet/editTags.js b/modules/sheet/editTags.js
index <HASH>..<HASH> 100644
--- a/modules/sheet/editTags.js
+++ b/modules/sheet/editTags.js
@@ -5,6 +5,7 @@ const filter = require('lodash/filter')
const parallel = require('run-parallel')
const addSuggest = require('suggest-box')
const TagHelper = require('scuttle-tag')
+const ref = require('ssb-ref')
exports.gives = nest('sheet.editTags')
@@ -94,7 +95,7 @@ exports.create = function (api) {
return
}
const tag = input.substring(0, input.length - 1)
- tagsToCreate.push(tag)
+ tagsToCreate.push(ref.normalizeChannel(tag))
e.target.value = ''
}
@@ -102,14 +103,14 @@ exports.create = function (api) {
e.target.value = ''
const { value, tagId } = e.detail
if (!tagId) {
- tagsToCreate.push(value)
+ tagsToCreate.push(ref.normalizeChannel(value))
return
}
const index = tagsToRemove().indexOf(tagId)
if (index >= 0) {
tagsToRemove.deleteAt(index)
} else {
- tagsToApply.push(tagId)
+ tagsToApply.push(ref.normalizeChannel(tagId))
}
}
|
use normalizeChannel on new tag names
|
diff --git a/js/trackView.js b/js/trackView.js
index <HASH>..<HASH> 100755
--- a/js/trackView.js
+++ b/js/trackView.js
@@ -116,7 +116,8 @@ var igv = (function (igv) {
target;
self.igvTrackDragScrim = $('<div class="igv-track-drag-scrim">')[0];
- $(self.trackDiv).append(self.igvTrackDragScrim);
+ //$(self.trackDiv).append(self.igvTrackDragScrim);
+ $(self.viewportDiv).append(self.igvTrackDragScrim);
$(self.igvTrackDragScrim).hide();
self.igvTrackManipulationHandle = $('<div class="igv-track-manipulation-handle">')[0];
|
Issue <I>. Drag & drop. Track drag scrim now child of viewport.
|
diff --git a/django_user_agents/__init__.py b/django_user_agents/__init__.py
index <HASH>..<HASH> 100644
--- a/django_user_agents/__init__.py
+++ b/django_user_agents/__init__.py
@@ -1 +1 @@
-VERSION = (0, 1)
\ No newline at end of file
+VERSION = (0, 1, 1)
\ No newline at end of file
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ description = ("A django package that allows easy identification of visitor's "
setup(
name='django-user_agents',
- version='0.1',
+ version='0.1.1',
author='Selwin Ong',
author_email='selwin.ong@gmail.com',
packages=['django_user_agents'],
|
Bumped version number to <I>.
|
diff --git a/eventsourcing/postgres.py b/eventsourcing/postgres.py
index <HASH>..<HASH> 100644
--- a/eventsourcing/postgres.py
+++ b/eventsourcing/postgres.py
@@ -426,7 +426,7 @@ class PostgresApplicationRecorder(
"originator_version integer NOT NULL, "
"topic text, "
"state bytea, "
- "notification_id SERIAL, "
+ "notification_id BIGSERIAL, "
"PRIMARY KEY "
"(originator_id, originator_version)) "
"WITH (autovacuum_enabled=false)",
|
Changed notification_id from SERIAL to BIGSERIAL.
|
diff --git a/src/input.js b/src/input.js
index <HASH>..<HASH> 100644
--- a/src/input.js
+++ b/src/input.js
@@ -17,7 +17,9 @@ var Input = function(app, container) {
isMiddleDown: false,
isRightDown: false,
x: null,
- y: null
+ y: null,
+ dx: 0,
+ dy: 0
};
this._addEvents(app);
@@ -63,6 +65,11 @@ Input.prototype._addEvents = function(app) {
var x = e.offsetX === undefined ? e.layerX - self._container.offsetLeft : e.offsetX;
var y = e.offsetY === undefined ? e.layerY - self._container.offsetTop : e.offsetY;
+ if (self.mouse.x != null && self.mouse.x != null) {
+ self.mouse.dx = x - self.mouse.x;
+ self.mouse.dy = y - self.mouse.y;
+ }
+
self.mouse.x = x;
self.mouse.y = y;
self.mouse.isActive = true;
|
add new delta x/y to mouse
|
diff --git a/config/karma/config.js b/config/karma/config.js
index <HASH>..<HASH> 100644
--- a/config/karma/config.js
+++ b/config/karma/config.js
@@ -6,8 +6,6 @@ module.exports = function (config) {
basePath: '../../',
- concurrency: 2,
-
files: [
'test/unit/**/*.js'
],
@@ -106,7 +104,9 @@ module.exports = function (config) {
'FirefoxDeveloperHeadless',
'Opera',
'Safari'
- ]
+ ],
+
+ concurrency: 2
});
|
build: set concurrency only for local tests
|
diff --git a/aikif/dataTools/cls_dataset.py b/aikif/dataTools/cls_dataset.py
index <HASH>..<HASH> 100644
--- a/aikif/dataTools/cls_dataset.py
+++ b/aikif/dataTools/cls_dataset.py
@@ -1,5 +1,6 @@
-# cls_dataset.py written by Duncan Murray 25/6/2014
-
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+# cls_dataset.py
class DataSet(object):
"""
@@ -38,10 +39,11 @@ class DataSet(object):
self.schema = schema
self.username = username
self.password = password
-
+ self.connection = schema
def logout(self):
- print('Logging out - TODO')
+ print('Logging out')
+ self.connection = None
def list_tables(self, delim='\n'):
"""
|
correct header, login/out keeps schema
|
diff --git a/lib/lumber/level_util.rb b/lib/lumber/level_util.rb
index <HASH>..<HASH> 100644
--- a/lib/lumber/level_util.rb
+++ b/lib/lumber/level_util.rb
@@ -3,7 +3,7 @@ module Lumber
# So we have a named thread and can tell which we are in Thread.list
class MonitorThread < Thread
- attr_accessor :exit
+ attr_accessor :should_exit
end
extend MonitorMixin
@@ -82,7 +82,7 @@ module Lumber
def start_monitor(interval=10)
t = MonitorThread.new do
loop do
- break if self.exit
+ break if Thread.current.should_exit
begin
activate_levels
@@ -93,7 +93,7 @@ module Lumber
end
end
- at_exit { t.exit = true }
+ at_exit { t.should_exit = true }
t
end
|
self refers to the module here, not the thread. And renamed :exit to :should_exit to avoid conflicts with the Kernel#exit method.
|
diff --git a/ortstore/ortstore.go b/ortstore/ortstore.go
index <HASH>..<HASH> 100644
--- a/ortstore/ortstore.go
+++ b/ortstore/ortstore.go
@@ -86,7 +86,7 @@ func (vsc *OrtStore) Set(key []byte, value []byte) {
if bytes.Equal(key, rediscache.BYTES_SHUTDOWN) && bytes.Equal(value, rediscache.BYTES_NOW) {
vsc.vs.DisableAll()
vsc.vs.Flush()
- fmt.Println(vsc.vs.GatherStats(true))
+ fmt.Println(vsc.vs.Stats(true))
//pprof.StopCPUProfile()
//pproffp.Close()
os.Exit(0)
|
Changed GatherStats to just Stats
|
diff --git a/test/index.js b/test/index.js
index <HASH>..<HASH> 100644
--- a/test/index.js
+++ b/test/index.js
@@ -4,9 +4,7 @@ var assert = require('assert')
describe('builder', function () {
it('builds no directives', function () {
- var result = builder({
- directives: {}
- })
+ var result = builder({ directives: {} })
assert.equal(result, '')
})
|
Minor: shorten a test declaration to one line
|
diff --git a/pyqode/python/modes/autoindent.py b/pyqode/python/modes/autoindent.py
index <HASH>..<HASH> 100644
--- a/pyqode/python/modes/autoindent.py
+++ b/pyqode/python/modes/autoindent.py
@@ -121,6 +121,10 @@ class PyAutoIndentMode(AutoIndentMode):
return len(open_p), len(closed_p), open_p, closed_p
def _between_paren(self, tc, col):
+ try:
+ self.editor.modes.get('SymbolMatcherMode')
+ except KeyError:
+ return False
block = tc.block()
nb_open = nb_closed = 0
while block.isValid() and block.text().strip():
|
Fix infinite recursion if no symbol matcher has been installed
|
diff --git a/lib/catarse_pagarme/configuration.rb b/lib/catarse_pagarme/configuration.rb
index <HASH>..<HASH> 100644
--- a/lib/catarse_pagarme/configuration.rb
+++ b/lib/catarse_pagarme/configuration.rb
@@ -1,9 +1,11 @@
module CatarsePagarme
class Configuration
- attr_accessor :api_key
+ attr_accessor :api_key, :slip_tax, :credit_card_tax
def inititalizer
@api_key = ''
+ @slip_tax = 0
+ @credit_card_tax = 0
end
end
end
|
added slip_tax and credit_card_tax into configuration for get the fee
|
diff --git a/beyond/frames/stations.py b/beyond/frames/stations.py
index <HASH>..<HASH> 100644
--- a/beyond/frames/stations.py
+++ b/beyond/frames/stations.py
@@ -34,7 +34,7 @@ class TopocentricFrame(Frame):
from ..orbits.listeners import stations_listeners, Listener
- listeners = []
+ listeners = kwargs.get('listeners', [])
events_classes = tuple()
if events:
|
User listeners merged to stations' when computing visibility
|
diff --git a/lib/rooted_tree/version.rb b/lib/rooted_tree/version.rb
index <HASH>..<HASH> 100644
--- a/lib/rooted_tree/version.rb
+++ b/lib/rooted_tree/version.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
module RootedTree
- VERSION = '0.2.3'
+ VERSION = '0.3.0'
end
|
Bumped minor version number to signify breaking API changes
|
diff --git a/src/main/java/com/jayway/maven/plugins/android/phase09package/ApkMojo.java b/src/main/java/com/jayway/maven/plugins/android/phase09package/ApkMojo.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/jayway/maven/plugins/android/phase09package/ApkMojo.java
+++ b/src/main/java/com/jayway/maven/plugins/android/phase09package/ApkMojo.java
@@ -97,6 +97,14 @@ public class ApkMojo extends AbstractAndroidMojo {
* @readonly
*/
private String signDebug;
+
+ /**
+ * <p>A possibly new package name for the application. This value will be passed on to the aapt
+ * parameter --rename-manifest-package. Look to aapt for more help on this. </p>
+ *
+ * @parameter expression="${android.renameManifestPackage}"
+ */
+ private String renameManifestPackage;
/**
* <p>Root folder containing native libraries to include in the application package.</p>
@@ -756,6 +764,11 @@ public class ApkMojo extends AbstractAndroidMojo {
commands.add("-A");
commands.add(combinedAssets.getAbsolutePath());
}
+
+ if (StringUtils.isNotBlank(renameManifestPackage)) {
+ commands.add("--rename-manifest-package");
+ commands.add(renameManifestPackage);
+ }
commands.add("-I");
commands.add(androidJar.getAbsolutePath());
|
Fix issue-<I>. Added possibility to specify a custom application package name on commandline (-Dandroid.renameManifestPackage=my.new.package) or in the plugin's configuration (<renameManifestPackage>my.new.package</renameManifestPackage>)
|
diff --git a/lib/specinfra/version.rb b/lib/specinfra/version.rb
index <HASH>..<HASH> 100644
--- a/lib/specinfra/version.rb
+++ b/lib/specinfra/version.rb
@@ -1,3 +1,3 @@
module Specinfra
- VERSION = "2.70.1"
+ VERSION = "2.70.2"
end
|
Bump up version
[skip ci]
|
diff --git a/lib/models/providers/push/zeropush.js b/lib/models/providers/push/zeropush.js
index <HASH>..<HASH> 100644
--- a/lib/models/providers/push/zeropush.js
+++ b/lib/models/providers/push/zeropush.js
@@ -20,11 +20,11 @@ function ZeroPush(keys){
this.send = function(data, callback) {
var context = this;
+ var zeropushStat;
var deviceType = getType(data.deviceType);
var notification = getNotificationObject(deviceType, data.message);
context.client.register([data.deviceToken], function(err, response) {
- var zeropushStat;
if (err) {
zeropushStat = new ZeroPushErrorStatus(err);
|
Refactor.
for #<I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
setup(
name='soundscrape',
- version='0.15.1',
+ version='0.15.2',
packages=['soundscrape'],
install_requires=required,
include_package_data=True,
diff --git a/soundscrape/soundscrape.py b/soundscrape/soundscrape.py
index <HASH>..<HASH> 100755
--- a/soundscrape/soundscrape.py
+++ b/soundscrape/soundscrape.py
@@ -204,6 +204,9 @@ def tag_file(filename, artist, title, year, genre, artwork_url, album=None, trac
audio.save()
if artwork_url:
+
+ artwork_url = artwork_url.replace('https', 'http')
+
mime = 'image/jpeg'
if '.jpg' in artwork_url:
mime = 'image/jpeg'
|
<I> - security downgrade but SC https is maybe broken? or my system is fucked tx nsa
|
diff --git a/ombutil/appdata.go b/ombutil/appdata.go
index <HASH>..<HASH> 100644
--- a/ombutil/appdata.go
+++ b/ombutil/appdata.go
@@ -62,11 +62,8 @@ func appDataDir(goos, appName string, roaming bool) string {
}
case "darwin":
- if homeDir != "" {
- return filepath.Join("Library",
- "Application Support", appNameUpper)
- }
-
+ return filepath.Join("/", "Library",
+ "Application Support", appNameUpper)
case "plan9":
if homeDir != "" {
return filepath.Join(homeDir, appNameLower)
|
Added leading slash.
Commit without comment...
|
diff --git a/plans/contrib.py b/plans/contrib.py
index <HASH>..<HASH> 100644
--- a/plans/contrib.py
+++ b/plans/contrib.py
@@ -38,7 +38,7 @@ def send_template_email(recipients, title_template, body_template, context, lang
mail_title_template = loader.get_template(title_template)
mail_body_template = loader.get_template(body_template)
- title = mail_title_template.render(context)
+ title = mail_title_template.render(context).strip()
body = mail_body_template.render(context)
try:
mail_body_template_html = loader.get_template(body_template.replace('.txt', '.html'))
|
be less restrictive on mail title templates newlines
|
diff --git a/app/controllers/thredded/topics_controller.rb b/app/controllers/thredded/topics_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/thredded/topics_controller.rb
+++ b/app/controllers/thredded/topics_controller.rb
@@ -203,12 +203,6 @@ module Thredded
@messageboard = topic.messageboard
end
- def topic_params
- params
- .require(:topic)
- .permit(:title, :locked, :sticky, category_ids: [])
- end
-
def topic_params_for_update
params
.require(:topic)
|
remove unused method (#<I>)
|
diff --git a/test/integration/addons_test.go b/test/integration/addons_test.go
index <HASH>..<HASH> 100644
--- a/test/integration/addons_test.go
+++ b/test/integration/addons_test.go
@@ -56,7 +56,7 @@ func TestAddons(t *testing.T) {
return nil
}
- if err := commonutil.RetryAfter(10, checkAddon, 5*time.Second); err != nil {
+ if err := commonutil.RetryAfter(20, checkAddon, 5*time.Second); err != nil {
t.Fatalf("Addon Manager pod is unhealthy: %s", err)
}
}
|
Increase the timeout on the addon manager pod.
|
diff --git a/rules/predicates.py b/rules/predicates.py
index <HASH>..<HASH> 100644
--- a/rules/predicates.py
+++ b/rules/predicates.py
@@ -298,8 +298,8 @@ def is_group_member(*groups):
def fn(user):
if not hasattr(user, 'groups'):
return False # swapped user model, doesn't support groups
- if not hasattr(user, '_group_names_cache'): # pragma: no cover
- user._group_names_cache = set(user.groups.values_list('name', flat=True))
- return set(groups).issubset(user._group_names_cache)
+ group_names = set(user.groups.values_list('name', flat=True))
+ user._group_names_cache = group_names # just in case people were using this
+ return set(groups).issubset(group_names)
return fn
|
Fixed undesired caching in `is_group_member` factory
Fixes #<I>
|
diff --git a/ezp/content/services/trash.php b/ezp/content/services/trash.php
index <HASH>..<HASH> 100644
--- a/ezp/content/services/trash.php
+++ b/ezp/content/services/trash.php
@@ -11,6 +11,13 @@
/**
* Trash service, used for content trash handling
+ *
+ * Notes:
+ * Moving to trash is currently the same as moving to a custom subtree, not directly visible from the outside.
+ * When a Content is moved to the trash, it should remember its previous locations, so that it can be moved there
+ * again if restored. We therefore most likely need extra informations in order to be able to do that.
+ * Is it possible to achieve this in the business layer only, or do we need extra storage ?
+ *
* @package Content
* @subpackage Services
*/
|
Added notes to Content/Services/Trash
|
diff --git a/lib/simpletest/testnavigationlib.php b/lib/simpletest/testnavigationlib.php
index <HASH>..<HASH> 100644
--- a/lib/simpletest/testnavigationlib.php
+++ b/lib/simpletest/testnavigationlib.php
@@ -46,6 +46,8 @@ class navigation_node_test extends UnitTestCase {
parent::setUp();
$this->activeurl = $PAGE->url;
+ navigation_node::override_active_url($this->activeurl);
+
$this->inactiveurl = new moodle_url('http://www.moodle.com/');
$this->fakeproperties['action'] = $this->inactiveurl;
|
navigation MDL-<I> Attempting to fix navigation simpletests
|
diff --git a/test/mactag/tag/parser_test.rb b/test/mactag/tag/parser_test.rb
index <HASH>..<HASH> 100644
--- a/test/mactag/tag/parser_test.rb
+++ b/test/mactag/tag/parser_test.rb
@@ -22,16 +22,16 @@ class ParserTest < ActiveSupport::TestCase
setup do
File.stubs(:directory?).returns(true)
end
-
+
context 'none' do
setup do
- Mactag::Tag::Plugin.stubs(:all).returns([])
-
+ Mactag::Tag::Plugin.stubs(:all).returns(['devise'])
+
@parser.plugin
end
should 'have correct tag' do
- assert_equal [], tags
+ assert_equal 'vendor/plugins/devise/lib/**/*.rb', tags.first.tag
end
end
|
Actually, let there be a plugin in this test.
|
diff --git a/src/Models/Concerns/HasMemberOf.php b/src/Models/Concerns/HasMemberOf.php
index <HASH>..<HASH> 100644
--- a/src/Models/Concerns/HasMemberOf.php
+++ b/src/Models/Concerns/HasMemberOf.php
@@ -148,7 +148,7 @@ trait HasMemberOf
*/
public function inGroup($group, $recursive = false)
{
- $memberOf = $this->getGroups(['*'], $recursive);
+ $memberOf = $this->getGroups(['cn'], $recursive);
if ($group instanceof Collection) {
// If we've been given a collection then we'll convert
|
Optimize inGroup method
Only request the common name from groups.
|
diff --git a/src/super_archives/models.py b/src/super_archives/models.py
index <HASH>..<HASH> 100644
--- a/src/super_archives/models.py
+++ b/src/super_archives/models.py
@@ -326,10 +326,7 @@ class Message(models.Model):
@property
def author(self):
- from_address = self.from_address
- if from_address.user:
- return from_address.user.username
- return None
+ return self.fullname
@property
def author_url(self):
@@ -338,6 +335,10 @@ class Message(models.Model):
return None
@property
+ def fullname(self):
+ return self.from_address.get_full_name()
+
+ @property
def icon_name(self):
return u'envelope'
|
adding a fullname property to messages
|
diff --git a/txdbus/interface.py b/txdbus/interface.py
index <HASH>..<HASH> 100644
--- a/txdbus/interface.py
+++ b/txdbus/interface.py
@@ -38,10 +38,10 @@ class Method (object):
self.sigOut = returns
if arguments.count('h') > 1:
# More than one UNIX_FD argument requires Twisted >= 17.1.0.
- minTxVersion = type(twisted.version)('twisted', 17, 1, 0)
- if twisted.version < minTxVersion:
+ minTxVersion = '17.1.0'
+ if twisted.version.base() < minTxVersion:
raise RuntimeError('Method %r with multiple UNIX_FD arguments '
- 'requires Twisted >= %s' % (name, minTxVersion.short()))
+ 'requires Twisted >= %s' % (name, minTxVersion))
class Signal (object):
|
Simpler Twisted version check for multi FD arg support.
|
diff --git a/plugins/debug/debugPanel.js b/plugins/debug/debugPanel.js
index <HASH>..<HASH> 100644
--- a/plugins/debug/debugPanel.js
+++ b/plugins/debug/debugPanel.js
@@ -590,13 +590,14 @@
}
// draw the panel
- renderer.setColor("#00000080");
+ renderer.setGlobalAlpha(0.5);
+ renderer.setColor("black");
renderer.fillRect(
this.left, this.top,
this.width, this.height
);
-
- renderer.setColor("#FFFFFFFF");
+ renderer.setGlobalAlpha(1.0);
+ renderer.setColor("white");
this.font.textAlign = "left";
diff --git a/src/video/webgl/webgl_renderer.js b/src/video/webgl/webgl_renderer.js
index <HASH>..<HASH> 100644
--- a/src/video/webgl/webgl_renderer.js
+++ b/src/video/webgl/webgl_renderer.js
@@ -514,7 +514,9 @@
* @param {me.Color|String} color css color string.
*/
setColor : function (color) {
+ var alpha = this.currentColor.glArray[3];
this.currentColor.copy(color);
+ this.currentColor.glArray[3] *= alpha;
},
/**
|
[#<I>][WebGL] multiply the new currentColor alpha with the previous globalAlpha value
also restored the previous debugPanel setColor usage, as a testcase, and
to align both the canvas and wegbl rendering.
|
diff --git a/lib/rdo/connection.rb b/lib/rdo/connection.rb
index <HASH>..<HASH> 100644
--- a/lib/rdo/connection.rb
+++ b/lib/rdo/connection.rb
@@ -101,7 +101,7 @@ module RDO
rs.info[:execution_time] ||= Time.now - t
if logger.debug?
logger.debug(
- "(%.6f) %s%s" % [
+ "(%.6f) %s %s" % [
rs.execution_time,
statement,
("<Bind: #{bind_values.inspect}>" unless bind_values.empty?)
diff --git a/lib/rdo/version.rb b/lib/rdo/version.rb
index <HASH>..<HASH> 100644
--- a/lib/rdo/version.rb
+++ b/lib/rdo/version.rb
@@ -6,5 +6,5 @@
##
module RDO
- VERSION = "0.1.4"
+ VERSION = "0.1.5"
end
|
Fix logger format inconsistency
|
diff --git a/src/main/core.js b/src/main/core.js
index <HASH>..<HASH> 100644
--- a/src/main/core.js
+++ b/src/main/core.js
@@ -259,7 +259,7 @@ function format(text, opts) {
module.exports = {
formatWithCursor(text, opts) {
opts = normalizeOptions(opts);
- return format(text, normalizeOptions(opts));
+ return format(text, opts);
},
parse(text, opts, massage) {
|
refactor: remove redundant call to normalizeOptions (#<I>)
Removes redundant call to `normalizeOptions` (already done in preceding line)
<URL>
|
diff --git a/tsfresh/feature_extraction/extraction.py b/tsfresh/feature_extraction/extraction.py
index <HASH>..<HASH> 100644
--- a/tsfresh/feature_extraction/extraction.py
+++ b/tsfresh/feature_extraction/extraction.py
@@ -104,7 +104,7 @@ def extract_features(timeseries_container, feature_extraction_settings=None,
sorting=feature_extraction_settings.PROFILING_SORTING)
pool.close()
- pool.terminate()
+ pool.join()
return result
diff --git a/tsfresh/feature_selection/feature_selector.py b/tsfresh/feature_selection/feature_selector.py
index <HASH>..<HASH> 100644
--- a/tsfresh/feature_selection/feature_selector.py
+++ b/tsfresh/feature_selection/feature_selector.py
@@ -120,7 +120,7 @@ def check_fs_sig_bh(X, y, settings=None):
df_features.update(p_values_of_features)
pool.close()
- pool.terminate()
+ pool.join()
# Perform the real feature rejection
if "const" in set(df_features.type):
|
Wait for the worker processes to exit (#<I>)
This fixes Issue #<I>
|
diff --git a/absl/testing/absltest.py b/absl/testing/absltest.py
index <HASH>..<HASH> 100644
--- a/absl/testing/absltest.py
+++ b/absl/testing/absltest.py
@@ -434,15 +434,21 @@ class TestCase(unittest3_backport.TestCase):
if six.PY2:
def assertCountEqual(self, expected_seq, actual_seq, msg=None):
- """An unordered sequence specific comparison.
+ """Tests two sequences have the same elements regardless of order.
- It asserts that actual_seq and expected_seq have the same element counts.
- Equivalent to::
+ It tests that the first sequence contains the same elements as the
+ second, regardless of their order. When they don't, an error message
+ listing the differences between the sequences will be generated.
- self.assertEqual(Counter(iter(actual_seq)),
- Counter(iter(expected_seq)))
+ Duplicate elements are not ignored when comparing first and second.
+ It verifies whether each element has the same count in both sequences.
+ Equivalent to:
+
+ self.assertEqual(Counter(list(expected_seq)),
+ Counter(list(actual_seq)))
+
+ but works with sequences of unhashable objects as well.
- Asserts that each element has the same count in both sequences.
Example:
- [0, 1, 1] and [1, 0, 1] compare equal.
- [0, 0, 1] and [0, 1] compare unequal.
|
Update assertCountEqual's document, to match the one on <URL>
|
diff --git a/src/you_get/extractors/bilibili.py b/src/you_get/extractors/bilibili.py
index <HASH>..<HASH> 100644
--- a/src/you_get/extractors/bilibili.py
+++ b/src/you_get/extractors/bilibili.py
@@ -192,7 +192,12 @@ class Bilibili(VideoExtractor):
index_id = int(re.search(r'index_(\d+)', self.url).group(1))
cid = page_list[index_id-1]['cid'] # change cid match rule
except:
- cid = re.search(r'"cid":(\d+)', self.page).group(1)
+ page = re.search(r'p=(\d+)', self.url)
+ if page is None:
+ p = 1
+ else:
+ p = int(page.group(1))
+ cid = re.search(r'"cid":(\d+),"page":%s' % p, self.page).group(1)
if cid is not None:
self.download_by_vid(cid, re.search('bangumi', self.url) is not None, **kwargs)
else:
|
[bilibili] the production of too many useful things results in
|
diff --git a/testem.js b/testem.js
index <HASH>..<HASH> 100755
--- a/testem.js
+++ b/testem.js
@@ -44,6 +44,7 @@ program.on('--help', function(){
console.log(' q quit')
console.log(' LEFT ARROW move to the next browser tab on the left')
console.log(' RIGHT ARROW move to the next browser tab on the right')
+ console.log(' TAB switch between top and bottom panel (split mode only)')
console.log(' UP ARROW scroll up in the target text panel')
console.log(' DOWN ARROW scroll down in the target text panel')
console.log(' SPACE page down in the target text panel')
|
Added TAB to keyboard help.
|
diff --git a/invocations/checks.py b/invocations/checks.py
index <HASH>..<HASH> 100644
--- a/invocations/checks.py
+++ b/invocations/checks.py
@@ -6,15 +6,21 @@ from __future__ import unicode_literals
from invoke import task
-@task(name='blacken', iterable=['folder'])
-def blacken(c, line_length=79, folder=None):
+
+@task(name="blacken", iterable=["folder"])
+def blacken(c, line_length=79, folder=None, check=False):
"""Run black on the current source"""
default_folders = ["."]
- configured_folders = c.config.get("blacken", {}).get("folders", default_folders)
+ configured_folders = c.config.get("blacken", {}).get(
+ "folders", default_folders
+ )
folders = configured_folders if not folder else folder
black_command_line = "black -l {0}".format(line_length)
+ if check:
+ black_command_line = "{0} --check".format(black_command_line)
+
cmd = "find {0} -name '*.py' | xargs {1}".format(
" ".join(folders), black_command_line
)
|
Add --check support to the invocations.blacken task
|
diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py
index <HASH>..<HASH> 100644
--- a/salt/cloud/clouds/ec2.py
+++ b/salt/cloud/clouds/ec2.py
@@ -2064,6 +2064,8 @@ def create(vm_=None, call=None):
)
)
vm_['key_filename'] = key_filename
+ # wait_for_instance requires private_key
+ vm_['private_key'] = key_filename
# Get SSH Gateway config early to verify the private_key,
# if used, exists or not. We don't want to deploy an instance
|
Fixed private_key missing in vm_ for wait_for_instance
|
diff --git a/src/Channels/PushChannel.php b/src/Channels/PushChannel.php
index <HASH>..<HASH> 100644
--- a/src/Channels/PushChannel.php
+++ b/src/Channels/PushChannel.php
@@ -70,11 +70,7 @@ abstract class PushChannel
$feedback = $this->push->send()
->getFeedback();
- if (function_exists('broadcast')) {
- broadcast(new NotificationPushed($this->push));
- } elseif (function_exists('event')) {
- event(new NotificationPushed($this->push));
- }
+ $this->broadcast();
return $feedback;
}
@@ -126,9 +122,22 @@ abstract class PushChannel
abstract protected function buildData(PushMessage $message);
/**
+ * BroadCast NotificationPushed event
+ */
+ protected function broadcast()
+ {
+ if (function_exists('broadcast')) {
+ broadcast(new NotificationPushed($this->push));
+ } elseif (function_exists('event')) {
+ event(new NotificationPushed($this->push));
+ }
+ }
+
+ /**
* Get push notification service name.
*
* @return string
*/
abstract protected function pushServiceName();
+
}
|
Code Refactoring
Extract broadcasting action to a method
|
diff --git a/llvmlite/binding/analysis.py b/llvmlite/binding/analysis.py
index <HASH>..<HASH> 100644
--- a/llvmlite/binding/analysis.py
+++ b/llvmlite/binding/analysis.py
@@ -58,10 +58,11 @@ def view_dot_graph(graph, filename=None, view=False):
else:
# Attempts to show the graph in IPython notebook
try:
- import IPython.display as display
- except ImportError:
+ __IPYTHON__
+ except NameError:
return src
else:
+ import IPython.display as display
format = 'svg'
return display.SVG(data=src.pipe(format))
|
Detect if we are in ipython
|
diff --git a/lib/systemd/journal/version.rb b/lib/systemd/journal/version.rb
index <HASH>..<HASH> 100644
--- a/lib/systemd/journal/version.rb
+++ b/lib/systemd/journal/version.rb
@@ -1,6 +1,6 @@
module Systemd
class Journal
# The version of the systemd-journal gem.
- VERSION = '1.4.1'
+ VERSION = '1.4.2'.freeze
end
end
|
Update VERSION to <I>
|
diff --git a/src/Context/RawMultilingualContext.php b/src/Context/RawMultilingualContext.php
index <HASH>..<HASH> 100644
--- a/src/Context/RawMultilingualContext.php
+++ b/src/Context/RawMultilingualContext.php
@@ -66,8 +66,6 @@ class RawMultilingualContext extends RawMinkContext implements MultilingualConte
}
$session = $this->getSession();
$element = $session->getPage()->find('css', $input);
- $text = "";
-
if(isset($element)) {
$text = $element->getValue();
}
@@ -132,7 +130,6 @@ class RawMultilingualContext extends RawMinkContext implements MultilingualConte
$session = $this->getSession();
$element = $session->getPage()->find('region', $region)->find('xpath', $session->getSelectorsHandler()->selectorToXpath('xpath',
'//*[contains(text(),"' . $text . '")]'));
-
if (null === $element) {
throw new \InvalidArgumentException(sprintf('Cannot find text: "%s"', $text));
}
|
Fixing code issues in RawContext.
|
diff --git a/java/client/test/org/openqa/selenium/remote/StartingFirefoxRemotelyTest.java b/java/client/test/org/openqa/selenium/remote/StartingFirefoxRemotelyTest.java
index <HASH>..<HASH> 100644
--- a/java/client/test/org/openqa/selenium/remote/StartingFirefoxRemotelyTest.java
+++ b/java/client/test/org/openqa/selenium/remote/StartingFirefoxRemotelyTest.java
@@ -40,6 +40,7 @@ public class StartingFirefoxRemotelyTest extends JUnit4TestBase {
@BeforeClass
public static void ensureTestingFirefox() {
Assume.assumeTrue("ff".equals(System.getProperty("selenium.browser")));
+ Assume.assumeTrue(Boolean.getBoolean("selenium.browser.remote"));
}
@Before
|
Adding a guard for remote specific test
|
diff --git a/lib/Doctrine/Common/Collections/ArrayCollection.php b/lib/Doctrine/Common/Collections/ArrayCollection.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/Common/Collections/ArrayCollection.php
+++ b/lib/Doctrine/Common/Collections/ArrayCollection.php
@@ -347,7 +347,7 @@ class ArrayCollection implements Collection
*/
public function map(Closure $func)
{
- return new ArrayCollection(array_map($func, $this->_elements));
+ return new static(array_map($func, $this->_elements));
}
/**
@@ -359,7 +359,7 @@ class ArrayCollection implements Collection
*/
public function filter(Closure $p)
{
- return new ArrayCollection(array_filter($this->_elements, $p));
+ return new static(array_filter($this->_elements, $p));
}
/**
@@ -399,7 +399,7 @@ class ArrayCollection implements Collection
$coll2[$key] = $element;
}
}
- return array(new ArrayCollection($coll1), new ArrayCollection($coll2));
+ return array(new static($coll1), new static($coll2));
}
/**
|
Replaced "new ArrayCollection" with "new static". This allows subclasses to create new instances of the subclass
|
diff --git a/lib/netaddr.rb b/lib/netaddr.rb
index <HASH>..<HASH> 100644
--- a/lib/netaddr.rb
+++ b/lib/netaddr.rb
@@ -48,10 +48,10 @@ module NetAddr
## parse_net parses a string into an IPv4Net or IPv6Net
def parse_net(net)
- if (net.include?(".")) # ipv4
- return IPv4Net.parse(net)
+ if (net.include?(":"))
+ return IPv6Net.parse(net)
end
- return IPv6Net.parse(net)
+ return IPv4Net.parse(net)
end
module_function :parse_net
diff --git a/test/netaddr_test.rb b/test/netaddr_test.rb
index <HASH>..<HASH> 100644
--- a/test/netaddr_test.rb
+++ b/test/netaddr_test.rb
@@ -13,6 +13,7 @@ class TestNetAddr < Test::Unit::TestCase
def test_parse_net
assert_equal("128.0.0.1/32", NetAddr.parse_net("128.0.0.1/32").to_s)
assert_equal("1::/24", NetAddr.parse_net("1::1/24").to_s)
+ assert_equal("1::aabb:ccdd/128", NetAddr.parse_net("1::170.187.204.221/128").to_s)
end
def test_ipv4_prefix_len
|
Fix support for ipv4-embedded ipv6 networks
|
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -2,6 +2,7 @@ require 'date'
require 'set'
require 'bigdecimal'
require 'bigdecimal/util'
+require 'active_support/core_ext/string/strip'
module ActiveRecord
module ConnectionAdapters #:nodoc:
|
Add missing AS require
`strip_heredoc` method is defined on active_support/core_ext/string
|
diff --git a/cleverhans/picklable_model.py b/cleverhans/picklable_model.py
index <HASH>..<HASH> 100644
--- a/cleverhans/picklable_model.py
+++ b/cleverhans/picklable_model.py
@@ -1,5 +1,11 @@
-"""Models that support pickling
-
+"""Models that support pickling.
+
+NOTE: This module is much more free to change than many other modules
+in CleverHans. CleverHans is very conservative about changes to any
+code that affects the output of benchmark tests (attacks, evaluation
+methods, etc.). This module provides *models* not *benchmarks* and
+thus is free to change rapidly to provide better speed, accuracy,
+etc.
"""
from __future__ import absolute_import
diff --git a/cleverhans/train.py b/cleverhans/train.py
index <HASH>..<HASH> 100644
--- a/cleverhans/train.py
+++ b/cleverhans/train.py
@@ -1,3 +1,14 @@
+"""
+Multi-replica synchronous training
+
+
+NOTE: This module is much more free to change than many other modules
+in CleverHans. CleverHans is very conservative about changes to any
+code that affects the output of benchmark tests (attacks, evaluation
+methods, etc.). This module provides *model training* functionality
+not *benchmarks* and thus is free to change rapidly to provide better
+speed, accuracy, etc.
+"""
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
|
disclaimers about fast-changing portions of codebase
|
diff --git a/app/models/web_console/console_session.rb b/app/models/web_console/console_session.rb
index <HASH>..<HASH> 100644
--- a/app/models/web_console/console_session.rb
+++ b/app/models/web_console/console_session.rb
@@ -104,4 +104,7 @@ module WebConsole
synchronize { INMEMORY_STORAGE[id] = self }
end
end
+
+ # Explicitly configue include_root_in_json for Rails 3 compatibility.
+ ConsoleSession.include_root_in_json = false
end
|
Explicitly configue include_root_in_json for Rails 3 compatibility
|
diff --git a/public/js/runner/processor.js b/public/js/runner/processor.js
index <HASH>..<HASH> 100644
--- a/public/js/runner/processor.js
+++ b/public/js/runner/processor.js
@@ -74,11 +74,6 @@ var processor = (function () {
source = doctypeObj.tail;
combinedSource.push(doctype);
- // this ensures that requests are bounced away from
- // jsbin when they're relative. They shouldn't be
- // hitting jsbin directly for broken images, etc.
- combinedSource.push('<base href="//null.jsbin.com/">');
-
// Kill the blocking functions
// IE requires that this is done in the script, rather than off the window
// object outside of the doc.write.
|
Remove <base>
Note: this doesn't remove the null domain, this is now set as the runner: null.jsbin.com - but null.jsbin.com/runner *does* serve the correct file, and everything is else returned a <I> - so we're still protected.
Fixes #<I>
Fixes #<I>
Fixes #<I>
|
diff --git a/wallace/command_line.py b/wallace/command_line.py
index <HASH>..<HASH> 100755
--- a/wallace/command_line.py
+++ b/wallace/command_line.py
@@ -79,7 +79,8 @@ def deploy(*args):
# Create the psiturk command script.
with open("psiturk_commands.txt", "w") as file:
- file.write("server on")
+ file.write("server restart")
+
# Commit the new files to the new experiment branch.
log("Inserting psiTurk- and Heroku-specfic files.")
|
Restart psiTurk server instead of turning it on
|
diff --git a/greenmail-core/src/main/java/com/icegreen/greenmail/store/SimpleMessageAttributes.java b/greenmail-core/src/main/java/com/icegreen/greenmail/store/SimpleMessageAttributes.java
index <HASH>..<HASH> 100644
--- a/greenmail-core/src/main/java/com/icegreen/greenmail/store/SimpleMessageAttributes.java
+++ b/greenmail-core/src/main/java/com/icegreen/greenmail/store/SimpleMessageAttributes.java
@@ -738,7 +738,7 @@ public class SimpleMessageAttributes
}
public String escapeHeader(final String text) {
- return text.replace("\r", "\\\r").replace("\n", "\\\n").replace("\\", "\\\\").replace("\"", "\\\"");
+ return MimeUtility.unfold(text).replace("\\", "\\\\").replace("\"", "\\\"");
}
}
|
Use MimeUtility for unfolding.
|
diff --git a/test/spec/ol/layer/vectorlayer.test.js b/test/spec/ol/layer/vectorlayer.test.js
index <HASH>..<HASH> 100644
--- a/test/spec/ol/layer/vectorlayer.test.js
+++ b/test/spec/ol/layer/vectorlayer.test.js
@@ -170,12 +170,13 @@ describe('ol.layer.Vector', function() {
});
- layer.dispose();
+ goog.dispose(layer);
});
});
+goog.require('goog.dispose');
goog.require('ol.Expression');
goog.require('ol.Feature');
goog.require('ol.filter.Extent');
|
Fix use of dispose in ol.layer.Vector tests
|
diff --git a/lib/traject/marc4j_reader.rb b/lib/traject/marc4j_reader.rb
index <HASH>..<HASH> 100644
--- a/lib/traject/marc4j_reader.rb
+++ b/lib/traject/marc4j_reader.rb
@@ -51,11 +51,13 @@ class Traject::Marc4JReader
@input_stream = input_stream
ensure_marc4j_loaded!
-
- if @settings['marc4j_reader.keep_marc4j']
+
+ if @settings['marc4j_reader.keep_marc4j'] &&
+ ! (MARC::Record.instance_methods.include?(:original_marc4j) &&
+ MARC::Record.instance_methods.include?(:"original_marc4j="))
MARC::Record.class_eval('attr_accessor :original_marc4j')
end
-
+
end
# Loads solrj unless it appears to already be loaded.
|
Marc4JReader, original_marc4j, try not to monkey patch MARC::Record more than once
|
diff --git a/src/HttpFactory.php b/src/HttpFactory.php
index <HASH>..<HASH> 100644
--- a/src/HttpFactory.php
+++ b/src/HttpFactory.php
@@ -55,7 +55,7 @@ class HttpFactory
* @since 1.0
* @throws \InvalidArgumentException
*/
- public static function getAvailableDriver($options, $default = null)
+ public static function getAvailableDriver($options = array(), $default = null)
{
if (!is_array($options) && !($options instanceof \ArrayAccess))
{
|
Make options param optional, not required to inject into TransportInterface objects
|
diff --git a/lib/Client.js b/lib/Client.js
index <HASH>..<HASH> 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -131,6 +131,8 @@ Client.prototype.mergeRemoteConfig = function(callback) {
return cb(err);
}
+ self.config.web.forgotPassword.enabled = directory.passwordPolicy.resetEmailStatus === 'ENABLED';
+ self.config.web.changePassword.enabled = directory.passwordPolicy.resetEmailStatus === 'ENABLED';
self.config.web.verifyEmail.enabled = directory.accountCreationPolicy.verificationEmailStatus === 'ENABLED';
self.config.web.changePassword.enabled = self.config.web.forgotPassword.enabled = directory.passwordPolicy.resetEmailStatus === 'ENABLED';
|
Updating Client config to merge in the password reset configuration options.
|
diff --git a/tests/test_descriptions.py b/tests/test_descriptions.py
index <HASH>..<HASH> 100644
--- a/tests/test_descriptions.py
+++ b/tests/test_descriptions.py
@@ -35,6 +35,14 @@ type_defs = '''
"Chinese"
CH
}
+
+ """
+ A poorly documented object type.
+ """
+ type MyObject {
+ myField: String
+ transform(a: String): String
+ }
'''
@@ -67,3 +75,14 @@ def test_object_field_argument_has_description(schema):
translate_field = schema.get_type("Query").fields.get("translate")
argument = translate_field.args["fromLanguage"]
assert isinstance(argument.description, str)
+
+
+def test_undocumented_object_field_description_is_none(schema):
+ description = schema.get_type("MyObject").fields.get("myField").description
+ assert description is None
+
+
+def test_undocumented_object_field_argument_description_is_none(schema):
+ my_field = schema.get_type("MyObject").fields.get("transform")
+ description = my_field.args.get("a").description
+ assert description is None
|
Assert description is absent when not documented
|
diff --git a/test/com/opera/core/systems/OperaDriverTest.java b/test/com/opera/core/systems/OperaDriverTest.java
index <HASH>..<HASH> 100644
--- a/test/com/opera/core/systems/OperaDriverTest.java
+++ b/test/com/opera/core/systems/OperaDriverTest.java
@@ -215,8 +215,10 @@ public class OperaDriverTest extends OperaDriverTestCase {
}
}
String profile = a.preferences().get("User Prefs", "Opera Directory").toString();
- assertTrue("'" + profile + "' (case insensitively) should contain 'tmp' or 'temp'",
- profile.toLowerCase().contains("tmp") || profile.toLowerCase().contains("temp"));
+ assertTrue("'" + profile + "' (case insensitively) should contain 'tmp', 'temp' or 'var/folders/ly'",
+ profile.toLowerCase().contains("tmp") ||
+ profile.toLowerCase().contains("temp") ||
+ profile.toLowerCase().contains("var/folders/ly"));
a.quit();
}
|
Apparently temporary folder on Mac is /var/folders
|
diff --git a/src/rules/no-cycle.js b/src/rules/no-cycle.js
index <HASH>..<HASH> 100644
--- a/src/rules/no-cycle.js
+++ b/src/rules/no-cycle.js
@@ -22,7 +22,7 @@ module.exports = {
create: function (context) {
const myPath = context.getFilename()
- if (myPath === '<text>') return // can't cycle-check a non-file
+ if (myPath === '<text>') return {} // can't cycle-check a non-file
const options = context.options[0] || {}
const maxDepth = options.maxDepth || Infinity
|
[Fix] `no-cycle`: `create` must *always* return an object, even if there’s no listeners
|
diff --git a/src/test/java/org/jdbdt/DBTestCase.java b/src/test/java/org/jdbdt/DBTestCase.java
index <HASH>..<HASH> 100644
--- a/src/test/java/org/jdbdt/DBTestCase.java
+++ b/src/test/java/org/jdbdt/DBTestCase.java
@@ -84,7 +84,7 @@ public class DBTestCase {
protected static final User[] INITIAL_DATA = {
new User("linus", "Linus Torvalds", "linux", Date.valueOf("2015-01-01")),
- new User("steve", "Steve Hobs", "macos", Date.valueOf("2015-12-31")),
+ new User("steve", "Steve Jobs", "macos", Date.valueOf("2015-12-31")),
new User("bill", "Bill Gates", "windows", Date.valueOf("2015-09-12"))
};
|
DBTestCase: small adjustment
|
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -74,6 +74,13 @@ module ActionDispatch
class AbstractStore < Rack::Session::Abstract::ID
include Compatibility
include StaleSessionCheck
+
+ private
+
+ def set_cookie(env, session_id, cookie)
+ request = ActionDispatch::Request.new(env)
+ request.cookie_jar[key] = cookie
+ end
end
end
end
diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index <HASH>..<HASH> 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -254,6 +254,13 @@ class ActiveRecordStoreTest < ActionDispatch::IntegrationTest
end
end
+ def test_session_store_with_all_domains
+ with_test_route_set(:domain => :all) do
+ get '/set_session_value'
+ assert_response :success
+ end
+ end
+
private
def with_test_route_set(options = {})
|
Support cookie jar options for all cookie stores
|
diff --git a/src/Bridge/AuthCodeRepository.php b/src/Bridge/AuthCodeRepository.php
index <HASH>..<HASH> 100644
--- a/src/Bridge/AuthCodeRepository.php
+++ b/src/Bridge/AuthCodeRepository.php
@@ -32,7 +32,7 @@ class AuthCodeRepository implements AuthCodeRepositoryInterface
'expires_at' => $authCodeEntity->getExpiryDateTime(),
];
- Passport::authCode()->setRawAttributes($attributes)->save();
+ Passport::authCode()->forceFill($attributes)->save();
}
/**
|
Change to forceFill. Fixes #<I>. (#<I>)
|
diff --git a/lib/chef/knife/backup_restore.rb b/lib/chef/knife/backup_restore.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/knife/backup_restore.rb
+++ b/lib/chef/knife/backup_restore.rb
@@ -133,7 +133,6 @@ module ServerBackup
def users
JSON.create_id = "no_thanks"
ui.info "=== Restoring users ==="
- password = SecureRandom.hex[0..7]
users = Dir.glob(File.join(config[:backup_dir], "users", "*.json"))
if !users.empty? and Chef::VERSION !~ /^1[1-9]\./
ui.warn "users restore only supported on chef >= 11"
@@ -141,6 +140,7 @@ module ServerBackup
end
users.each do |file|
user = JSON.parse(IO.read(file))
+ password = SecureRandom.hex[0..7]
begin
rest.post_rest("users", {
:name => user['name'],
|
Generate a new password on each round.
|
diff --git a/paramiko/server.py b/paramiko/server.py
index <HASH>..<HASH> 100644
--- a/paramiko/server.py
+++ b/paramiko/server.py
@@ -579,6 +579,8 @@ class ServerInterface (object):
The default implementation always returns ``(None, None)``.
:returns: A tuple containing the banner and language code.
+
+ .. versionadded:: 2.3
"""
return (None, None)
|
Really, really gotta get better about enforcing these
|
diff --git a/src/IncomingEntry.php b/src/IncomingEntry.php
index <HASH>..<HASH> 100644
--- a/src/IncomingEntry.php
+++ b/src/IncomingEntry.php
@@ -243,6 +243,16 @@ class IncomingEntry
}
/**
+ * Determine if the incoming entry is a query.
+ *
+ * @return bool
+ */
+ public function isQuery()
+ {
+ return $this->type === EntryType::QUERY;
+ }
+
+ /**
* Get the family look-up hash for the incoming entry.
*
* @return string|null
|
improvement - Added isQuery() in IncomingEntry
|
diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/RetryableZuulProxyApplicationTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/RetryableZuulProxyApplicationTests.java
index <HASH>..<HASH> 100644
--- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/RetryableZuulProxyApplicationTests.java
+++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/zuul/RetryableZuulProxyApplicationTests.java
@@ -43,7 +43,8 @@ import com.netflix.zuul.context.RequestContext;
value = {
"zuul.routes.simple.path: /simple/**",
"zuul.routes.simple.retryable: true",
- "ribbon.OkToRetryOnAllOperations: true"})
+ "ribbon.OkToRetryOnAllOperations: true",
+ "simple.ribbon.retryableStatusCodes: 404"})
@DirtiesContext
public class RetryableZuulProxyApplicationTests {
|
Adding <I> to list of retryable status codes
|
diff --git a/src/express/index.spec.js b/src/express/index.spec.js
index <HASH>..<HASH> 100644
--- a/src/express/index.spec.js
+++ b/src/express/index.spec.js
@@ -4,4 +4,22 @@ describe('graffiti express', function() {
var express = require('./');
+ it('checks for required options');
+
+ it('creates the schema');
+
+ describe('requested url starts with prefix', function() {
+
+ it('returns with proper results');
+
+ it('returns with an error');
+
+ });
+
+ describe('requested url does not start with prefix', function() {
+
+ it('calls the next middleware');
+
+ });
+
});
|
test(express): add failing test cases for Express middleware
|
diff --git a/pcapfile/structs.py b/pcapfile/structs.py
index <HASH>..<HASH> 100644
--- a/pcapfile/structs.py
+++ b/pcapfile/structs.py
@@ -54,7 +54,13 @@ class pcap_packet(ctypes.Structure):
return binascii.unhexlify(self.packet)
def __repr__(self):
- return self.raw()
+ if isinstance(self.packet, str):
+ try:
+ return self.raw()
+ except TypeError:
+ return str(self.packet)
+ else:
+ return str(self.packet)
|
pcap_packets have improved __repr__
if the packet is a string (i.e. not decoded), the packet will
still be represented as a string; otherwise, it is up to the
decoded packet type to choose display types.
|
diff --git a/lib/pansophy/synchronizer.rb b/lib/pansophy/synchronizer.rb
index <HASH>..<HASH> 100644
--- a/lib/pansophy/synchronizer.rb
+++ b/lib/pansophy/synchronizer.rb
@@ -18,7 +18,9 @@ module Pansophy
next if directory?(file)
file_path = @local_directory.join(destination_for(file))
file_path.dirname.mkpath
- file_path.write(file.body)
+ File.open(file_path, 'w') do |f|
+ f.write file.body
+ end
end
end
|
Retrocompatibility for Ruby <I> and <I>
|
diff --git a/password/git.go b/password/git.go
index <HASH>..<HASH> 100644
--- a/password/git.go
+++ b/password/git.go
@@ -145,7 +145,7 @@ func (s *Store) gitCommit(msg string) error {
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
- return fmt.Errorf("failed to committ files to git: %v", err)
+ return fmt.Errorf("failed to commit files to git: %v", err)
}
return nil
|
Fix typo: committ -> commit (#<I>)
|
diff --git a/zengine/lib/catalog_data.py b/zengine/lib/catalog_data.py
index <HASH>..<HASH> 100644
--- a/zengine/lib/catalog_data.py
+++ b/zengine/lib/catalog_data.py
@@ -65,6 +65,18 @@ class CatalogData(object):
"""
return self._get_from_local_cache(cat) or self._get_from_cache(cat) or self._get_from_db(cat)
+ def get_all_as_dict(self, cat):
+ """
+ Transforms get_all method's results to key value pairs in dict.
+
+ Args:
+ cat(str): catalog data key name
+
+ Returns(dict): key-value pair dict.
+
+ """
+ return {item['value']: item['name'] for item in self.get_all(cat)}
+
def _get_from_cache(self, cat):
lang = self._get_lang()
self.CACHE[lang][cat] = CatalogCache(self._get_lang(), cat).get()
|
ADD, catalog_data_results as dict implementation is taken to under catalog data manager.
|
diff --git a/lib/server/serverJquery.js b/lib/server/serverJquery.js
index <HASH>..<HASH> 100644
--- a/lib/server/serverJquery.js
+++ b/lib/server/serverJquery.js
@@ -1,8 +1,15 @@
"use strict";
-var jsdom = require("jsdom").jsdom;
+var serverWindow = require("jsdom").jsdom().parentWindow;
-module.exports = require("jquery")(jsdom().parentWindow);
+/**
+ * [wawjr3d] next 2 lines fix issue here:
+ * https://github.com/bloomberg/brisket/issues/36
+ */
+serverWindow.HTMLFrameElement._init = function() {};
+serverWindow.HTMLIFrameElement._init = function() {};
+
+module.exports = require("jquery")(serverWindow);
// ----------------------------------------------------------------------------
// Copyright (C) 2015 Bloomberg Finance L.P.
|
fix iframe in View leaks on server side
|
diff --git a/ctypeslib/codegen/codegenerator.py b/ctypeslib/codegen/codegenerator.py
index <HASH>..<HASH> 100644
--- a/ctypeslib/codegen/codegenerator.py
+++ b/ctypeslib/codegen/codegenerator.py
@@ -916,13 +916,13 @@ def generate_code(srcfiles,
# if we only want complete matches:
if match and match.group() == i.name:
todo.append(i)
- break
+ continue
# if we follow our own documentation,
# allow regular expression match of any part of name:
match = s.search(i.name)
if match:
todo.append(i)
- break
+ continue
if symbols or expressions:
items = todo
|
Allow more then one match when testing expressions
|
diff --git a/public/js/main.js b/public/js/main.js
index <HASH>..<HASH> 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -156,7 +156,7 @@ $.extend(true, window, {
var type = aposPages.getType(typeName);
if (type.settings) {
- var $typeEl = apos.fromTemplate('.apos-page-settings-' + type._css);
+ var $typeEl = apos.fromTemplate('.apos-page-settings-' + type._typeCss);
$el.find('[data-type-details]').html($typeEl);
var typeDefaults = typeData[typeName];
if (!typeDefaults) {
|
A page type that has custom page settings must now have an _typeCss property. _css is unsuitable because page types may share an instance type
|
diff --git a/aiohttp/helpers.py b/aiohttp/helpers.py
index <HASH>..<HASH> 100644
--- a/aiohttp/helpers.py
+++ b/aiohttp/helpers.py
@@ -6,7 +6,6 @@ import functools
import io
import os
import re
-import warnings
from urllib.parse import quote, urlencode
from collections import namedtuple
@@ -503,13 +502,9 @@ class Timeout:
else:
self._cancel_handler.cancel()
- def __del__(self):
- if self._task:
- # just for preventing improper usage
- warnings.warn("Use async with")
-
def _cancel_task(self):
self._cancelled = self._task.cancel()
def cancel(self):
+ """Stop counting time and timeout logic"""
self._cancel_handler.cancel()
|
drop __del__ method
|
diff --git a/lib/actions/ResourcesDeploy.js b/lib/actions/ResourcesDeploy.js
index <HASH>..<HASH> 100644
--- a/lib/actions/ResourcesDeploy.js
+++ b/lib/actions/ResourcesDeploy.js
@@ -164,7 +164,7 @@ usage: serverless resources deploy`,
.then(function(resources) {
_this.cfTemplate = resources;
- console.log(resources);
+
// Create CloudFormation template in _meta folder
return SUtils.writeFile(
path.join(_this.S.config.projectPath, '_meta', 'resources', 's-resources-cf-' + _this.evt.options.stage + '-' + replaceall('-', '', _this.evt.options.region) + '.json'),
|
removes `console.log` from ResourcesDeploy
|
diff --git a/binder/src/main/java/io/grpc/binder/AndroidComponentAddress.java b/binder/src/main/java/io/grpc/binder/AndroidComponentAddress.java
index <HASH>..<HASH> 100644
--- a/binder/src/main/java/io/grpc/binder/AndroidComponentAddress.java
+++ b/binder/src/main/java/io/grpc/binder/AndroidComponentAddress.java
@@ -16,6 +16,7 @@
package io.grpc.binder;
+import static android.content.Intent.URI_ANDROID_APP_SCHEME;
import static com.google.common.base.Preconditions.checkArgument;
import android.content.ComponentName;
@@ -114,6 +115,13 @@ public class AndroidComponentAddress extends SocketAddress { // NOTE: Only tempo
return bindIntent.cloneFilter(); // Intent is mutable so return a copy.
}
+ /**
+ * Returns this address as an "android-app://" uri.
+ */
+ public String asAndroidAppUri() {
+ return bindIntent.toUri(URI_ANDROID_APP_SCHEME);
+ }
+
@Override
public int hashCode() {
return bindIntent.filterHashCode();
|
Add an asAndroidAppUri() method to AndroidComponentAddress. (#<I>)
This returns the address as an "android-app://" uri, which can be
used with AndroidAppNameResolverProvider.
|
diff --git a/libre/urls.py b/libre/urls.py
index <HASH>..<HASH> 100644
--- a/libre/urls.py
+++ b/libre/urls.py
@@ -10,7 +10,6 @@ admin.autodiscover()
urlpatterns = patterns('',
- url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
url(r'^admin/', include(admin.site.urls)),
url(r'^', include('main.urls')),
|
Disabled the Django admin documentation generator, its setup is incomplete and not adding any additional value, should close issue #8.
|
diff --git a/lnd_test.go b/lnd_test.go
index <HASH>..<HASH> 100644
--- a/lnd_test.go
+++ b/lnd_test.go
@@ -366,7 +366,7 @@ func calcStaticFee(numHTLCs int) btcutil.Amount {
const (
commitWeight = btcutil.Amount(724)
htlcWeight = 172
- feePerKw = btcutil.Amount(50/4) * 1000
+ feePerKw = btcutil.Amount(50 * 1000 / 4)
)
return feePerKw * (commitWeight +
btcutil.Amount(htlcWeight*numHTLCs)) / 1000
|
lnd test: ensure static fee is not rounded down
|
diff --git a/spotify/__init__.py b/spotify/__init__.py
index <HASH>..<HASH> 100644
--- a/spotify/__init__.py
+++ b/spotify/__init__.py
@@ -5,7 +5,7 @@ from .models import *
from .client import Client
from .models import SpotifyBase
-__version__ = '0.4.4' # noqa
+__version__ = '0.4.5' # noqa
from .http import HTTPClient, HTTPUserClient
|
bump patch version
I should seriously setup a CI/CD pipeline right about now.
|
diff --git a/src/edit/input.js b/src/edit/input.js
index <HASH>..<HASH> 100644
--- a/src/edit/input.js
+++ b/src/edit/input.js
@@ -107,7 +107,7 @@ export function dispatchKey(pm, name, e) {
} else {
result = bound(pm)
}
- return result
+ return result == false ? false : "handled"
}
let result
diff --git a/src/edit/main.js b/src/edit/main.js
index <HASH>..<HASH> 100644
--- a/src/edit/main.js
+++ b/src/edit/main.js
@@ -29,7 +29,7 @@ import {normalizeKeyName} from "./keys"
// representing that document in the browser document.
//
// Contains event methods (`on`, etc) from the [event
-// mixin](#eventMixin).
+// mixin](#EventMixin).
export class ProseMirror {
// :: (Object)
// Construct a new editor from a set of [options](#edit_options)
|
Fix preventing of default for handled keys
|
diff --git a/tests/test_type.py b/tests/test_type.py
index <HASH>..<HASH> 100644
--- a/tests/test_type.py
+++ b/tests/test_type.py
@@ -127,7 +127,7 @@ def test_bot_data_fields(bot_data: types.BotData) -> None:
for attr in bot_data:
if "id" in attr.lower():
assert isinstance(bot_data[attr], int) or bot_data[attr] is None
- elif isinstance(attr, list) and attr in ("owners", "guilds"):
+ elif attr in ("owners", "guilds"):
for item in bot_data[attr]:
assert isinstance(item, int)
assert bot_data.get(attr) == bot_data[attr] == getattr(bot_data, attr)
|
Remove redundant (and not working) check in tests
|
diff --git a/lib/core/engine/index.js b/lib/core/engine/index.js
index <HASH>..<HASH> 100644
--- a/lib/core/engine/index.js
+++ b/lib/core/engine/index.js
@@ -31,7 +31,7 @@ function addExtraFieldsToHar(totalResults, har, options) {
if (har) {
for (let pageNumber = 0; pageNumber < totalResults.length; pageNumber++) {
for (let iteration = 0; iteration < options.iterations; iteration++) {
- const page = har.log.pages[pageNumber];
+ const page = har.log.pages[iteration + pageNumber];
const visualMetric = totalResults[pageNumber].visualMetrics[iteration];
const browserScript =
totalResults[pageNumber].browserScripts[iteration];
|
pick correct HAR page when inserting extra content
|
diff --git a/pylatex/utils.py b/pylatex/utils.py
index <HASH>..<HASH> 100644
--- a/pylatex/utils.py
+++ b/pylatex/utils.py
@@ -9,6 +9,7 @@ _latex_special_chars = {
'~': r'\lettertilde{}',
'^': r'\letterhat{}',
'\\': r'\letterbackslash{}',
+ '\n': r'\\\\',
}
|
Add \n to the escape character list
|
diff --git a/metric_tank/http.go b/metric_tank/http.go
index <HASH>..<HASH> 100644
--- a/metric_tank/http.go
+++ b/metric_tank/http.go
@@ -90,7 +90,7 @@ func Get(w http.ResponseWriter, req *http.Request, metaCache *MetaCache, aggSett
out := make([]Series, len(targets))
for i, target := range targets {
var consolidateBy string
- var id string
+ id := target
// yes, i am aware of the arguably grossness of the below.
// however, it is solid based on the documented allowed input format.
// once we need to support several functions, we can implement
|
fix: set id properly in non-consolidation case
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.