diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/flex/http_clients/rest_client.rb b/lib/flex/http_clients/rest_client.rb
index <HASH>..<HASH> 100644
--- a/lib/flex/http_clients/rest_client.rb
+++ b/lib/flex/http_clients/rest_client.rb
@@ -5,7 +5,7 @@ module Flex
def request(method, path, data=nil)
options = Configuration.http_client_options
- url = Configuration.base_uri.join(path)
+ url = "#{Configuration.base_uri}#{path}"
args = options.merge( :method => method.to_s.downcase.to_sym,
:url => url,
:payload => data )
|
fix for bad url in rest_client.rb
|
diff --git a/server.js b/server.js
index <HASH>..<HASH> 100644
--- a/server.js
+++ b/server.js
@@ -127,6 +127,8 @@ Server.prototype.onHttpRequest = function (req, res) {
var params
try {
params = parseHttpRequest(req, { trustProxy: self._trustProxy })
+ params.httpReq = req
+ params.httpRes = res
} catch (err) {
debug('sent error %s', err.message)
res.end(bencode.encode({
|
server: save HTTP req/res in params
For GH issue #<I>
|
diff --git a/bridge.go b/bridge.go
index <HASH>..<HASH> 100644
--- a/bridge.go
+++ b/bridge.go
@@ -353,6 +353,8 @@ func (b *bridge) SyncSourceFor(id ProjectIdentifier) error {
return b.sm.SyncSourceFor(id)
}
+func (b *bridge) Release() { b.sm.Release() }
+
// versionTypeUnion represents a set of versions that are, within the scope of
// this solver run, equivalent.
//
diff --git a/source_manager.go b/source_manager.go
index <HASH>..<HASH> 100644
--- a/source_manager.go
+++ b/source_manager.go
@@ -66,6 +66,11 @@ type SourceManager interface {
// DeduceRootProject takes an import path and deduces the corresponding
// project/source root.
DeduceProjectRoot(ip string) (ProjectRoot, error)
+
+ // Release lets go of any locks held by the SourceManager. Once called, it is
+ // no longer safe to call methods against it; all method calls will
+ // immediately result in errors.
+ Release()
}
// A ProjectAnalyzer is responsible for analyzing a given path for Manifest and
|
Add Release() to the SourceManager interface
This is already being used by dep.
|
diff --git a/flubber/futures/_task.py b/flubber/futures/_task.py
index <HASH>..<HASH> 100644
--- a/flubber/futures/_task.py
+++ b/flubber/futures/_task.py
@@ -2,6 +2,8 @@
# This file is part of flubber. See the NOTICE for more information.
#
+import sys
+
from flubber.futures._base import Executor, Future
from flubber.locks import Semaphore
from flubber.queue import Queue
@@ -20,8 +22,8 @@ class _WorkItem(object):
return
try:
result = self.fn(*self.args, **self.kwargs)
- except BaseException as e:
- self.future.set_exception(e)
+ except BaseException:
+ self.future.set_exception(sys.exc_info()[1])
else:
self.future.set_result(result)
|
Don't store full exc_info on futures
|
diff --git a/safe/engine/interpolation.py b/safe/engine/interpolation.py
index <HASH>..<HASH> 100644
--- a/safe/engine/interpolation.py
+++ b/safe/engine/interpolation.py
@@ -313,6 +313,11 @@ def interpolate_polygon_raster(source, target,
verify(source.is_vector)
verify(source.is_polygon_data)
+ if attribute_name is None:
+ attribute_name = target.get_name()
+ # FIXME (Ole): Launder for shape files (sucks)
+ attribute_name = str(attribute_name[:10])
+
# Run underlying clipping algorithm
polygon_geometry = source.get_geometry(as_geometry_objects=True)
@@ -402,7 +407,7 @@ def interpolate_raster_vector_points(source, target,
N = len(target)
if attribute_name is None:
attribute_name = source.get_name()
- # FIXME (Ole): Launder for shape files
+ # FIXME (Ole): Launder for shape files (sucks)
attribute_name = str(attribute_name[:10])
try:
|
dealt with case where attribute_name is None
|
diff --git a/tinydb/database.py b/tinydb/database.py
index <HASH>..<HASH> 100644
--- a/tinydb/database.py
+++ b/tinydb/database.py
@@ -37,7 +37,7 @@ def _get_doc_id(doc_id, eid):
if doc_id is not None:
raise TypeError('cannot pass both eid and doc_id')
- warnings.warn('eid has been renamed to doc_ids', DeprecationWarning)
+ warnings.warn('eid has been renamed to doc_id', DeprecationWarning)
return eid
else:
return doc_id
|
Chore: Fix typo in warning, should be singular (#<I>)
|
diff --git a/src/Core/Request/AbstractApiRequest.php b/src/Core/Request/AbstractApiRequest.php
index <HASH>..<HASH> 100644
--- a/src/Core/Request/AbstractApiRequest.php
+++ b/src/Core/Request/AbstractApiRequest.php
@@ -250,12 +250,12 @@ abstract class AbstractApiRequest implements ClientRequestInterface, ContextAwar
/**
* @param Client $client
- * @param array $headers
+ * @param array|null $headers
* @return ApiResponseInterface
*/
public function executeWithClient(Client $client, array $headers = null)
{
- if (!is_null($this->externalUserId)) {
+ if (!is_null($this->externalUserId) && !isset($headers[self::EXTERNAL_USER_HEADER])) {
$headers[self::EXTERNAL_USER_HEADER] = $this->externalUserId;
}
return $client->execute($this, $headers);
|
fix(ClientLogging): change priority of headers for external user id
|
diff --git a/lib/installlib.php b/lib/installlib.php
index <HASH>..<HASH> 100644
--- a/lib/installlib.php
+++ b/lib/installlib.php
@@ -515,6 +515,7 @@ function install_cli_database(array $options, $interactive) {
$CFG->version = '';
$CFG->release = '';
$version = null;
+ $release = null;
// read $version and $release
require($CFG->dirroot.'/version.php');
|
helping IDEs with undefined variable detection
|
diff --git a/src/livestreamer/plugins/ilive.py b/src/livestreamer/plugins/ilive.py
index <HASH>..<HASH> 100644
--- a/src/livestreamer/plugins/ilive.py
+++ b/src/livestreamer/plugins/ilive.py
@@ -71,7 +71,7 @@ class ILive(Plugin):
"live": True
}
- match = re.search("(http(s)?://.+/server.php\?id=\d+)",
+ match = re.search("(http(s)?://.+/server\d?.php\?id=\d+)",
res.text)
if match:
token_url = match.group(1)
|
Fix ilive Plugin
Resolves #<I>
Token now is requested by server2.php, regular expression will match this now
Also mobile streams gone? or they need special plugin installed to work.
Maybe someone can install it and take a look at the traffic...
|
diff --git a/code/model/LDAPGateway.php b/code/model/LDAPGateway.php
index <HASH>..<HASH> 100644
--- a/code/model/LDAPGateway.php
+++ b/code/model/LDAPGateway.php
@@ -21,7 +21,11 @@ class LDAPGateway extends Object
public function __construct()
{
parent::__construct();
- $this->ldap = new Zend\Ldap\Ldap($this->config()->options);
+ // due to dependency injection this class can be created without any LDAP options set
+ // and \Zend\Ldap\Ldap will throw a warning with an empty array
+ if(count($this->config()->options)) {
+ $this->ldap = new Zend\Ldap\Ldap($this->config()->options);
+ }
}
/**
|
FIX Zend LDAP will crash during DI when no LDAP settings are provided
|
diff --git a/simplesqlite/core.py b/simplesqlite/core.py
index <HASH>..<HASH> 100644
--- a/simplesqlite/core.py
+++ b/simplesqlite/core.py
@@ -126,6 +126,8 @@ class SimpleSQLite(object):
if isinstance(database_src, SimpleSQLite):
self.__connection = database_src.connection
self.__database_path = database_src.database_path
+
+ self.debug_query = database_src.debug_query
return
if isinstance(database_src, sqlite3.Connection):
|
Modify to passing debug_query flag
|
diff --git a/examples/Example2_ScheduledReporters.py b/examples/Example2_ScheduledReporters.py
index <HASH>..<HASH> 100644
--- a/examples/Example2_ScheduledReporters.py
+++ b/examples/Example2_ScheduledReporters.py
@@ -50,8 +50,6 @@ results = workspace.getScheduledReporterResults()
print('\t...and put these results into a pandas dataframe: import pandas as pd \n pd.DataFrame(result)')
-resultframe = pandas.DataFrame(results)
-resultframe.columns = ['ticks','stop1','stop2','sheep','wolves']
print(resultframe)
print(workspace.report("ticks"))
print('\n3) Shutdown the server to release compute resources using: nl4py.stopServer()')
|
getScheduledReporterResults now returns a pandas dataframe. Example adjusted accordingly
|
diff --git a/src/parsers/markdown/standardize-ast/transformers-htmltag/br.js b/src/parsers/markdown/standardize-ast/transformers-htmltag/br.js
index <HASH>..<HASH> 100644
--- a/src/parsers/markdown/standardize-ast/transformers-htmltag/br.js
+++ b/src/parsers/markdown/standardize-ast/transformers-htmltag/br.js
@@ -21,7 +21,6 @@ module.exports = function transformATag (
content: '',
attributes
})
- openTags.add(resultNode)
result.pushData(resultNode)
return result
}
|
Don't store BR tags as open (#<I>)
|
diff --git a/lib/ronin/engine/engine.rb b/lib/ronin/engine/engine.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/engine/engine.rb
+++ b/lib/ronin/engine/engine.rb
@@ -28,6 +28,7 @@ require 'ronin/model/has_authors'
require 'ronin/model/cacheable'
require 'ronin/ui/output/helpers'
+require 'data_paths/finders'
require 'parameters'
module Ronin
@@ -45,6 +46,7 @@ module Ronin
# * {Model::HasLicense}
# * {Model::HasAuthors}
# * {Model::Cacheable}
+ # * [DataPaths::Finders](http://rubydoc.info/gems/data_paths)
# * [Parameters](http://rubydoc.info/gems/parameters)
# * {ClassMethods}
#
@@ -57,6 +59,7 @@ module Ronin
Model::HasLicense,
Model::HasAuthors,
Model::Cacheable,
+ DataPaths::Finders,
Parameters
base.send :extend, ClassMethods
|
Include DataPaths::Finders into all Engines.
|
diff --git a/lib/connection.js b/lib/connection.js
index <HASH>..<HASH> 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -189,6 +189,9 @@ Connection.prototype._allocateId = function _allocateId(stream, id) {
stream.id = id;
this.emit('new_stream', stream, id);
+ // * handling stream errors as connection errors
+ stream.on('error', this.emit.bind(this, 'error'));
+
return id;
};
diff --git a/lib/stream.js b/lib/stream.js
index <HASH>..<HASH> 100644
--- a/lib/stream.js
+++ b/lib/stream.js
@@ -230,6 +230,12 @@ Stream.prototype._receive = function _receive(frame, ready) {
this._onPriority(frame);
}
+ // * If it's an invalid stream level frame, emit error
+ else if (frame.type !== 'WINDOW_UPDATE') {
+ this._log.error({ frame: frame }, 'Invalid stream level frame');
+ this.emit('error', 'PROTOCOL_ERROR');
+ }
+
// * Any frame may signal the end of the stream with the END_STREAM flag
if (frame.flags.END_STREAM) {
this.push(null);
|
Stream: rejecting invalid stream level frame with PROTOCOL_ERROR
|
diff --git a/src/compiler.js b/src/compiler.js
index <HASH>..<HASH> 100644
--- a/src/compiler.js
+++ b/src/compiler.js
@@ -6,11 +6,14 @@ import {
cond,
equals,
identity,
+ ifElse,
join,
map,
pipe,
toPairs,
- type
+ type,
+ unary,
+ when
} from 'ramda';
import { transform } from 'babel-core';
@@ -34,14 +37,10 @@ const compileCSS = pipe(
* @return {String}
*/
function compileProps(props) {
- const transformKey = cond([
- [equals('className'), always('class')],
- [T, dasherize]
- ]);
- const transformValue = cond([
- [item => type(item) === 'Object', compileCSS],
- [T, JSON.stringify]
- ]);
+ const transformKey = when(equals('className'), always('class'));
+ const transformValue = ifElse(item => type(item) === 'Object',
+ compileCSS, unary(JSON.stringify));
+
const stringify = pipe(
toPairs,
map(([key, value]) => `${transformKey(key)}=${transformValue(value)}`),
|
Replace cond by ifElse
|
diff --git a/pkg/social/google_oauth.go b/pkg/social/google_oauth.go
index <HASH>..<HASH> 100644
--- a/pkg/social/google_oauth.go
+++ b/pkg/social/google_oauth.go
@@ -48,6 +48,7 @@ func (s *SocialGoogle) UserInfo(client *http.Client, token *oauth2.Token) (*Basi
}
return &BasicUserInfo{
+ Id: fmt.Sprintf("%d", data.Id),
Name: data.Name,
Email: data.Email,
Login: data.Email,
|
Added Id to BasicUserInfo returns
|
diff --git a/command/image/build.go b/command/image/build.go
index <HASH>..<HASH> 100644
--- a/command/image/build.go
+++ b/command/image/build.go
@@ -138,7 +138,6 @@ func (out *lastProgressOutput) WriteProgress(prog progress.Progress) error {
}
func runBuild(dockerCli *command.DockerCli, options buildOptions) error {
-
var (
buildCtx io.ReadCloser
err error
@@ -333,7 +332,11 @@ func runBuild(dockerCli *command.DockerCli, options buildOptions) error {
// Windows: show error message about modified file permissions if the
// daemon isn't running Windows.
if response.OSType != "windows" && runtime.GOOS == "windows" && !options.quiet {
- fmt.Fprintln(dockerCli.Out(), `SECURITY WARNING: You are building a Docker image from Windows against a non-Windows Docker host. All files and directories added to build context will have '-rwxr-xr-x' permissions. It is recommended to double check and reset permissions for sensitive files and directories.`)
+ fmt.Fprintln(dockerCli.Out(), "SECURITY WARNING: You are building a Docker "+
+ "image from Windows against a non-Windows Docker host. All files and "+
+ "directories added to build context will have '-rwxr-xr-x' permissions. "+
+ "It is recommended to double check and reset permissions for sensitive "+
+ "files and directories.")
}
// Everything worked so if -q was provided the output from the daemon
|
Some things just need to be line wrapped.
|
diff --git a/flask_appbuilder/static/appbuilder/js/ab_filters.js b/flask_appbuilder/static/appbuilder/js/ab_filters.js
index <HASH>..<HASH> 100644
--- a/flask_appbuilder/static/appbuilder/js/ab_filters.js
+++ b/flask_appbuilder/static/appbuilder/js/ab_filters.js
@@ -92,7 +92,7 @@ var AdminFilters = function(element, labels, form, filters, active_filters) {
var $field = $(form[name])
$field.attr('name', '_flt_0_' + name);
$field.attr('class', ' filter_val ' + $field.attr('class'));
- alert($("input < *",$field).html());
+ alert($("* < input",$field).html());
$el.append(
$('<td/>').append($field)
);;
|
Update ab_filters.js
|
diff --git a/go/engine/login_current_device.go b/go/engine/login_current_device.go
index <HASH>..<HASH> 100644
--- a/go/engine/login_current_device.go
+++ b/go/engine/login_current_device.go
@@ -72,6 +72,20 @@ func (e *LoginCurrentDevice) Run(ctx *Context) error {
return errNoDevice
}
+ // Make sure the device ID is still valid.
+ me, err := libkb.LoadMe(libkb.LoadUserArg{
+ PublicKeyOptional: true,
+ ForceReload: true,
+ })
+ if err != nil {
+ e.G().Log.Debug("error loading user profile: %#v", err)
+ return err
+ }
+ if !me.HasDeviceInCurrentInstall() {
+ e.G().Log.Debug("current device is not valid")
+ return errNoDevice
+ }
+
// at this point, there is a user config either for the current user or for e.username
// and it has a device id, so this should be a provisioned device. Thus, they should
// just login normally.
|
check whether the current device is still valid during login
|
diff --git a/spec/lib/tox/client_spec.rb b/spec/lib/tox/client_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/lib/tox/client_spec.rb
+++ b/spec/lib/tox/client_spec.rb
@@ -80,4 +80,10 @@ RSpec.describe Tox::Client do
end
end
end
+
+ describe '#running?' do
+ it 'returns false by default' do
+ expect(subject.running?).to eq false
+ end
+ end
end
|
Add spec for Tox::Client#running?
|
diff --git a/user_management/api/views.py b/user_management/api/views.py
index <HASH>..<HASH> 100644
--- a/user_management/api/views.py
+++ b/user_management/api/views.py
@@ -230,11 +230,10 @@ class VerifyAccountView(views.APIView):
Set user as a class attribute or raise an `InvalidExpiredToken`.
"""
- max_age = getattr(
- settings,
- 'VERIFY_ACCOUNT_EXPIRY',
- self.DEFAULT_VERIFY_ACCOUNT_EXPIRY,
- )
+ try:
+ max_age = settings.VERIFY_ACCOUNT_EXPIRY
+ except AttributeError:
+ max_age = self.DEFAULT_VERIFY_ACCOUNT_EXPIRY
try:
email_data = signing.loads(kwargs['token'], max_age=max_age)
|
Replace getattr with a try..except
|
diff --git a/file_picker/views.py b/file_picker/views.py
index <HASH>..<HASH> 100755
--- a/file_picker/views.py
+++ b/file_picker/views.py
@@ -32,7 +32,10 @@ class FilePickerBase(object):
self.field_names = model._meta.get_all_field_names()
self.field_labels = {}
for field_name in model._meta.get_all_field_names():
- field = model._meta.get_field(field_name)
+ try:
+ field = model._meta.get_field(field_name)
+ except models.FieldDoesNotExist:
+ continue
if isinstance(field, (models.ImageField, models.FileField)):
self.field = field_name
self.field_names.remove(field_name)
|
don't die on fields that don't exist
|
diff --git a/hawtio-system/src/main/java/io/hawt/web/filters/ContentSecurityPolicyFilter.java b/hawtio-system/src/main/java/io/hawt/web/filters/ContentSecurityPolicyFilter.java
index <HASH>..<HASH> 100644
--- a/hawtio-system/src/main/java/io/hawt/web/filters/ContentSecurityPolicyFilter.java
+++ b/hawtio-system/src/main/java/io/hawt/web/filters/ContentSecurityPolicyFilter.java
@@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletResponse;
import io.hawt.web.ServletHelpers;
import io.hawt.web.auth.keycloak.KeycloakServlet;
-
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
|
and new line, sheesh
|
diff --git a/lib/jitsu.js b/lib/jitsu.js
index <HASH>..<HASH> 100644
--- a/lib/jitsu.js
+++ b/lib/jitsu.js
@@ -53,7 +53,7 @@ jitsu.use(flatiron.plugins.cli, {
string: true
},
raw: {
- description: 'jitsu will only output line-delimited raw JSON ( useful for piping )',
+ description: 'jitsu will only output line-delimited raw JSON (useful for piping)',
boolean: true
}
}
|
[minor] Minor change in help text
|
diff --git a/provider/oracle/instance_test.go b/provider/oracle/instance_test.go
index <HASH>..<HASH> 100644
--- a/provider/oracle/instance_test.go
+++ b/provider/oracle/instance_test.go
@@ -12,6 +12,7 @@ import (
gc "gopkg.in/check.v1"
"github.com/juju/juju/core/instance"
+ corenetwork "github.com/juju/juju/core/network"
"github.com/juju/juju/environs"
"github.com/juju/juju/environs/config"
"github.com/juju/juju/environs/context"
@@ -136,7 +137,7 @@ func (i instanceSuite) TestOpenPorts(c *gc.C) {
err = instance.OpenPorts(i.callCtx, "0", []jujunetwork.IngressRule{
{
- PortRange: jujunetwork.PortRange{
+ PortRange: corenetwork.PortRange{
FromPort: 0,
ToPort: 0,
},
@@ -162,7 +163,7 @@ func (i instanceSuite) TestClosePorts(c *gc.C) {
err = instance.ClosePorts(i.callCtx, "0", []jujunetwork.IngressRule{
{
- PortRange: jujunetwork.PortRange{
+ PortRange: corenetwork.PortRange{
FromPort: 0,
ToPort: 0,
},
|
Fixes tests in provider/oracle for modules relocated to core/network.
|
diff --git a/src/components/DesktopComponent.js b/src/components/DesktopComponent.js
index <HASH>..<HASH> 100644
--- a/src/components/DesktopComponent.js
+++ b/src/components/DesktopComponent.js
@@ -76,6 +76,12 @@ class DesktopComponent {
// if it can have multiple ex. VerticalBox
this.element.deleteAt(this.children.indexOf(child));
child.element.destroy();
+ } else if (this.exists(child.element.close)) {
+ // we have a window that we want to close
+ if (!child.closing) {
+ // we are already closing, so we don't want to do it again
+ child.element.close();
+ }
}
const index = this.children.indexOf(child);
this.children.splice(index, 1);
diff --git a/src/components/Window.js b/src/components/Window.js
index <HASH>..<HASH> 100644
--- a/src/components/Window.js
+++ b/src/components/Window.js
@@ -56,6 +56,7 @@ class Window extends DesktopComponent {
this.props.menuBar
);
this.element.onClosing(() => {
+ this.closing = true;
this.props.onClose();
this.element.close();
if (this.props.lastWindow) {
|
Add support for deleting window. Fixes #<I>
|
diff --git a/app/aid/proxy/proxy.go b/app/aid/proxy/proxy.go
index <HASH>..<HASH> 100644
--- a/app/aid/proxy/proxy.go
+++ b/app/aid/proxy/proxy.go
@@ -45,7 +45,7 @@ const (
func New() *Proxy {
p := &Proxy{
ipRegexp: regexp.MustCompile(`[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+`),
- proxyRegexp: regexp.MustCompile(`http[s]?://[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+`),
+ proxyRegexp: regexp.MustCompile(`https?://([\w]*:[\w]*@)?[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+`),
allIps: map[string]string{},
all: map[string]bool{},
usable: make(map[string]*ProxyForHost),
|
Proxy: support for filling in user name and password
|
diff --git a/requests_gpgauthlib/gpgauth_session.py b/requests_gpgauthlib/gpgauth_session.py
index <HASH>..<HASH> 100644
--- a/requests_gpgauthlib/gpgauth_session.py
+++ b/requests_gpgauthlib/gpgauth_session.py
@@ -185,6 +185,7 @@ class GPGAuthSession(Session):
.replace('\\\\', '\\')
).replace('\\ ', ' ')
+ logger.debug('User token to decrypt: %s', encrypted_user_auth_token)
logger.info('Decrypting the user authentication token; '
'password prompt expected')
@@ -197,7 +198,7 @@ class GPGAuthSession(Session):
user_auth_token = self.gpg.decrypt(encrypted_user_auth_token, always_trust=True, passphrase=passphrase)
if not user_auth_token.ok:
- raise GPGAuthStage1Exception("Auth token decryption failed")
+ raise GPGAuthStage1Exception("Auth token decryption failed: %s", user_auth_token.status)
logger.info('user_auth_token: %s', user_auth_token)
return str(user_auth_token)
|
Add debug statement to help debug stage1 errors
|
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -155,4 +155,4 @@ exports.styles = _styles
exports.vendor = _vendor
exports.watch = _watch
-exports.default = series(parallel(_styles, _scripts), _serve, _watch)
+exports.default = series(parallel(_styles, _scripts), parallel(_serve, _watch))
|
Run `serve` and `watch` tasks in parallel
|
diff --git a/main.go b/main.go
index <HASH>..<HASH> 100644
--- a/main.go
+++ b/main.go
@@ -176,7 +176,6 @@ func setupRouteFetcher(logger lager.Logger, c *config.Config, registry rregistry
uaaClient := newUaaClient(logger, clock, c)
- logger.Info("fetching-token-from-uaa")
_, err := uaaClient.FetchToken(false)
if err != nil {
logger.Fatal("unable-to-fetch-token", err)
diff --git a/main_test.go b/main_test.go
index <HASH>..<HASH> 100644
--- a/main_test.go
+++ b/main_test.go
@@ -496,8 +496,7 @@ var _ = Describe("Router Integration", func() {
// note, this will start with routing api, but will not be able to connect
session := startGorouterSession(cfgFile)
- Expect(gorouterSession.Out.Contents()).To(ContainSubstring("fetching-token-from-uaa"))
- Expect(gorouterSession.Out.Contents()).To(ContainSubstring("using-https-scheme-for-uaa"))
+ Expect(gorouterSession.Out.Contents()).To(ContainSubstring("started-fetching-token"))
stopGorouter(session)
})
})
|
Update log messages in test
[#<I>]
|
diff --git a/src/adapters/pouch.idb.js b/src/adapters/pouch.idb.js
index <HASH>..<HASH> 100644
--- a/src/adapters/pouch.idb.js
+++ b/src/adapters/pouch.idb.js
@@ -837,6 +837,9 @@ IdbPouch.Changes = (function() {
if (opts.filter && !opts.filter.apply(this, [change.doc])) {
return;
}
+ if (!opts.include_docs) {
+ delete change.doc;
+ }
opts.onChange.apply(opts.onChange, [change]);
}
}
|
Dont include docs by default for feed
|
diff --git a/LiSE/LiSE/tests/test_character.py b/LiSE/LiSE/tests/test_character.py
index <HASH>..<HASH> 100644
--- a/LiSE/LiSE/tests/test_character.py
+++ b/LiSE/LiSE/tests/test_character.py
@@ -40,6 +40,7 @@ class CharacterSetStorageTest(CharacterTest, allegedb.tests.test_all.SetStorageT
def set_in_mapping(mapp, stat, v):
+ """Sync a value in ``mapp``, having key ``stat``, with ``v``."""
# Mutate the stuff in-place instead of simply replacing it,
# because this could trigger side effects
if stat == 'name':
@@ -70,6 +71,7 @@ def set_in_mapping(mapp, stat, v):
def update_char(char, *, stat=(), node=(), portal=()):
+ """Make a bunch of changes to a character-like object"""
def update(d, dd):
for k, v in dd.items():
if v is None and k in d:
@@ -182,6 +184,7 @@ def character_updates(request):
def test_facade(character_updates):
+ """Make sure you can alter a facade independent of the character it's from"""
character, statup, nodeup, edgeup = character_updates
start_stat = character.stat.unwrap()
start_place = character.place.unwrap()
|
Add docstrings to tests.test_character
|
diff --git a/spec/flatiron-lab-generator_spec.rb b/spec/flatiron-lab-generator_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/flatiron-lab-generator_spec.rb
+++ b/spec/flatiron-lab-generator_spec.rb
@@ -61,7 +61,9 @@ describe FlatironLabGenerator::TemplateMaker do
end
it "creates a sinatra-mvc lab" do
-
+ expect(FlatironLabGenerator::TemplateMaker.run("sinatra-mvc",lab_name, "git repo")).to be_nil
+ expect(`tree #{lab_name}`).to eq("test_lab\n├── Gemfile\n├── README.md\n├── Rakefile\n├── app\n│ ├── controllers\n│ │ └── application_controller.rb\n│ ├── models\n│ └── views\n│ └── layout.erb\n├── config\n│ └── environment.rb\n├── config.ru\n├── db\n│ ├── migrate\n│ └── seeds.rb\n├── public\n│ └── stylesheets\n└── spec\n ├── controllers\n ├── features\n ├── models\n └── spec_helper.rb\n\n13 directories, 9 files\n")
+ FileUtils.rm_rf(lab_name)
end
end
|
sinatra mvc lab now tested
|
diff --git a/src/dpdb/dpdb-cache.js b/src/dpdb/dpdb-cache.js
index <HASH>..<HASH> 100644
--- a/src/dpdb/dpdb-cache.js
+++ b/src/dpdb/dpdb-cache.js
@@ -662,6 +662,17 @@ var DPDB_CACHE = {
{
"type": "android",
"rules": [
+ { "mdmh": "samsung/*/SM-N920W8/*" },
+ { "ua": "SM-N920W8" }
+ ],
+ "dpi": [ 515.1, 518.4 ],
+ "bw": 3,
+ "ac": 1000
+ },
+
+ {
+ "type": "android",
+ "rules": [
{ "mdmh": "samsung/*/GT-I9300I/*" },
{ "ua": "GT-I9300I" }
],
|
Add Note 5 user agent variant to Dpdb cache
We found that for one of our devices (a Samsung Note 5) the distortions were not being applied correctly, the reason being that the model number is "SM-N<I>W8" for Canadian devices.
|
diff --git a/lib/opskeleton/push.rb b/lib/opskeleton/push.rb
index <HASH>..<HASH> 100644
--- a/lib/opskeleton/push.rb
+++ b/lib/opskeleton/push.rb
@@ -11,7 +11,7 @@ module Opsk
class Push < Thor::Group
include Thorable, Thor::Actions
- class_option :writable_remote, :type=> :string, :desc => 'add remote write repo', :default => 'git@'
+ class_option :writable_remote, :type=> :string, :desc => 'add remote write repo', :default => 'git@github.com:'
class_option :dry, :type=> :boolean, :desc => 'dry mode', :default => false
def validate
@@ -24,7 +24,9 @@ module Opsk
if File.exists?("#{d}/.git")
g = Git.init(d)
add_writable(g,options['writable_remote'])
- g.push('writable') unless options['dry']
+ if !options['dry'] and g.diff('writable').stats[:files].keys.length > 0
+ g.push('writable')
+ end
end
end
end
|
push only if there are local changes to be pushed
|
diff --git a/source/git-api.js b/source/git-api.js
index <HASH>..<HASH> 100644
--- a/source/git-api.js
+++ b/source/git-api.js
@@ -610,7 +610,7 @@ exports.registerApi = (env) => {
if (config.dev) {
app.post(`${exports.pathPrefix}/testing/createtempdir`, ensureAuthenticated, (req, res) => {
- temp.mkdir('test-temp-dir', (err, path) => res.json({ path: path }));
+ temp.mkdir('test-temp-dir', (err, tempPath) => res.json({ path: path.normalize(tempPath) }));
});
app.post(`${exports.pathPrefix}/testing/createfile`, ensureAuthenticated, (req, res) => {
const content = req.body.content ? req.body.content : (`test content\n${Math.random()}\n`);
|
returning normalized path for temp dir creation
|
diff --git a/lib/manager.js b/lib/manager.js
index <HASH>..<HASH> 100644
--- a/lib/manager.js
+++ b/lib/manager.js
@@ -3,8 +3,8 @@ var EventEmitter = require('events').EventEmitter;
var LessFile = require('./lessfile');
function Manager(srcDir, dstDir) {
- this.srcDir = srcDir;
- this.dstDir = dstDir;
+ this.srcDir = srcDir.replace(/^.\//, '');
+ this.dstDir = dstDir.replace(/^.\//, '');
this.files = {};
this.dependencies = {};
this.pending = 0;
|
Remove './' from beginning of file paths, it's unnecessary and breaks the file name creation logic
|
diff --git a/rollbar-payload/src/test/java/com/rollbar/payload/data/body/FrameTest.java b/rollbar-payload/src/test/java/com/rollbar/payload/data/body/FrameTest.java
index <HASH>..<HASH> 100644
--- a/rollbar-payload/src/test/java/com/rollbar/payload/data/body/FrameTest.java
+++ b/rollbar-payload/src/test/java/com/rollbar/payload/data/body/FrameTest.java
@@ -15,10 +15,10 @@ import static org.junit.Assert.*;
* Created by chris on 11/25/15.
*/
public class FrameTest {
- Frame f;
+ private Frame f;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
f = new Frame("com.rollbar.payload.data.Frame.java");
}
|
unused throws clause, makes var private
|
diff --git a/tests.py b/tests.py
index <HASH>..<HASH> 100755
--- a/tests.py
+++ b/tests.py
@@ -299,6 +299,11 @@ class TestSave(SaveAndCheck):
[(unicode(s),)]
)
+ def test_save_and_drop(self):
+ scraperwiki.sql.save([], dict(foo=7), table_name="dropper")
+ scraperwiki.sql.execute("DROP TABLE dropper")
+ scraperwiki.sql.save([], dict(foo=9), table_name="dropper")
+
class TestQuestionMark(TestCase):
def test_one_question_mark_with_nonlist(self):
scraperwiki.sql.execute('create table zhuozi (a text);')
|
Test that after dropping a table, can still save.
|
diff --git a/src/Bootstrap/Drupal.php b/src/Bootstrap/Drupal.php
index <HASH>..<HASH> 100644
--- a/src/Bootstrap/Drupal.php
+++ b/src/Bootstrap/Drupal.php
@@ -4,6 +4,7 @@ namespace Drupal\Console\Bootstrap;
use Doctrine\Common\Annotations\AnnotationRegistry;
use Symfony\Component\HttpFoundation\Request;
+use Drupal\Console\Utils\ArgvInputReader;
class Drupal
{
@@ -31,8 +32,20 @@ class Drupal
}
try {
- $request = Request::createFromGlobals();
- $drupalKernel = DrupalKernel::createFromRequest(
+ $argvInputReader = new ArgvInputReader();
+ if ($argvInputReader->get('uri')) {
+ $uri = $argvInputReader->get('uri');
+ if (substr($uri, -1) != '/') {
+ $uri .= '/';
+ }
+ $uri .= 'index.php';
+ $request = Request::create($uri, 'GET', array() , array(), array(), array('SCRIPT_NAME' => $this->appRoot . '/index.php'));
+ }
+ else {
+ $request = Request::createFromGlobals();
+ }
+
+ $drupalKernel = DrupalKernel::createFromRequest (
$request,
$this->autoload,
'prod',
|
[BUGFIX #<I>] uri parameter not used (#<I>)
- PB: it looks like the uri parameter is not taken in account anymore and the multisite doesn't work
- FIX: read the uri option and generate a symfony request accordingly before initializing the drupal container
|
diff --git a/examples/usbcat/device.py b/examples/usbcat/device.py
index <HASH>..<HASH> 100755
--- a/examples/usbcat/device.py
+++ b/examples/usbcat/device.py
@@ -37,7 +37,7 @@ def noIntr(func):
while True:
try:
return func()
- except IOError, exc:
+ except (IOError, OSError) as exc:
if exc.errno != errno.EINTR:
raise
|
examples/usbcat/device: Also catch OSError to retry after EINTR
libaio raises OSError (maybe wrongly ?).
|
diff --git a/DataFixtures/ORM/LoadProductStatusData.php b/DataFixtures/ORM/LoadProductStatusData.php
index <HASH>..<HASH> 100755
--- a/DataFixtures/ORM/LoadProductStatusData.php
+++ b/DataFixtures/ORM/LoadProductStatusData.php
@@ -13,7 +13,7 @@
namespace WellCommerce\Bundle\ProductStatusBundle\DataFixtures\ORM;
use Doctrine\Common\Persistence\ObjectManager;
-use WellCommerce\Bundle\CoreBundle\DataFixtures\AbstractDataFixture;
+use WellCommerce\Bundle\DoctrineBundle\DataFixtures\AbstractDataFixture;
use WellCommerce\Bundle\CoreBundle\Helper\Sluggable;
use WellCommerce\Bundle\ProductStatusBundle\Entity\ProductStatus;
|
Moved AbstractDataFixture to DoctrineBundle
(cherry picked from commit <I>e<I>ccffb<I>b<I>b<I>d<I>c<I>a8)
|
diff --git a/code/model/EventTicket.php b/code/model/EventTicket.php
index <HASH>..<HASH> 100644
--- a/code/model/EventTicket.php
+++ b/code/model/EventTicket.php
@@ -82,7 +82,7 @@ class EventTicket extends DataObject {
* @return RequiredFields
*/
public function getValidator() {
- return new RequiredFields('Title', 'Type', 'StartDate', 'EndDate');
+ return new RequiredFields('Title', 'Type');
}
public function validate() {
@@ -90,13 +90,6 @@ class EventTicket extends DataObject {
if ($this->Type == 'Price' && !$this->Price->exists()) {
$result->error('You must enter a currency and price for fixed price tickets');
}
- if (!$this->StartDate){
- $result->error('You must enter a start date');
- }
- if (!$this->EndDate) {
- $result->error('You must enter an end date');
- }
-
return $result;
}
|
Removed StartDate and EndDate validation requirements
|
diff --git a/src/lib/Behat/PageElement/LanguagePicker.php b/src/lib/Behat/PageElement/LanguagePicker.php
index <HASH>..<HASH> 100644
--- a/src/lib/Behat/PageElement/LanguagePicker.php
+++ b/src/lib/Behat/PageElement/LanguagePicker.php
@@ -22,8 +22,8 @@ class LanguagePicker extends Element
{
parent::__construct($context);
$this->fields = [
- 'languagePickerSelector' => '#content_edit_language',
- 'languageSelector' => '#content_edit_language .form-check-label',
+ 'languagePickerSelector' => '.ez-extra-actions--edit:not(.ez-extra-actions--hidden) #content_edit_language',
+ 'languageSelector' => '.ez-extra-actions--edit:not(.ez-extra-actions--hidden) #content_edit_language .form-check-label',
];
$this->loadingTimeout = 5;
}
|
[Behat] Adjusted language picker selector
|
diff --git a/src/Engine/Elasticsearch/ElasticsearchAdapter.php b/src/Engine/Elasticsearch/ElasticsearchAdapter.php
index <HASH>..<HASH> 100644
--- a/src/Engine/Elasticsearch/ElasticsearchAdapter.php
+++ b/src/Engine/Elasticsearch/ElasticsearchAdapter.php
@@ -44,7 +44,7 @@ class ElasticsearchAdapter implements AdapterInterface
throw new EmptyDataException('Empty data for insert.');
}
- $this->client->setIndex($collectionName)->setMethod(self::METHOD_POST)->setId($data['id'])->setBody([$data])->execute();
+ $this->client->setIndex($collectionName)->setMethod(self::METHOD_POST)->setId($data['id'])->setBody($data)->execute();
}
/**
|
<I> - Removed array brackets.
|
diff --git a/lib/pay_dirt/use_case.rb b/lib/pay_dirt/use_case.rb
index <HASH>..<HASH> 100644
--- a/lib/pay_dirt/use_case.rb
+++ b/lib/pay_dirt/use_case.rb
@@ -1,4 +1,3 @@
-require_relative "result"
module PayDirt
module UseCase
def self.included(base)
|
Don't need to require this here
|
diff --git a/cmd/kubeadm/app/master/selfhosted.go b/cmd/kubeadm/app/master/selfhosted.go
index <HASH>..<HASH> 100644
--- a/cmd/kubeadm/app/master/selfhosted.go
+++ b/cmd/kubeadm/app/master/selfhosted.go
@@ -219,6 +219,7 @@ func getAPIServerDS(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Volume, vo
},
},
Tolerations: []v1.Toleration{kubeadmconstants.MasterToleration},
+ DNSPolicy: v1.DNSClusterFirstWithHostNet,
},
},
},
@@ -270,7 +271,7 @@ func getControllerManagerDeployment(cfg *kubeadmapi.MasterConfiguration, volumes
},
},
Tolerations: []v1.Toleration{kubeadmconstants.MasterToleration},
- DNSPolicy: v1.DNSDefault,
+ DNSPolicy: v1.DNSClusterFirstWithHostNet,
},
},
},
@@ -322,6 +323,7 @@ func getSchedulerDeployment(cfg *kubeadmapi.MasterConfiguration, volumes []v1.Vo
},
},
Tolerations: []v1.Toleration{kubeadmconstants.MasterToleration},
+ DNSPolicy: v1.DNSClusterFirstWithHostNet,
},
},
},
|
kubeadm: When self-hosting, cluster DNS should be used
|
diff --git a/src/frontend/org/voltdb/messaging/InitiateTaskMessage.java b/src/frontend/org/voltdb/messaging/InitiateTaskMessage.java
index <HASH>..<HASH> 100644
--- a/src/frontend/org/voltdb/messaging/InitiateTaskMessage.java
+++ b/src/frontend/org/voltdb/messaging/InitiateTaskMessage.java
@@ -135,6 +135,7 @@ public class InitiateTaskMessage extends TransactionInfoBaseMessage {
m_lastSafeTxnID = buf.getLong();
m_isSinglePartition = buf.get() == 1;
+ m_invocation = new StoredProcedureInvocation();
m_invocation.initFromBuffer(buf);
}
|
We're gonna need an actual SPI() before we can fill it.
|
diff --git a/flusher.go b/flusher.go
index <HASH>..<HASH> 100644
--- a/flusher.go
+++ b/flusher.go
@@ -94,6 +94,12 @@ func (s *Server) FlushLocal(interval time.Duration, metricLimit int) {
// since not everything in tempMetrics is safe for sharing
go s.flushForward(tempMetrics)
+ go func() {
+ for _, p := range s.getPlugins() {
+ go p.Flush(finalMetrics, s.Hostname)
+ }
+ }()
+
s.flushRemote(finalMetrics, metricLimit)
}
|
Enable plugins on local veneur (fleet) instances
|
diff --git a/client/my-sites/hosting/web-server-settings-card/index.js b/client/my-sites/hosting/web-server-settings-card/index.js
index <HASH>..<HASH> 100644
--- a/client/my-sites/hosting/web-server-settings-card/index.js
+++ b/client/my-sites/hosting/web-server-settings-card/index.js
@@ -136,7 +136,7 @@ const WebServerSettingsCard = ( {
const getStaticFile404Settings = () => [
{
- label: translate( 'Default (recommended)', {
+ label: translate( 'Default', {
comment: 'The default way to handle requests for nonexistent static files.',
} ),
value: 'default',
|
WoA: Stop recommending default static file <I> (#<I>)
|
diff --git a/rivescript/rivescript.py b/rivescript/rivescript.py
index <HASH>..<HASH> 100644
--- a/rivescript/rivescript.py
+++ b/rivescript/rivescript.py
@@ -182,12 +182,13 @@ class RiveScript(object):
self._warn("Error: " + directory + " is not a directory.")
return
- for item in os.listdir(directory):
- for extension in ext:
- if item.lower().endswith(extension):
- # Load this file.
- self.load_file(os.path.join(directory, item))
- break
+ for root, subdirs, files in os.walk(rs_directory):
+ for file in files:
+ for extension in ext:
+ if file.lower().endswith(extension):
+ # Load this file.
+ self.load_file(os.path.join(root, file))
+ break
def load_file(self, filename):
"""Load and parse a RiveScript document.
|
Added recursive loading to load_directory
|
diff --git a/src/Window.js b/src/Window.js
index <HASH>..<HASH> 100644
--- a/src/Window.js
+++ b/src/Window.js
@@ -1361,8 +1361,7 @@ const _normalizeUrl = utils._makeNormalizeUrl(options.baseUrl);
GlobalContext.clearGamepads();
};
const _onmakeswapchain = context => {
- const windowHandle = context.getWindowHandle();
- nativeWindow.setCurrentWindowContext(windowHandle);
+ context.setTopLevel(false);
vrPresentState.glContext = context;
vrPresentState.fbo = context.createFramebuffer().id;
|
Perform XR context setTopLevel set in Window.js
|
diff --git a/mode/cobol/cobol.js b/mode/cobol/cobol.js
index <HASH>..<HASH> 100644
--- a/mode/cobol/cobol.js
+++ b/mode/cobol/cobol.js
@@ -195,7 +195,7 @@ CodeMirror.defineMode("cobol", function () {
case "string": // multi-line string parsing mode
var next = false;
while ((next = stream.next()) != null) {
- if (next == "\"" || next == "\'") {
+ if ((next == "\"" || next == "\'") && !stream.match(/['"]/, false)) {
state.mode = false;
break;
}
|
[cobol mode] Highlight single or double quote inside single quotes as closed string
|
diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php
index <HASH>..<HASH> 100644
--- a/src/Composer/Command/ShowCommand.php
+++ b/src/Composer/Command/ShowCommand.php
@@ -248,7 +248,7 @@ EOT
} else {
$latestPackage = null;
if ($input->getOption('latest')) {
- $latestPackage = $this->findLatestPackage($package, $composer, $platformRepo);
+ $latestPackage = $this->findLatestPackage($package, $composer, $platformRepo, $input->getOption('minor-only'));
}
if ($input->getOption('outdated') && $input->getOption('strict') && $latestPackage && $latestPackage->getFullPrettyVersion() !== $package->getFullPrettyVersion() && !$latestPackage->isAbandoned()) {
$exitCode = 1;
|
Fix #<I> - inconsistent behavior with minor-only flag
|
diff --git a/test/karma.browserstack.js b/test/karma.browserstack.js
index <HASH>..<HASH> 100644
--- a/test/karma.browserstack.js
+++ b/test/karma.browserstack.js
@@ -8,7 +8,7 @@ module.exports = {
bs_firefox_latest_supported: {
base: 'BrowserStack',
browser: 'firefox',
- browser_version: '50',// TODO: Upgrade to test IndexedDB 2.0
+ browser_version: '55',
os: 'Windows',
os_version: 7
},
@@ -50,7 +50,7 @@ module.exports = {
bs_chrome_latest_supported: {
base: 'BrowserStack',
browser: "Chrome",
- browser_version: "57", // TODO: Upgrade to test IndexedDB 2.0
+ browser_version: "60",
os: 'Windows',
os_version: 10
}
|
Upgrade browser tests to browsers supporting IndexedDB <I>
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -141,7 +141,7 @@ function tunnelProxy(server, proxy) {
delete headers[pluginMgr.HOST_PORT_HEADER];
}
- var realUrl = _rules.rule && _rules.rule.url;
+ var realUrl = _rules.rule && _rules.rule.url.replace('https:', 'tunnel:');
if (/^tunnel:\/\//.test(realUrl) && realUrl != tunnelUrl) {
tunnelUrl = realUrl;
data.realUrl = realUrl.replace('tunnel://', '');
|
refactor: Change https: to tunnel:
|
diff --git a/Kwf/Util/Update/Runner.php b/Kwf/Util/Update/Runner.php
index <HASH>..<HASH> 100644
--- a/Kwf/Util/Update/Runner.php
+++ b/Kwf/Util/Update/Runner.php
@@ -101,7 +101,7 @@ class Kwf_Util_Update_Runner
$this->_executeUpdatesAction('postUpdate');
if (!$this->_skipClearCache) {
if ($this->_verbose) echo "\n";
- Kwf_Util_ClearCache::getInstance()->clearCache('all', !$this->_verbose, true, array('skipMaintenanceBootstrap'=>true));
+ Kwf_Util_ClearCache::getInstance()->clearCache('all', $this->_verbose, true, array('skipMaintenanceBootstrap'=>true));
if ($this->_verbose) echo "\n";
}
$this->_executeUpdatesAction('postClearCache');
|
fix logic, verbose means output
|
diff --git a/languagetool-language-modules/uk/src/main/java/org/languagetool/rules/uk/UkrainianWordRepeatRule.java b/languagetool-language-modules/uk/src/main/java/org/languagetool/rules/uk/UkrainianWordRepeatRule.java
index <HASH>..<HASH> 100644
--- a/languagetool-language-modules/uk/src/main/java/org/languagetool/rules/uk/UkrainianWordRepeatRule.java
+++ b/languagetool-language-modules/uk/src/main/java/org/languagetool/rules/uk/UkrainianWordRepeatRule.java
@@ -28,6 +28,11 @@ public class UkrainianWordRepeatRule extends WordRepeatRule {
}
@Override
+ public String getId() {
+ return "UKRAINIAN_WORD_REPEAT_RULE";
+ }
+
+ @Override
public boolean ignore(AnalyzedTokenReadings[] tokens, int position) {
AnalyzedTokenReadings analyzedTokenReadings = tokens[position];
String token = analyzedTokenReadings.getToken();
|
[uk] Give the rule unique id
|
diff --git a/master/buildbot/test/__init__.py b/master/buildbot/test/__init__.py
index <HASH>..<HASH> 100644
--- a/master/buildbot/test/__init__.py
+++ b/master/buildbot/test/__init__.py
@@ -126,3 +126,9 @@ warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning)
# sqlalchemy.migrate is calling inspect.getargspec()
# https://bugs.launchpad.net/sqlalchemy-migrate/+bug/1662472
warnings.filterwarnings('ignore', r"inspect.getargspec\(\) is deprecated")
+
+# twisted.python.filepath and trial are using bytes file paths when
+# the "native" file path (Unicode) should be used on Windows.
+warnings.filterwarnings('ignore',
+ "The Windows bytes API has been "
+ "deprecated, use Unicode filenames instead")
|
Ignore warnings about bytes filepaths on Windows with Python 3.
|
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.33.0"
+ VERSION = "2.33.1"
end
|
Bump up version
[skip ci]
|
diff --git a/tests/integration/adapters/pouch-test.js b/tests/integration/adapters/pouch-test.js
index <HASH>..<HASH> 100644
--- a/tests/integration/adapters/pouch-test.js
+++ b/tests/integration/adapters/pouch-test.js
@@ -20,6 +20,17 @@ module('adapter:pouch [integration]', {
// issue.
(new PouchDB('ember-pouch-test')).destroy().then(() => {
App = startApp();
+ var bootPromise;
+ Ember.run(() => {
+ if (App.boot) {
+ App.advanceReadiness();
+ bootPromise = App.boot();
+ } else {
+ bootPromise = Ember.RSVP.Promise.resolve();
+ }
+ });
+ return bootPromise;
+ }).then(() => {
done();
});
},
|
Wait for app boot in integration test.
In ember-data beta<I> and later, with ember <I> and later, the store
is configured in an instance initializer. You have to wait for the app
to boot in order for all the instance initializers to have been run.
|
diff --git a/src/main/java/skadistats/clarity/processor/runner/ControllableRunner.java b/src/main/java/skadistats/clarity/processor/runner/ControllableRunner.java
index <HASH>..<HASH> 100644
--- a/src/main/java/skadistats/clarity/processor/runner/ControllableRunner.java
+++ b/src/main/java/skadistats/clarity/processor/runner/ControllableRunner.java
@@ -75,7 +75,8 @@ public class ControllableRunner extends AbstractRunner<ControllableRunner> {
return Command.FALLTHROUGH;
} else {
if (tick == -1) {
- wantedTick = 0; tick = 0;
+ wantedTick = 0;
+ setTick(0);
return Command.FALLTHROUGH;
}
if (demandedTick == null && resetPhase == ResetPhase.FORWARD_TO_WANTED) {
|
fix bug with end of tick 0 not properly emitted sometimes
|
diff --git a/blog/classes/privacy/provider.php b/blog/classes/privacy/provider.php
index <HASH>..<HASH> 100644
--- a/blog/classes/privacy/provider.php
+++ b/blog/classes/privacy/provider.php
@@ -212,7 +212,7 @@ class provider implements
// Loop over each blog entry in context.
$sql = "userid = :userid AND module IN (:blog, :blogext) AND id $insql";
$params = array_merge($inparams, ['userid' => $contextuserid, 'blog' => 'blog', 'blogext' => 'blog_external']);
- $recordset = $DB->get_recordset_select('post', $sql, $params);
+ $recordset = $DB->get_recordset_select('post', $sql, $params, 'id');
foreach ($recordset as $record) {
$subject = format_string($record->subject);
|
MDL-<I> core_blog: Prevent randomness in comments order
|
diff --git a/terraform/eval_validate.go b/terraform/eval_validate.go
index <HASH>..<HASH> 100644
--- a/terraform/eval_validate.go
+++ b/terraform/eval_validate.go
@@ -208,10 +208,8 @@ func (n *EvalValidateProvisioner) validateConnConfig(ctx EvalContext, config *co
// exactly what is expected for a given connection type.
var connectionBlockSupersetSchema = &configschema.Block{
Attributes: map[string]*configschema.Attribute{
- "type": {
- Type: cty.String,
- Required: true,
- },
+ // NOTE: "type" is not included here because it's treated special
+ // by the config loader and stored away in a separate field.
// Common attributes for both connection types
"user": {
|
core: Don't include "type" in connection block schema
The config loader already extracts this during its initial pass and saves
it as a separate field in a configs.Connection value, so requiring it
again here causes confusing errors about this attribute being provided but
not set.
|
diff --git a/test/kamerling/logging_test.rb b/test/kamerling/logging_test.rb
index <HASH>..<HASH> 100644
--- a/test/kamerling/logging_test.rb
+++ b/test/kamerling/logging_test.rb
@@ -83,6 +83,7 @@ module Kamerling
end
it 'logs UDP server receives' do
+ run_all_threads
100.times { udp_client.send 'PING', 0, *udp_server.addr }
udp_addr = Addr['127.0.0.1', udp_client.addr[1], :UDP]
run_all_threads
|
The need to rewrite logging to synced: <I>%
|
diff --git a/src/saml2/saml.py b/src/saml2/saml.py
index <HASH>..<HASH> 100644
--- a/src/saml2/saml.py
+++ b/src/saml2/saml.py
@@ -166,11 +166,16 @@ class AttributeValueBase(SamlBase):
try:
self.extension_attributes[XSI_TYPE] = typ
- self.extension_attributes['xmlns:xs'] = XS_NAMESPACE
except AttributeError:
- self._extatt['xmlns:xs'] = XS_NAMESPACE
self._extatt[XSI_TYPE] = typ
+ if typ.startswith('xs:'):
+ try:
+ self.extension_attributes['xmlns:xs'] = XS_NAMESPACE
+ except AttributeError:
+ self._extatt['xmlns:xs'] = XS_NAMESPACE
+
+
def get_type(self):
try:
return self.extension_attributes[XSI_TYPE]
|
It's cleaner to conditionally add this attribute
As per @jgehrcke's comment
|
diff --git a/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb b/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
index <HASH>..<HASH> 100644
--- a/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
+++ b/lib/vagrant/action/builtin/handle_forwarded_port_collisions.rb
@@ -156,8 +156,6 @@ module Vagrant
new_port: repaired_port.to_s))
end
end
-
- @app.call(env)
end
def lease_check(port)
|
Remove redundant app call from action "handle_forwarded_port_collisions"
This call should not be in the `handle` helper method. It is specified in the `call` method already.
|
diff --git a/lib/sup/colormap.rb b/lib/sup/colormap.rb
index <HASH>..<HASH> 100644
--- a/lib/sup/colormap.rb
+++ b/lib/sup/colormap.rb
@@ -213,7 +213,7 @@ class Colormap
add symbol, fg, bg, attrs
end
- BufferManager.flash error if error
+ warn error if error
end
def self.instance; @@instance; end
|
send color errors to the log instead of flashing
During startup, when these errors are most likely to occur, not enough buffer
initialization has been done for BufferManager.flash to work.
|
diff --git a/src/Route.php b/src/Route.php
index <HASH>..<HASH> 100644
--- a/src/Route.php
+++ b/src/Route.php
@@ -374,10 +374,9 @@ class Route implements QueryRouteInterface {
throw new \InvalidArgumentException;
}
$callback = $this->get( $which );
- if ( ! is_callable( $callback ) ) {
- throw new \DomainException;
+ if ( is_callable( $callback ) ) {
+ return call_user_func_array( $callback, $args );
}
- return call_user_func_array( $callback, $args );
}
}
\ No newline at end of file
diff --git a/tests/Unit/RouteTest.php b/tests/Unit/RouteTest.php
index <HASH>..<HASH> 100644
--- a/tests/Unit/RouteTest.php
+++ b/tests/Unit/RouteTest.php
@@ -13,13 +13,10 @@ class RouteTest extends TestCase {
return $route;
}
- /**
- * @expectedException \DomainException
- */
- function testAfterFailsIfBadCallbable() {
+ function testAfterNullIfNotCallbable() {
$route = $this->get();
$route->set( 'after', 'foo' );
- $route->runAfter();
+ assertNull( $route->runAfter() );
}
function testAfter() {
|
Do not throw if no callable runAfter/Before
|
diff --git a/packages/wdio-cli/src/index.js b/packages/wdio-cli/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/wdio-cli/src/index.js
+++ b/packages/wdio-cli/src/index.js
@@ -19,6 +19,17 @@ for (const param of CLI_PARAMS) {
}
const params = pickBy(argv.argv)
+
+/**
+ * fail execution if more than one wdio config file was specified
+ */
+if (params._.length > 1) {
+ argv.showHelp()
+ console.error(`More than one config file was specified: ${params._.join(', ')}`) // eslint-disable-line
+ console.error('Error: You can only run one wdio config file!') // eslint-disable-line
+ process.exit(1)
+}
+
const localConf = path.join(process.cwd(), 'wdio.conf.js')
const wdioConf = params._[0] || (fs.existsSync(localConf) ? localConf : null)
|
wdio-cli: make sure only one conf file was specified
|
diff --git a/lib/Models/GlobeOrMap.js b/lib/Models/GlobeOrMap.js
index <HASH>..<HASH> 100644
--- a/lib/Models/GlobeOrMap.js
+++ b/lib/Models/GlobeOrMap.js
@@ -246,12 +246,14 @@ GlobeOrMap.prototype._highlightFeature = function(feature) {
'marker-color': this.terria.baseMapContrastColor
};
+ var that = this;
var removeCallback = this._removeHighlightCallback = function() {
- catalogItem._hide();
- catalogItem._disable();
+ that._highlightPromise.then(function() {
+ catalogItem._hide();
+ catalogItem._disable();
+ });
};
- var that = this;
that._highlightPromise = catalogItem.load().then(function() {
if (removeCallback !== that._removeHighlightCallback) {
return;
|
Wait for GeoJSON region selection layer to load before hiding it
|
diff --git a/lib/backup/cli/helpers.rb b/lib/backup/cli/helpers.rb
index <HASH>..<HASH> 100644
--- a/lib/backup/cli/helpers.rb
+++ b/lib/backup/cli/helpers.rb
@@ -23,6 +23,10 @@ module Backup
begin
out, err = '', ''
+ # popen4 doesn't work in 1.8.7 with stock versions of ruby shipped
+ # with major OSs. Hack to make it stop segfaulting.
+ # See: https://github.com/engineyard/engineyard/issues/115
+ GC.disable if RUBY_VERSION < '1.9'
ps = Open4.popen4(command) do |pid, stdin, stdout, stderr|
stdin.close
out, err = stdout.read.strip, stderr.read.strip
@@ -32,6 +36,8 @@ module Backup
Failed to execute system command on #{ RUBY_PLATFORM }
Command was: #{ command }
EOS
+ ensure
+ GC.enable if RUBY_VERSION < '1.9'
end
if ps.success?
|
Fix segfaults with Popen4 and Ruby <I>
|
diff --git a/tasklib/serializing.py b/tasklib/serializing.py
index <HASH>..<HASH> 100644
--- a/tasklib/serializing.py
+++ b/tasklib/serializing.py
@@ -178,8 +178,8 @@ class SerializingObject(object):
def deserialize_tags(self, tags):
if isinstance(tags, six.string_types):
- return tags.split(',') if tags else []
- return tags or []
+ return set(tags.split(',')) if tags else set()
+ return set(tags or [])
def serialize_depends(self, value):
# Return the list of uuids
|
SerializingObject: Serialize tags into sets, not lists
|
diff --git a/confutils/__init__.py b/confutils/__init__.py
index <HASH>..<HASH> 100644
--- a/confutils/__init__.py
+++ b/confutils/__init__.py
@@ -5,7 +5,7 @@
from __future__ import unicode_literals
__author__ = "Raphaël Barrois <raphael.barrois+confutils@polytechnique.org>"
-__version__ = '0.3.0'
+__version__ = '0.3.1'
from .configfile import ConfigFile, ConfigLine, Parser
from .configfile import ConfigError, ConfigReadingError, ConfigWritingError
|
Version bump to <I>.
|
diff --git a/core-bundle/src/Resources/contao/library/Contao/Input.php b/core-bundle/src/Resources/contao/library/Contao/Input.php
index <HASH>..<HASH> 100644
--- a/core-bundle/src/Resources/contao/library/Contao/Input.php
+++ b/core-bundle/src/Resources/contao/library/Contao/Input.php
@@ -462,6 +462,12 @@ class Input
$varValue = strip_tags($varValue, $strAllowedTags);
$varValue = str_replace(array('<!--', '<![', '-->'), array('<!--', '<![', '-->'), $varValue);
+ // Recheck for encoded null bytes
+ while (strpos($varValue, '\\0') !== false)
+ {
+ $varValue = str_replace('\\0', '', $varValue);
+ }
+
return $varValue;
}
|
[Core] Fix another weakness in the `Input` class and further harden the `deserialize()` function
Fix another weakness in the `Input` class and further harden the `deserialize()` function. Thanks to Martin Auswöger for his input.
|
diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb
index <HASH>..<HASH> 100644
--- a/activesupport/lib/active_support/core_ext/class/attribute.rb
+++ b/activesupport/lib/active_support/core_ext/class/attribute.rb
@@ -69,7 +69,8 @@ class Class
# To opt out of both instance methods, pass <tt>instance_accessor: false</tt>.
def class_attribute(*attrs)
options = attrs.extract_options!
- instance_reader = options.fetch(:instance_accessor, true) && options.fetch(:instance_reader, true)
+ # double assignment is used to avoid "assigned but unused variable" warning
+ instance_reader = instance_reader = options.fetch(:instance_accessor, true) && options.fetch(:instance_reader, true)
instance_writer = options.fetch(:instance_accessor, true) && options.fetch(:instance_writer, true)
# We use class_eval here rather than define_method because class_attribute
|
Remove 'assigned but unused variable' warning
|
diff --git a/store_memory.go b/store_memory.go
index <HASH>..<HASH> 100644
--- a/store_memory.go
+++ b/store_memory.go
@@ -67,7 +67,7 @@ func (s *MemoryStore) Get(key string, rate Rate) (Context, error) {
return Context{
Limit: rate.Limit,
Remaining: remaining,
- Reset: time.Now().Add(time.Duration(item.Expiration.Second()) * time.Second).Unix(),
+ Reset: time.Now().Add(time.Duration(item.Expiration) * time.Second).Unix(),
Reached: count > rate.Limit,
}, nil
}
|
deal with change of go-cache
|
diff --git a/tools/nni_cmd/config_schema.py b/tools/nni_cmd/config_schema.py
index <HASH>..<HASH> 100644
--- a/tools/nni_cmd/config_schema.py
+++ b/tools/nni_cmd/config_schema.py
@@ -1,8 +1,9 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT license.
-import os
import json
+import logging
+import os
import netifaces
from schema import Schema, And, Optional, Regex, Or, SchemaError
from nni.package_utils import create_validator_instance, get_all_builtin_names, get_builtin_algo_meta
@@ -78,6 +79,7 @@ class AlgoSchema:
if meta and 'accept_class_args' in meta and meta['accept_class_args'] == False:
raise SchemaError('classArgs is not allowed.')
+ logging.getLogger('nni.protocol').setLevel(logging.ERROR) # we know IPC is not there, don't complain
validator = create_validator_instance(algo_type+'s', builtin_name)
if validator:
try:
|
shut validator ipc warning (#<I>)
|
diff --git a/configure.py b/configure.py
index <HASH>..<HASH> 100755
--- a/configure.py
+++ b/configure.py
@@ -133,7 +133,9 @@ class Bootstrap:
return self.writer.newline()
def variable(self, key, val):
- self.vars[key] = self._expand(val)
+ # In bootstrap mode, we have no ninja process to catch /showIncludes
+ # output.
+ self.vars[key] = self._expand(val).replace('/showIncludes', '')
return self.writer.variable(key, val)
def rule(self, name, **kwargs):
@@ -308,10 +310,6 @@ if platform.is_msvc():
'/DNOMINMAX', '/D_CRT_SECURE_NO_WARNINGS',
'/D_HAS_EXCEPTIONS=0',
'/DNINJA_PYTHON="%s"' % options.with_python]
- if options.bootstrap:
- # In bootstrap mode, we have no ninja process to catch /showIncludes
- # output.
- cflags.remove('/showIncludes')
if platform.msvc_needs_fs():
cflags.append('/FS')
ldflags = ['/DEBUG', '/libpath:$builddir']
|
win: Only drop /showIncludes in bootstrap builds.
Fixes #<I>.
|
diff --git a/views/widget/header-logo.blade.php b/views/widget/header-logo.blade.php
index <HASH>..<HASH> 100644
--- a/views/widget/header-logo.blade.php
+++ b/views/widget/header-logo.blade.php
@@ -1,6 +1,6 @@
@extends('widget.header-widget')
@section('widget')
- <div class="c-header__logo t-header__logo">
+ <div class="c-header__logo">
<a href="{{$home}}">
{!! $logotype !!}
</a>
|
Removes t-class from logo
|
diff --git a/channeldb/channel.go b/channeldb/channel.go
index <HASH>..<HASH> 100644
--- a/channeldb/channel.go
+++ b/channeldb/channel.go
@@ -1239,11 +1239,11 @@ func syncNewChannel(tx *bbolt.Tx, c *OpenChannel, addrs []net.Addr) error {
return putLinkNode(nodeInfoBucket, linkNode)
}
-// UpdateCommitment updates the commitment state for the specified party
-// (remote or local). The commitment stat completely describes the balance
-// state at this point in the commitment chain. This method its to be called on
-// two occasions: when we revoke our prior commitment state, and when the
-// remote party revokes their prior commitment state.
+// UpdateCommitment updates the local commitment state. It locks in the pending
+// local updates that were received by us from the remote party. The commitment
+// state completely describes the balance state at this point in the commitment
+// chain. This method its to be called when we revoke our prior commitment
+// state.
func (c *OpenChannel) UpdateCommitment(newCommitment *ChannelCommitment) error {
c.Lock()
defer c.Unlock()
|
channeldb: update UpdateCommitment description
This method is only used to update the local commitment transaction.
Updated comment accordingly.
|
diff --git a/cli/github/release_notes.py b/cli/github/release_notes.py
index <HASH>..<HASH> 100644
--- a/cli/github/release_notes.py
+++ b/cli/github/release_notes.py
@@ -47,7 +47,8 @@ class BaseReleaseNotesGenerator(object):
class BaseChangeNotesParser(object):
- def __init__(self):
+ def __init__(self, title):
+ self.title = title
self.content = []
def parse(self):
@@ -65,8 +66,7 @@ class BaseChangeNotesParser(object):
class ChangeNotesLinesParser(BaseChangeNotesParser):
def __init__(self, title, start_line):
- super(ChangeNotesLinesParser, self).__init__()
- self.title = title
+ super(ChangeNotesLinesParser, self).__init__(title)
if not start_line:
raise ValueError('start_line cannot be empty')
self.start_line = start_line
|
title is required in init of BaseChangeNotesParser
|
diff --git a/src/directives/schema-form.js b/src/directives/schema-form.js
index <HASH>..<HASH> 100644
--- a/src/directives/schema-form.js
+++ b/src/directives/schema-form.js
@@ -147,6 +147,18 @@ angular.module('schemaForm')
// let it be.
scope.externalDestructionInProgress = true;
});
+
+ /**
+ * Evaluate an expression, i.e. scope.$eval
+ * but do it in parent scope
+ *
+ * @param {String} expression
+ * @param {Object} locals (optional)
+ * @return {Any} the result of the expression
+ */
+ scope.evalExpr = function(expression, locals) {
+ return $scope.$parent.$eval(expression, locals);
+ };
}
};
}
|
Eval expression in man sf-schema directive
Needed for new bootrstrap decorators condition
|
diff --git a/src/Gitonomy/Git/Commit.php b/src/Gitonomy/Git/Commit.php
index <HASH>..<HASH> 100644
--- a/src/Gitonomy/Git/Commit.php
+++ b/src/Gitonomy/Git/Commit.php
@@ -191,6 +191,14 @@ class Commit
}
/**
+ * Returns a fixed-with short hash.
+ */
+ public function getFixedShortHash($length = 6)
+ {
+ return substr($this->hash, 0, $length);
+ }
+
+ /**
* Returns parent hashes.
*
* @return array An array of SHA1 hashes
|
add a method to get fixed with commit hash
|
diff --git a/bcbio/install.py b/bcbio/install.py
index <HASH>..<HASH> 100644
--- a/bcbio/install.py
+++ b/bcbio/install.py
@@ -724,7 +724,7 @@ def add_subparser(subparsers):
action="append", default=[], type=_check_toolplus)
parser.add_argument("--datatarget", help="Data to install. Allows customization or install of extra data.",
action="append", default=[],
- choices=["variation", "rnaseq", "smallrna", "gemini", "cadd", "vep", "dbnsfp",
+ choices=["variation", "rnaseq", "smallrna", "gemini", "cadd", "vep", "dbnsfp", "dbscsnv"
"battenberg", "kraken"])
parser.add_argument("--genomes", help="Genomes to download",
action="append", default=[], choices=SUPPORTED_GENOMES)
|
added remaining modification for dbscsnv
|
diff --git a/src/Service/Config/Fallback.php b/src/Service/Config/Fallback.php
index <HASH>..<HASH> 100644
--- a/src/Service/Config/Fallback.php
+++ b/src/Service/Config/Fallback.php
@@ -126,21 +126,21 @@ abstract class Fallback implements ConfigConstInterface
*
* @var string
*/
- protected const CHUNKS_FOLDER = 'chunks';
+ public const CHUNKS_FOLDER = 'chunks';
/**
* Name of the log folder.
*
* @var string
*/
- protected const LOG_FOLDER = 'log';
+ public const LOG_FOLDER = 'log';
/**
* Name of the config folder.
*
* @var string
*/
- protected const CONFIG_FOLDER = 'config';
+ public const CONFIG_FOLDER = 'config';
/**
* Name of the smokygrey skin.
|
Made the folder constants public, so plugins could use them.
|
diff --git a/src/base/head.js b/src/base/head.js
index <HASH>..<HASH> 100644
--- a/src/base/head.js
+++ b/src/base/head.js
@@ -1,7 +1,7 @@
import { take } from './take' ;
/**
- * @function head
* Same as {@link take}.
+ * @function head
*/
export const head = take ;
diff --git a/src/map/filter.js b/src/map/filter.js
index <HASH>..<HASH> 100644
--- a/src/map/filter.js
+++ b/src/map/filter.js
@@ -22,7 +22,7 @@ export function* filter ( predicate , iterable ) {
}
/**
- * @function filtertrue
* Same as {@link filter}.
+ * @function filtertrue
*/
export const filtertrue = filter ;
|
fix order in documentation of head and filtertrue
|
diff --git a/pysd/py_backend/vensim/vensim2py.py b/pysd/py_backend/vensim/vensim2py.py
index <HASH>..<HASH> 100644
--- a/pysd/py_backend/vensim/vensim2py.py
+++ b/pysd/py_backend/vensim/vensim2py.py
@@ -48,7 +48,7 @@ def get_file_sections(file_str):
main = !":MACRO:" ~r".+(?!:MACRO:)"
name = basic_id / escape_group
- basic_id = ~r"[a-zA-Z][a-zA-Z0-9_\s]*"
+ basic_id = ~r"[a-zA-Z][a-zA-Z0-9_\'\$\s]*"
# between quotes, either escaped quote or character that is not a quote
escape_group = "\"" ( "\\\"" / ~r"[^\"]" )* "\""
|
Fix missing grammar definition for identifiers.
|
diff --git a/version/info.go b/version/info.go
index <HASH>..<HASH> 100644
--- a/version/info.go
+++ b/version/info.go
@@ -26,7 +26,6 @@ var (
Branch string
BuildUser string
BuildDate string
- GoVersion = runtime.Version()
)
// Map provides the iterable version information.
@@ -36,7 +35,7 @@ var Map = map[string]string{
"branch": Branch,
"buildUser": BuildUser,
"buildDate": BuildDate,
- "goVersion": GoVersion,
+ "goVersion": runtime.Version(),
}
func init() {
|
Simplify runtime version code more
It's no longer a build-time injected variable (as the comment above its
block indicates), so move it to the map below.
|
diff --git a/build-test.js b/build-test.js
index <HASH>..<HASH> 100755
--- a/build-test.js
+++ b/build-test.js
@@ -1,3 +1,15 @@
#!/usr/bin/env node
-require('./')()
+process.env.NODE_ENV = 'test'
+
+var path = require('path')
+var test = null
+
+try {
+ test = require(path.join(process.cwd(), 'package.json')).prebuild.test
+} catch (err) {
+ // do nothing
+}
+
+if (test) require(path.join(process.cwd(), test))
+else require('./')()
|
support prebuild.test for test script setup
|
diff --git a/src/js/mep-feature-tracks.js b/src/js/mep-feature-tracks.js
index <HASH>..<HASH> 100644
--- a/src/js/mep-feature-tracks.js
+++ b/src/js/mep-feature-tracks.js
@@ -589,7 +589,8 @@
type: 'GET',
dataType: 'jsonp',
success: function(d) {
- callback(d.responseData.translatedText);
+
+ callback((d.responseData !== null) ? d.responseData.translatedText : 'No translation');
},
error: function(e) {
callback(null);
|
Fixes errors that come when Google translate is over capacity
|
diff --git a/backtrader/utils/autodict.py b/backtrader/utils/autodict.py
index <HASH>..<HASH> 100644
--- a/backtrader/utils/autodict.py
+++ b/backtrader/utils/autodict.py
@@ -43,7 +43,13 @@ class AutoDict(dict):
if isinstance(val, (AutoDict, AutoOrderedDict)):
val._close()
+ def _open(self):
+ self._closed = False
+
def __missing__(self, key):
+ if self._closed:
+ raise KeyError
+
value = self[key] = type(self)()
return value
|
Add exception raising to AutoDict if closed and _open method
|
diff --git a/lib/dxruby_sdl/font.rb b/lib/dxruby_sdl/font.rb
index <HASH>..<HASH> 100644
--- a/lib/dxruby_sdl/font.rb
+++ b/lib/dxruby_sdl/font.rb
@@ -19,6 +19,7 @@ module DXRubySDL
private
+ # :nocov:
if /darwin/ =~ RUBY_PLATFORM
FONTS = {
'osaka' => '/Library/Fonts/osaka.ttf',
@@ -31,5 +32,6 @@ module DXRubySDL
'IPA Pゴシック' => '/usr/share/fonts/opentype/ipafont-gothic/ipagp.ttf',
}
end
+ # :nocov:
end
end
|
added :nocov: in Font.
|
diff --git a/cmd/jujud/agent/machine.go b/cmd/jujud/agent/machine.go
index <HASH>..<HASH> 100644
--- a/cmd/jujud/agent/machine.go
+++ b/cmd/jujud/agent/machine.go
@@ -720,6 +720,7 @@ func (a *MachineAgent) startAPIWorkers(apiConn api.Connection) (_ worker.Worker,
IsFatal: agenterrors.ConnectionIsFatal(logger, apiConn),
MoreImportant: agenterrors.MoreImportant,
RestartDelay: jworker.RestartDelay,
+ Logger: logger.Child("runner"),
})
defer func() {
// If startAPIWorkers exits early with an error, stop the
|
Add logger to runner for api workers.
These run inside the unconverted-api-workers and their state changes are
not always obvious. Allow for more detail from the runner.
|
diff --git a/Query/Builder.php b/Query/Builder.php
index <HASH>..<HASH> 100755
--- a/Query/Builder.php
+++ b/Query/Builder.php
@@ -1289,7 +1289,7 @@ class Builder
$this->wheres[] = compact('type', 'query', 'boolean');
- $this->addBinding($query->getBindings(), 'where');
+ $this->addBinding($query->getRawBindings()['where'], 'where');
}
return $this;
|
Ignore non-where bindings in nested where() constraints (#<I>)
|
diff --git a/test/common.js b/test/common.js
index <HASH>..<HASH> 100644
--- a/test/common.js
+++ b/test/common.js
@@ -18,7 +18,7 @@ var Stormpath = require('../lib');
chai.use(sinonChai);
function u(){}
-u.BASE_URL = 'https://api.stormpath.com/v1';
+u.BASE_URL = 'https://api.stormpath.com';
/** adds '/v1' to relative URL, to work with nock request mocker */
u.v1 = function(s){return '/v1' + s;};
|
`u.BASE_URL` should not contain `/v1` as this will be added by `u.v1()`
|
diff --git a/lib/active_merchant/billing/gateways/adyen.rb b/lib/active_merchant/billing/gateways/adyen.rb
index <HASH>..<HASH> 100644
--- a/lib/active_merchant/billing/gateways/adyen.rb
+++ b/lib/active_merchant/billing/gateways/adyen.rb
@@ -14,8 +14,6 @@ module ActiveMerchant #:nodoc:
def initialize(options = {})
requires!(options, :company, :password)
- @company = options[:company]
- @password = options[:password]
super
end
@@ -113,7 +111,7 @@ module ActiveMerchant #:nodoc:
def headers
{
- 'Authorization' => 'Basic ' + Base64.encode64("ws@Company.#{@company}:#{@password}").strip
+ 'Authorization' => 'Basic ' + Base64.encode64("ws@Company.#{@options[:company]}:#{@options[:password]}").strip
}
end
|
Reduce the reliance on instance variables.
|
diff --git a/src/Application.php b/src/Application.php
index <HASH>..<HASH> 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -88,7 +88,9 @@ class Application extends BaseApplication
));
}
- $this['sandstone.push.event_forwarder']->forwardAllEvents($eventName);
+ $this->before(function () {
+ $this['sandstone.push.event_forwarder']->forwardAllEvents($eventName);
+ });
return $this;
}
@@ -110,7 +112,9 @@ class Application extends BaseApplication
));
}
- $this['sandstone.push.event_forwarder']->forwardAllEvents($eventsNames);
+ $this->before(function () {
+ $this['sandstone.push.event_forwarder']->forwardAllEvents($eventsNames);
+ });
return $this;
}
|
forward events once application is booting to avoid to use dispatcher prematurely
|
diff --git a/templates/ubuntu-10.04.3-server-amd64/definition.rb b/templates/ubuntu-10.04.3-server-amd64/definition.rb
index <HASH>..<HASH> 100644
--- a/templates/ubuntu-10.04.3-server-amd64/definition.rb
+++ b/templates/ubuntu-10.04.3-server-amd64/definition.rb
@@ -7,7 +7,7 @@ Veewee::Session.declare( {
"<Esc><Esc><Enter>",
"/install/vmlinuz ",
"noapic ",
- "auto-install/enable",
+ "auto-install/enable ",
"console-setup/ask_detect=false ",
"console-setup/modelcode=pc105 ",
"console-setup/layoutcode=us ",
|
Add missing space so auto-install/enable isn't concatenated with next option.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.