diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/drools-planner-core/src/main/java/org/drools/planner/config/solver/SolverConfig.java b/drools-planner-core/src/main/java/org/drools/planner/config/solver/SolverConfig.java
index <HASH>..<HASH> 100644
--- a/drools-planner-core/src/main/java/org/drools/planner/config/solver/SolverConfig.java
+++ b/drools-planner-core/src/main/java/org/drools/planner/config/solver/SolverConfig.java
@@ -235,7 +235,7 @@ public class SolverConfig {
RuleBaseConfiguration ruleBaseConfiguration = new RuleBaseConfiguration();
RuleBase ruleBase = RuleBaseFactory.newRuleBase(ruleBaseConfiguration);
if (packageBuilder.hasErrors()) {
- throw new IllegalStateException("There are errors in the scoreDrl's:"
+ throw new IllegalStateException("There are errors in the scoreDrl's:\n"
+ packageBuilder.getErrors().toString());
}
ruleBase.addPackage(packageBuilder.getPackage());
|
make the first compilation error clearer (avoid misleading that the second error is the first)
|
diff --git a/benchmark/index.js b/benchmark/index.js
index <HASH>..<HASH> 100644
--- a/benchmark/index.js
+++ b/benchmark/index.js
@@ -260,6 +260,25 @@ suite.on('complete', function() {
console.table(headers, results)
})
-suite.run({
- async: false
+console.log('comma-number benchmark (' + process.pid + ')')
+
+const ask = require('readline').createInterface({
+ input : process.stdin,
+ output: process.stdout
+})
+
+ask.question('Begin benchmark? (y/N) ', function(answer) {
+
+ ask.close()
+
+ if ((answer != null) && (answer[0] === 'y' || answer[0] === 'Y')) {
+ suite.run({
+ async: false
+ })
+ }
+
+ else {
+ console.log('quitting')
+ }
+
})
|
tell PID and ask to begin so it can be set to high priority
|
diff --git a/escope.js b/escope.js
index <HASH>..<HASH> 100644
--- a/escope.js
+++ b/escope.js
@@ -128,7 +128,8 @@
function defaultOptions() {
return {
optimistic: false,
- directive: false
+ directive: false,
+ ecmaVersion: 5
};
}
|
Prepare for adding ecmaVersion 6
|
diff --git a/insights/specs/core3_archive.py b/insights/specs/core3_archive.py
index <HASH>..<HASH> 100644
--- a/insights/specs/core3_archive.py
+++ b/insights/specs/core3_archive.py
@@ -14,3 +14,4 @@ simple_file = partial(simple_file, context=SerializedArchiveContext)
class Core3Specs(Specs):
branch_info = simple_file("/branch_info", kind=RawFileProvider)
+ display_name = simple_file("display_name")
|
fix(specs): add spec for display_name to core3_archive (#<I>)
There are issues with display_name in core3 archives
RHCLOUD-<I>
|
diff --git a/Makefile b/Makefile
index <HASH>..<HASH> 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
.PHONY: test test-mocha
test: test-mocha
- ./node_modules/.bin/mocha
+ JENKINS_HOME=true ./node_modules/.bin/mocha
build: man
diff --git a/test/config.js b/test/config.js
index <HASH>..<HASH> 100644
--- a/test/config.js
+++ b/test/config.js
@@ -22,4 +22,4 @@ exports.strongops = {
email: 'edmond@stdarg.com'
},
getFileSync: getFileSyncFile,
-};
\ No newline at end of file
+};
diff --git a/test/strongops.js b/test/strongops.js
index <HASH>..<HASH> 100644
--- a/test/strongops.js
+++ b/test/strongops.js
@@ -87,7 +87,7 @@ describe('getFileSync', function() {
describe('getFileSync', function() {
it('Should return the contents of a file when file is present.', function() {
- console.log('getFileSync:', test.getFileSync);
+ //console.log('getFileSync:', test.getFileSync);
assert.ok(is.nonEmptyStr(strops.test.getFileSync(test.getFileSync)) === true);
});
});
|
Always set JENKINS_HOME to use test environment
Without this, tests run against the current users actual environment,
which is different for each user (though can be configured manually
using test/config.js).
|
diff --git a/src/app/directives/bodyClass.js b/src/app/directives/bodyClass.js
index <HASH>..<HASH> 100644
--- a/src/app/directives/bodyClass.js
+++ b/src/app/directives/bodyClass.js
@@ -15,7 +15,7 @@ function (angular, app, _) {
var lastPulldownVal;
var lastHideControlsVal;
- $scope.$watch('dashboard.pulldowns', function() {
+ $scope.$watchCollection('dashboard.pulldowns', function() {
if (!$scope.dashboard) {
return;
}
@@ -26,7 +26,7 @@ function (angular, app, _) {
elem.toggleClass('submenu-controls-visible', panelEnabled);
lastPulldownVal = panelEnabled;
}
- }, true);
+ });
$scope.$watch('dashboard.hideControls', function() {
if (!$scope.dashboard) {
@@ -49,4 +49,4 @@ function (angular, app, _) {
};
});
-});
\ No newline at end of file
+});
|
Switch from watch to watchCollection for bodyclass directive
|
diff --git a/src/api.js b/src/api.js
index <HASH>..<HASH> 100644
--- a/src/api.js
+++ b/src/api.js
@@ -16,7 +16,26 @@ function api(baseUrl, config, method, params) {
const queryParams = Object.keys(params).map(generateQueryParam);
url = `${url}?${queryParams.join('&')}`;
}
- return helper.fetch(url, options).then((res) => res.json());
+ let response = null;
+ return helper.fetch(url, options).then((res) => {
+ response = res;
+ return res.json();
+ }).catch((e) => {
+ if (e instanceof SyntaxError) {
+ // We probably got a non-JSON response from the server.
+ // We should inform the user of the same.
+ let message = 'Server Returned a non-JSON response.';
+ if (response.status === 404) {
+ message += ` Maybe endpoint: ${method} ${response.url.replace(config.apiURL, '')} doesn't exist.`;
+ } else {
+ message += ' Please check the API documentation.';
+ }
+ const error = new Error(message);
+ error.res = response;
+ throw error;
+ }
+ throw e;
+ });
}
module.exports = api;
|
api: Gracefully handle HTML <I> pages returned by server.
Previously, calling a non-existent endpoint would result in
getting a JSON.parse SyntaxError, which isn't informative of
the main cause of the error. This change allows zulip-js to
tell the API user about probable causes for the server
returning a non-JSON response.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -4,10 +4,10 @@ with open('README.rst') as readme_file:
readme = readme_file.read()
with open('requirements.txt') as req_file:
- requires = req_file.read().split('\n')
+ requires = [req for req in req_file.read().split('\n') if req]
with open('requirements-dev.txt') as req_file:
- requires_dev = req_file.read().split('\n')
+ requires_dev = [req for req in req_file.read().split('\n') if req]
with open('VERSION') as fp:
version = fp.read().strip()
|
Remove empty string from requirements list
When we moved to Python 3 we used this simpler method to read the requirements
file. However we need to remove the empty/Falsey elements from the list.
This fixes the error:
```
Failed building wheel for molo.yourwords
```
|
diff --git a/src/components/lists/index.js b/src/components/lists/index.js
index <HASH>..<HASH> 100755
--- a/src/components/lists/index.js
+++ b/src/components/lists/index.js
@@ -46,23 +46,25 @@ const List = {
const ListTileAction = {
name: 'list-tile-action',
+ data () {
+ return {
+ stack: false
+ }
+ },
+
computed: {
classes () {
return {
'list__tile__action': true,
'list__tile__action--stack': this.stack
}
- },
-
- stack () {
- if (!this.$el) {
- return false
- }
-
- return this.$el.childElementCount > 1
}
},
+ mounted () {
+ this.stack = this.$el.childElementCount > 1
+ },
+
render (createElement) {
let data = {
'class': this.classes
|
fixed bug where list tile actions may not apply stack class
|
diff --git a/lib/gir_ffi/builders/argument_builder.rb b/lib/gir_ffi/builders/argument_builder.rb
index <HASH>..<HASH> 100644
--- a/lib/gir_ffi/builders/argument_builder.rb
+++ b/lib/gir_ffi/builders/argument_builder.rb
@@ -1,6 +1,6 @@
require 'gir_ffi/builders/base_argument_builder'
require 'gir_ffi/builders/closure_to_pointer_convertor'
-require 'gir_ffi/builders/c_to_ruby_convertor'
+require 'gir_ffi/builders/full_c_to_ruby_convertor'
require 'gir_ffi/builders/ruby_to_c_convertor'
require 'gir_ffi/builders/null_convertor'
@@ -66,12 +66,7 @@ module GirFFI
def output_value
base = "#{call_argument_name}.to_value"
if needs_out_conversion?
- conversion = CToRubyConvertor.new(@type_info, base, length_argument_name).conversion
- if @type_info.argument_class_name == 'GObject::Value'
- "#{conversion}.get_value"
- else
- conversion
- end
+ FullCToRubyConvertor.new(@type_info, base, length_argument_name).conversion
elsif allocated_by_them?
"GirFFI::InOutPointer.new(#{type_info.tag_or_class[1].inspect}, #{base}).to_value"
else
|
Use FullCToRubyConvertor for both GValue conversions
|
diff --git a/tests/test_baselens.py b/tests/test_baselens.py
index <HASH>..<HASH> 100644
--- a/tests/test_baselens.py
+++ b/tests/test_baselens.py
@@ -101,7 +101,7 @@ def test_DecodeLens_get_with_args():
def test_DecodeLens_set():
- assert b.DecodeLens('ascii', 'replace').set(b'', '\xe9') == b'?'
+ assert b.DecodeLens('ascii', 'replace').set(b'', u'\xe9') == b'?'
def test_EachLens_get_all():
|
str in py3 is unicode in py2
|
diff --git a/blueocean-pipeline-scm-api/src/main/java/io/jenkins/blueocean/scm/api/AbstractMultiBranchCreateRequest.java b/blueocean-pipeline-scm-api/src/main/java/io/jenkins/blueocean/scm/api/AbstractMultiBranchCreateRequest.java
index <HASH>..<HASH> 100644
--- a/blueocean-pipeline-scm-api/src/main/java/io/jenkins/blueocean/scm/api/AbstractMultiBranchCreateRequest.java
+++ b/blueocean-pipeline-scm-api/src/main/java/io/jenkins/blueocean/scm/api/AbstractMultiBranchCreateRequest.java
@@ -74,7 +74,7 @@ public abstract class AbstractMultiBranchCreateRequest extends AbstractPipelineC
validateInternal(getName(), scmConfig, organization);
MultiBranchProject project = createMultiBranchProject(organization);
assignCredentialToProject(scmConfig, project);
- SCMSource source = createSource(project, scmConfig);
+ SCMSource source = createSource(project, scmConfig).withId("blueocean");
project.setSourcesList(ImmutableList.of(new BranchSource(source)));
project.save();
final boolean hasJenkinsfile = repoHasJenkinsFile(source);
|
JENKINS-<I># Create MBP SCMSource with Id (#<I>)
|
diff --git a/src/xopen/__init__.py b/src/xopen/__init__.py
index <HASH>..<HASH> 100644
--- a/src/xopen/__init__.py
+++ b/src/xopen/__init__.py
@@ -295,8 +295,6 @@ class PipedCompressionReader(Closing):
self._file: IO = io.TextIOWrapper(self.process.stdout)
else:
self._file = self.process.stdout
- assert self.process.stderr is not None
- self._stderr = io.TextIOWrapper(self.process.stderr)
self.closed = False
self._wait_for_output_or_process_exit()
self._raise_if_error()
@@ -375,6 +373,10 @@ class PipedCompressionReader(Closing):
# terminated with another exit code, but message is allowed
return
+ assert self.process.stderr is not None
+ if not stderr_message:
+ stderr_message = self.process.stderr.read()
+
self._file.close()
raise OSError("{!r} (exit code {})".format(stderr_message, retcode))
|
Add error message if process exits early.
|
diff --git a/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb b/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb
index <HASH>..<HASH> 100644
--- a/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb
+++ b/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb
@@ -16,7 +16,7 @@ module RailsEventStoreActiveRecord
expected_version
end
in_stream = events.flat_map.with_index do |event, index|
- position = if expected_version == :any
+ position = if expected_version.equal?(:any)
nil
else
expected_version + index + 1
|
More strong check
I am not sure if `equal` will always work, but I think it will as two
identical symbols must be the same object, no matter how constructed.
|
diff --git a/src/QueryInterpreter/Type/UpdateInterpreter.php b/src/QueryInterpreter/Type/UpdateInterpreter.php
index <HASH>..<HASH> 100644
--- a/src/QueryInterpreter/Type/UpdateInterpreter.php
+++ b/src/QueryInterpreter/Type/UpdateInterpreter.php
@@ -13,7 +13,7 @@ class UpdateInterpreter extends AbstractSqlQueryTypeInterpreter
{
public function supportedQueryType()
{
- TokenSequencerInterface::TYPE_UPDATE;
+ return TokenSequencerInterface::TYPE_UPDATE;
}
public function interpretQuery(TokenSequencerInterface $query)
|
Fix update interpreter to actually return the query type it supports
- DUH!!!!!!
|
diff --git a/lib/github_cli.rb b/lib/github_cli.rb
index <HASH>..<HASH> 100644
--- a/lib/github_cli.rb
+++ b/lib/github_cli.rb
@@ -12,7 +12,6 @@ require_relative 'github_cli/formatter'
require_relative 'github_cli/terminal'
require_relative 'github_cli/ui'
require_relative 'github_cli/version'
-require_relative 'github_cli/thor_ext'
# Base module which adds Github API to the command line
module GithubCLI
diff --git a/lib/github_cli/vendor.rb b/lib/github_cli/vendor.rb
index <HASH>..<HASH> 100644
--- a/lib/github_cli/vendor.rb
+++ b/lib/github_cli/vendor.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
if defined?(Thor)
GithubCLI.ui.warn "Thor has already been required. "
end
@@ -10,3 +8,5 @@ $:.unshift(vendor_dir) unless $:.include?(vendor_dir)
require 'thor'
require 'thor/group'
require 'thor/actions'
+
+require_relative 'thor_ext'
|
Change to load thor extension after thro itself to fix dependency issue
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -85,8 +85,8 @@ function callPromise(fn, args) {
function callback(err,other) {
// check if the 'err' is boolean, if so then this is a 'exists' callback special case
if (err && !(typeof err === 'boolean')) return reject(err);
- // convert arguments to proper array
- let args = Array.prototype.slice.call(arguments);
+ // convert arguments to proper array, ignoring error argument
+ let args = Array.prototype.slice.call(arguments, 1);
// if arguments length is one or more resolve arguments as array,
// otherwise resolve the argument as is.
return resolve(args.length < 2 ? args[0] : args.slice(1));
|
Fix error argument not ignored in resolve call
|
diff --git a/lib/Serverless.js b/lib/Serverless.js
index <HASH>..<HASH> 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -445,7 +445,7 @@ class Serverless {
// Only for internal use
_logDeprecation(code, message) {
- return logDeprecation(code, message, { serviceConfig: this.service });
+ return logDeprecation(code, message, { serviceConfig: this.configurationInput });
}
// To be used by external plugins
|
fix: Ensure early access to configuration in logDeprecation method
|
diff --git a/salt/states/git.py b/salt/states/git.py
index <HASH>..<HASH> 100644
--- a/salt/states/git.py
+++ b/salt/states/git.py
@@ -289,7 +289,7 @@ def latest(name,
depth
Defines depth in history when git a clone is needed in order to ensure
- latest. E.g. ``depth: 1`` is usefull when deploying from a repository
+ latest. E.g. ``depth: 1`` is useful when deploying from a repository
with a long history. Use rev to specify branch. This is not compatible
with tags or revision IDs.
|
Fix typo an usefull -> useful
|
diff --git a/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java b/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
+++ b/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java
@@ -30,6 +30,7 @@ import org.jboss.ws.api.monitoring.RecordProcessor;
import org.jboss.wsf.spi.invocation.InvocationHandler;
import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointMetrics;
+import org.jboss.wsf.spi.metadata.config.EndpointConfig;
import org.jboss.wsf.spi.security.SecurityDomainContext;
/**
@@ -137,4 +138,9 @@ public interface Endpoint extends Extensible
/** Set instance provider */
void setInstanceProvider(InstanceProvider provider);
+ /** Get endpoint config */
+ EndpointConfig getEndpointConfig();
+
+ /** Set endpoint config */
+ void setEndpointConfig(EndpointConfig config);
}
|
[JBWS-<I>] Adding EndpointConfig into Endpoint
|
diff --git a/concrete/views/image-editor/editor.php b/concrete/views/image-editor/editor.php
index <HASH>..<HASH> 100644
--- a/concrete/views/image-editor/editor.php
+++ b/concrete/views/image-editor/editor.php
@@ -87,7 +87,7 @@ $controls = $editor->getControlList()
</div>
<?php
-if (!$settings) {
+if (empty($settings)) {
$settings = array();
}
$fnames = array();
|
Avoid accessing undefined var in image-editor/editor
|
diff --git a/lib/fluent/config/section.rb b/lib/fluent/config/section.rb
index <HASH>..<HASH> 100644
--- a/lib/fluent/config/section.rb
+++ b/lib/fluent/config/section.rb
@@ -68,7 +68,7 @@ module Fluent
def respond_to?(symbol, include_all=false)
case symbol
- when :inspect, :nil?, :to_h, :+, :instance_of?, :kind_of?, :[], :respond_to?, :respond_to_missing?, :method_missing,
+ when :inspect, :nil?, :to_h, :+, :instance_of?, :kind_of?, :[], :respond_to?, :respond_to_missing?
true
when :!, :!= , :==, :equal?, :instance_eval, :instance_exec
true
|
Remove duplicate `method_missing?` and trailing comma
|
diff --git a/galpy/potential_src/interpRZPotential.py b/galpy/potential_src/interpRZPotential.py
index <HASH>..<HASH> 100644
--- a/galpy/potential_src/interpRZPotential.py
+++ b/galpy/potential_src/interpRZPotential.py
@@ -81,8 +81,6 @@ class interpRZPotential(Potential):
self._interpepifreq= interpepifreq
self._interpverticalfreq= interpverticalfreq
self._enable_c= enable_c*ext_loaded
- if enable_c and rgrid[2] != zgrid[2]:
- raise NotImplementedError("Unequal R and z grid sizes not implemented with enable_c")
self._zsym= zsym
if interpPot:
if use_c*ext_loaded:
@@ -578,7 +576,7 @@ def eval_potential_c(pot,R,z):
pot_args,
out,
ctypes.byref(err))
-
+
#Reset input arrays
if f_cont[0]: R= numpy.asfortranarray(R)
if f_cont[1]: z= numpy.asfortranarray(z)
|
remove Error for unequal grid sizes
|
diff --git a/lib/webgroup_regression_tests.py b/lib/webgroup_regression_tests.py
index <HASH>..<HASH> 100644
--- a/lib/webgroup_regression_tests.py
+++ b/lib/webgroup_regression_tests.py
@@ -19,6 +19,8 @@
## along with CDS Invenio; if not, write to the Free Software Foundation, Inc.,
## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+# pylint: disable-msg=E1102
+
"""Unit tests for the user handling library."""
__revision__ = "$Id$"
|
Disable false positive E<I> pylint warnings due to the use of mechanize.Browser().
|
diff --git a/fctx-compiler.js b/fctx-compiler.js
index <HASH>..<HASH> 100755
--- a/fctx-compiler.js
+++ b/fctx-compiler.js
@@ -175,10 +175,9 @@ function packFont(font) {
/* Pack the glyph table. */
packedGlyphTable = new Buffer(6 * glyphCount);
glyphTable.reduce(function (offset, glyph, index) {
- var horizAdvX = Math.floor(glyph.horizAdvX * metadata.emScale * 16 + 0.5);
packedGlyphTable.writeUIntLE(glyph.pathDataOffset, offset + 0, 2);
packedGlyphTable.writeUIntLE(glyph.pathData.length, offset + 2, 2);
- packedGlyphTable.writeUIntLE(horizAdvX, offset + 4, 2);
+ packedGlyphTable.writeUIntLE(glyph.horizAdvX, offset + 4, 2);
return offset + 6;
}, 0);
|
Removed extra scale factor being applied to horizontal advance.
|
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index <HASH>..<HASH> 100644
--- a/core/SettingsPiwik.php
+++ b/core/SettingsPiwik.php
@@ -198,7 +198,7 @@ class SettingsPiwik
// if URL changes, always update the cache
|| $currentUrl != $url
) {
- $host = Url::getHostFromUrl($url);
+ $host = Url::getHostFromUrl($currentUrl);
if (strlen($currentUrl) >= strlen('http://a/')
&& !Url::isLocalHost($host)) {
|
Improve detection of piwik/matomo URL (#<I>)
refs a couple of issues I think. Eg <URL>. If it checked whether the actual host is a local host, it would have updated it.
|
diff --git a/lib/html_mockup/rack/html_mockup.rb b/lib/html_mockup/rack/html_mockup.rb
index <HASH>..<HASH> 100644
--- a/lib/html_mockup/rack/html_mockup.rb
+++ b/lib/html_mockup/rack/html_mockup.rb
@@ -31,12 +31,21 @@ module HtmlMockup
if template_path = search_files.find{|p| File.exist?(p)}
env["rack.errors"].puts "Rendering template #{template_path.inspect} (#{path.inspect})"
- templ = ::HtmlMockup::Template.open(template_path, :partial_path => @partial_path)
- resp = ::Rack::Response.new do |res|
- res.status = 200
- res.write templ.render
+ begin
+ templ = ::HtmlMockup::Template.open(template_path, :partial_path => @partial_path)
+ resp = ::Rack::Response.new do |res|
+ res.status = 200
+ res.write templ.render
+ end
+ resp.finish
+ rescue StandardError => e
+ env["rack.errors"].puts " #{e.message}"
+ resp = ::Rack::Response.new do |res|
+ res.status = 500
+ res.write "An error occurred"
+ end
+ resp.finish
end
- resp.finish
else
env["rack.errors"].puts "Invoking file handler for #{path.inspect}"
@file_server.call(env)
|
Log exceptions and render "An error has occured" with status <I>.
|
diff --git a/Auth/OpenID/Server.php b/Auth/OpenID/Server.php
index <HASH>..<HASH> 100644
--- a/Auth/OpenID/Server.php
+++ b/Auth/OpenID/Server.php
@@ -182,8 +182,8 @@ class Auth_OpenID_ServerError {
}
return Auth_OpenID::appendArgs($return_to,
- array('openid.mode' => 'error',
- 'error' => $this->toString()));
+ array('openid.mode' => 'error',
+ 'openid.error' => $this->toString()));
}
/**
diff --git a/Tests/Auth/OpenID/Server.php b/Tests/Auth/OpenID/Server.php
index <HASH>..<HASH> 100644
--- a/Tests/Auth/OpenID/Server.php
+++ b/Tests/Auth/OpenID/Server.php
@@ -46,7 +46,7 @@ class Tests_Auth_OpenID_Test_ServerError extends PHPUnit_TestCase {
$this->assertTrue($e->hasReturnTo());
$expected_args = array(
'openid.mode' => 'error',
- 'error' => 'plucky');
+ 'openid.error' => 'plucky');
$encoded = $e->encodeToURL();
if (_isError($encoded)) {
|
[project @ BUGFIX: Fixed error reporting in server request encoding]
|
diff --git a/addr.go b/addr.go
index <HASH>..<HASH> 100644
--- a/addr.go
+++ b/addr.go
@@ -44,6 +44,18 @@ func init() {
SupportedTransportProtocols = transports
}
+// AddTransport adds a transport protocol combination to the list of supported transports
+func AddTransport(s string) error {
+ t, err := ma.ProtocolsWithString(s)
+ if err != nil {
+ return err
+ }
+
+ SupportedTransportStrings = append(SupportedTransportStrings, s)
+ SupportedTransportProtocols = append(SupportedTransportProtocols, t)
+ return nil
+}
+
// FilterAddrs is a filter that removes certain addresses, according the given filters.
// if all filters return true, the address is kept.
func FilterAddrs(a []ma.Multiaddr, filters ...func(ma.Multiaddr) bool) []ma.Multiaddr {
|
AddTransport: dynamically extend supported transport protocols
Necessary to implement a Transport in go-libp2p-circuit.
|
diff --git a/integration/commands_test.go b/integration/commands_test.go
index <HASH>..<HASH> 100644
--- a/integration/commands_test.go
+++ b/integration/commands_test.go
@@ -5,6 +5,7 @@ import (
"fmt"
"github.com/dotcloud/docker"
"github.com/dotcloud/docker/engine"
+ "github.com/dotcloud/docker/term"
"github.com/dotcloud/docker/utils"
"io"
"io/ioutil"
@@ -507,6 +508,17 @@ func TestAttachDetach(t *testing.T) {
<-ch
})
+ pty, err := container.GetPtyMaster()
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ state, err := term.MakeRaw(pty.Fd())
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer term.RestoreTerminal(pty.Fd(), state)
+
stdin, stdinPipe = io.Pipe()
stdout, stdoutPipe = io.Pipe()
cli = docker.NewDockerCli(stdin, stdoutPipe, ioutil.Discard, testDaemonProto, testDaemonAddr)
|
Make the PTY in raw mode before assert test (TestAttachDetach)
|
diff --git a/printer.go b/printer.go
index <HASH>..<HASH> 100644
--- a/printer.go
+++ b/printer.go
@@ -19,6 +19,8 @@ var (
// If the length of array or slice is larger than this,
// the buffer will be shorten as {...}.
BufferFoldThreshold = 1024
+ // PrintMapTypes when set to true will have map types will always appended to maps.
+ PrintMapTypes = true
)
func format(object interface{}) string {
@@ -155,7 +157,11 @@ func (p *printer) printMap() {
}
p.visited[p.value.Pointer()] = true
- p.printf("%s{", p.typeString())
+ if PrintMapTypes {
+ p.printf("%s{", p.typeString())
+ } else {
+ p.println("{")
+ }
p.indented(func() {
keys := p.value.MapKeys()
for i := 0; i < p.value.Len(); i++ {
|
Use a variable to decide whether or not maps types are printed.
|
diff --git a/src/sap.ui.commons/src/sap/ui/commons/Callout.js b/src/sap.ui.commons/src/sap/ui/commons/Callout.js
index <HASH>..<HASH> 100644
--- a/src/sap.ui.commons/src/sap/ui/commons/Callout.js
+++ b/src/sap.ui.commons/src/sap/ui/commons/Callout.js
@@ -24,7 +24,7 @@ sap.ui.define(['./CalloutBase', './library', './CalloutRenderer'],
*
* @constructor
* @public
- * @deprecated Since version 1.38. Tf you want to achieve a similar behavior, use a <code>sap.m.Popover</code> control and open it next to your control.
+ * @deprecated Since version 1.38. If you want to achieve a similar behavior, use a <code>sap.m.Popover</code> control and open it next to your control.
* @alias sap.ui.commons.Callout
* @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
*/
|
[INTERNAL] sap.ui.commons.Callout: Documentation updated
- There was a typo in the documentation.
JIRA: BGSOFUIRILA-<I>
Change-Id: Ib0fd1aca<I>a5c<I>d<I>c<I>e<I>dd<I>f<I>
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -152,7 +152,10 @@ module.exports = function (grunt) {
dest: './axe.min.js'
}],
options: {
- preserveComments: 'some',
+ preserveComments: function(node, comment) {
+ // preserve comments that start with a bang
+ return /^!/.test( comment.value );
+ },
mangle: {
except: ['commons', 'utils', 'axe', 'window', 'document']
}
|
Fix preserveComments in uglify which was not removing any comments
|
diff --git a/e2e/init.js b/e2e/init.js
index <HASH>..<HASH> 100644
--- a/e2e/init.js
+++ b/e2e/init.js
@@ -11,9 +11,11 @@ after(async () => {
await detox.cleanup();
});
-// Temporary solution, #2809
function disableAndroidEmulatorAnimations() {
- exec.execAsync(`adb shell settings put global window_animation_scale 0.0`);
- exec.execAsync(`adb shell settings put global transition_animation_scale 0.0`);
- exec.execAsync(`adb shell settings put global animator_duration_scale 0.0`);
+ if (device.getPlatform() === 'android') {
+ const deviceId = device._deviceId;
+ exec.execAsync(`adb -s ${deviceId} shell settings put global window_animation_scale 0.0`);
+ exec.execAsync(`adb -s ${deviceId} shell settings put global transition_animation_scale 0.0`);
+ exec.execAsync(`adb -s ${deviceId} shell settings put global animator_duration_scale 0.0`);
+ }
}
|
send adb command only to device under tests
|
diff --git a/pycpfcnpj/cpfcnpj.py b/pycpfcnpj/cpfcnpj.py
index <HASH>..<HASH> 100644
--- a/pycpfcnpj/cpfcnpj.py
+++ b/pycpfcnpj/cpfcnpj.py
@@ -1,5 +1,4 @@
-import string
-
+from .compatible import clear_punctuation
from . import cpf
from . import cnpj
@@ -17,7 +16,7 @@ def validate(number):
with the right size of these numbers.
"""
- clean_number = number.translate(str.maketrans("", "", string.punctuation))
+ clean_number = clear_punctuation(number)
if len(clean_number) == 11:
return cpf.validate(clean_number)
|
Use clean_number function in cpfcnpj
|
diff --git a/blueprints/ember-frost-tabs/index.js b/blueprints/ember-frost-tabs/index.js
index <HASH>..<HASH> 100644
--- a/blueprints/ember-frost-tabs/index.js
+++ b/blueprints/ember-frost-tabs/index.js
@@ -11,7 +11,8 @@ module.exports = {
afterInstall: function () {
return this.addAddonsToProject({
packages: [
- {name: 'ember-frost-core', target: '^0.29.0'}
+ {name: 'ember-frost-core', target: '^0.29.0'},
+ {name: 'ember-simple-uuid', target: '0.1.4'}
]
})
}
|
Add ember-simple-uuid to blueprint
|
diff --git a/cmd/bbs/main.go b/cmd/bbs/main.go
index <HASH>..<HASH> 100644
--- a/cmd/bbs/main.go
+++ b/cmd/bbs/main.go
@@ -160,6 +160,12 @@ var databaseConnectionString = flag.String(
"SQL database connection string",
)
+var maxDatabaseConnections = flag.Int(
+ "maxDatabaseConnections",
+ 200,
+ "Max numbers of SQL database connections",
+)
+
var databaseDriver = flag.String(
"databaseDriver",
"mysql",
@@ -238,6 +244,7 @@ func main() {
if err != nil {
logger.Fatal("failed-to-open-sql", err)
}
+ sqlConn.SetMaxOpenConns(*maxDatabaseConnections)
err = sqlConn.Ping()
if err != nil {
|
Allow BBS to be configured a max number of SQL connections
[#<I>]
|
diff --git a/railties/configs/routes.rb b/railties/configs/routes.rb
index <HASH>..<HASH> 100644
--- a/railties/configs/routes.rb
+++ b/railties/configs/routes.rb
@@ -37,7 +37,7 @@ ActionController::Routing::Routes.draw do |map|
# Install the default routes as the lowest priority.
# Note: These default routes make all actions in every controller accessible via GET requests. You should
- # consider removing the them or commenting them out if you're using named routes and resources.
+ # consider removing or commenting them out if you're using named routes and resources.
map.connect ':controller/:action/:id'
map.connect ':controller/:action/:id.:format'
end
|
Fix typo in the generated routes.rb [#<I> state:resolved]
|
diff --git a/lib/middleware/vhost.js b/lib/middleware/vhost.js
index <HASH>..<HASH> 100644
--- a/lib/middleware/vhost.js
+++ b/lib/middleware/vhost.js
@@ -17,9 +17,9 @@ module.exports = () =>
if (bucket) {
ctx.path = `/${bucket}${ctx.path}`;
}
- } else if (ctx.hostname !== "localhost" && !net.isIP(ctx.hostname)) {
+ } else if (!net.isIP(ctx.hostname) && ctx.hostname !== "localhost") {
// otherwise attempt to distinguish virtual host-style requests
- ctx.path = `/${bucket}${ctx.path}`;
+ ctx.path = `/${ctx.hostname}${ctx.path}`;
}
return next();
|
fix(vhost): actually support specifying buckets via hostname
|
diff --git a/js/jqPagination.jquery.js b/js/jqPagination.jquery.js
index <HASH>..<HASH> 100644
--- a/js/jqPagination.jquery.js
+++ b/js/jqPagination.jquery.js
@@ -65,8 +65,13 @@ http://dribbble.com/shots/59234-Pagination-for-upcoming-blog-
});
base.$el.find('a').live('click', function (event) {
- event.preventDefault();
- base.setPage($(this).data('action'));
+
+ // for mac + windows (read: other), maintain the cmd + ctrl click for new tab
+ if (!event.metaKey && !event.ctrlKey) {
+ event.preventDefault();
+ base.setPage($(this).data('action'));
+ }
+
});
};
|
Allow cmd/ctrl click on paging links to open new tab/window
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -229,6 +229,7 @@ extension_phono3py = Extension(
packages_phono3py = ['phono3py',
'phono3py.cui',
+ 'phono3py.interface',
'phono3py.other',
'phono3py.phonon',
'phono3py.phonon3']
|
Fix setup.py to add phono3py.interface as module.
|
diff --git a/src/Field.php b/src/Field.php
index <HASH>..<HASH> 100644
--- a/src/Field.php
+++ b/src/Field.php
@@ -484,9 +484,9 @@ class Field implements Expressionable
*/
public function isEditable()
{
- return isset($this->ui['editable'])? $this->ui['editable']
- :($this->read_only || $this->never_persist) ? false
- : !$this->system;
+ return isset($this->ui['editable']) ? $this->ui['editable']
+ : ($this->read_only || $this->never_persist) ? false
+ : !$this->system;
}
/**
|
Apply fixes from StyleCI (#<I>)
|
diff --git a/Tests/Unit/Client/ConnectionTest.php b/Tests/Unit/Client/ConnectionTest.php
index <HASH>..<HASH> 100644
--- a/Tests/Unit/Client/ConnectionTest.php
+++ b/Tests/Unit/Client/ConnectionTest.php
@@ -328,6 +328,32 @@ class ConnectionTest extends \PHPUnit_Framework_TestCase
}
/**
+ * Tests if exception is thrown while validating warmers.
+ *
+ * @expectedException \RuntimeException
+ * @expectedExceptionMessage Warmer(s) named bar do not exist. Available: foo
+ */
+ public function testValidateWarmersException()
+ {
+ $warmerMock = $this->getMock('ONGR\ElasticsearchBundle\Cache\WarmerInterface');
+ $warmerMock
+ ->expects($this->once())
+ ->method('warmUp');
+ $warmerMock
+ ->expects($this->once())
+ ->method('getName')
+ ->will($this->returnValue('foo'));
+
+ $connection = new Connection($this->getClient(), []);
+ $connection->addWarmer($warmerMock);
+
+ $object = new \ReflectionObject($connection);
+ $method = $object->getMethod('validateWarmers');
+ $method->setAccessible(true);
+ $method->invokeArgs($connection, [['bar']]);
+ }
+
+ /**
* Tests Connection#setIndexName method.
*/
public function testSetIndexName()
|
added Connection#validateWarmers test when exception is thrown
|
diff --git a/src/main/java/com/github/noraui/application/steps/ScreenSteps.java b/src/main/java/com/github/noraui/application/steps/ScreenSteps.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/github/noraui/application/steps/ScreenSteps.java
+++ b/src/main/java/com/github/noraui/application/steps/ScreenSteps.java
@@ -142,7 +142,7 @@ public class ScreenSteps extends Step {
@Conditioned
@Et("Je défile vers {string}(\\?)")
@And("I scroll to {string}(\\?)")
- public void scrollIntoView(PageElement pageElement, List<GherkinStepCondition> conditions) throws TechnicalException {
+ public void scrollIntoView(PageElement pageElement, List<GherkinStepCondition> conditions) {
log.debug("I scroll to [{}]", pageElement);
screenService.scrollIntoView(Wait.until(ExpectedConditions.presenceOfElementLocated(Utilities.getLocator(pageElement))));
}
|
Sonar: "throws" declarations should not be superfluous
|
diff --git a/web/concrete/js/build/core/style-customizer/inline-toolbar.js b/web/concrete/js/build/core/style-customizer/inline-toolbar.js
index <HASH>..<HASH> 100644
--- a/web/concrete/js/build/core/style-customizer/inline-toolbar.js
+++ b/web/concrete/js/build/core/style-customizer/inline-toolbar.js
@@ -114,9 +114,6 @@
arEnableGridContainer = area.getEnableGridContainer() ? 1 : 0,
action = CCM_DISPATCHER_FILENAME + '/ccm/system/block/render';
- if (block.getId() != parseInt(resp.bID)) {
- block.id = parseInt(resp.bID);
- }
$.get(action, {
arHandle: area.getHandle(),
cID: resp.cID,
|
Remove unneeded assignment
Former-commit-id: 1c<I>f<I>bb<I>b<I>c<I>a<I>c<I>c<I>e
|
diff --git a/src/MarkupTranslator/Translators/Github.php b/src/MarkupTranslator/Translators/Github.php
index <HASH>..<HASH> 100644
--- a/src/MarkupTranslator/Translators/Github.php
+++ b/src/MarkupTranslator/Translators/Github.php
@@ -199,7 +199,7 @@ class Github extends Base
}
protected function addHorizontalRule() {
- $this->startElement('hr');
+ $this->startElement(self::NODE_HR);
return $this->endElement();
}
}
|
used class constant instead of hardcoded string
|
diff --git a/FeatureContext.php b/FeatureContext.php
index <HASH>..<HASH> 100644
--- a/FeatureContext.php
+++ b/FeatureContext.php
@@ -12,13 +12,6 @@ use Symfony\Component\Process\Process;
require 'vendor/autoload.php';
-//
-// Require 3rd-party libraries here:
-//
-// require_once 'PHPUnit/Autoload.php';
-// require_once 'PHPUnit/Framework/Assert/Functions.php';
-//
-
/**
* Features context.
*/
|
Removing placeholder comment to require libraries that aren't currently being used.
|
diff --git a/clients/web/test/spec/groupSpec.js b/clients/web/test/spec/groupSpec.js
index <HASH>..<HASH> 100644
--- a/clients/web/test/spec/groupSpec.js
+++ b/clients/web/test/spec/groupSpec.js
@@ -48,6 +48,14 @@ describe('Test group actions', function () {
waitsFor(function () {
return Backbone.history.fragment.slice(-18) === '/roles?dialog=edit';
}, 'the url state to change');
+
+ waitsFor(function () {
+ return $('a.btn-default').text() === 'Cancel';
+ }, 'the cancel button to appear');
+
+ runs(function () {
+ $('a.btn-default').click();
+ });
});
it('go back to groups page', girderTest.goToGroupsPage());
|
Closing the group edit dialog in the test.
|
diff --git a/taxonomy/scripts/taxomatic.py b/taxonomy/scripts/taxomatic.py
index <HASH>..<HASH> 100644
--- a/taxonomy/scripts/taxomatic.py
+++ b/taxonomy/scripts/taxomatic.py
@@ -60,6 +60,8 @@ log = logging
import Taxonomy
from Taxonomy.package import manifest_name, package_contents, write_config
+from Taxonomy import __version__
+
class SimpleHelpFormatter(IndentedHelpFormatter):
"""Format help with indented section bodies.
@@ -118,7 +120,7 @@ def main():
sys.exit(1)
parser = OptionParser(usage='',
- version="$Id$",
+ version=__version__,
formatter=SimpleHelpFormatter())
parser.set_defaults(
|
brought __version__ into taxonomy.py, so --version flag will work. --version still requires a subcommand such as create, which will get fixed in a later commit.
|
diff --git a/pycbc/ahope/coincidence_utils.py b/pycbc/ahope/coincidence_utils.py
index <HASH>..<HASH> 100644
--- a/pycbc/ahope/coincidence_utils.py
+++ b/pycbc/ahope/coincidence_utils.py
@@ -162,7 +162,10 @@ def setup_coincidence_workflow_ligolw_thinca(workflow, science_segs, segsDict,
ligolwAddOuts : ahope.AhopeFileList
A list of the output files generated from ligolw_add.
"""
+ # FIXME: Order of ifoList is not necessarily H1L1V1
+ # FIXME: eg. full analysis segment of 968976015-969062415 gives "V1H1L1"
ifoList = science_segs.keys()
+ ifoList.sort(key=str.lower)
ifoString = ''.join(ifoList)
veto_categories = range(1,maxVetoCat+1)
|
Added a FIXME to coincidence_utils.py in ahope. The ifoString
was not necessarily ordered "H1L1V1" (eg. got "V1H1L1"). The
FIXME sorts ifos alphabetically and then creates the ifoString.
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,8 +1,11 @@
import createReducer from './createReducer'
-import { createAction, createReducerAction} from './createAction'
+import {
+ createAction
+ // createReducerAction
+} from './createAction'
export {
createReducer,
- createAction,
- createReducerAction
+ createAction
+ // createReducerAction
}
diff --git a/test/createReducerAction.js b/test/createReducerAction.js
index <HASH>..<HASH> 100644
--- a/test/createReducerAction.js
+++ b/test/createReducerAction.js
@@ -1,4 +1,5 @@
-import { createReducer, createReducerAction } from '../src'
+import { createReducer } from '../src'
+import { createReducerAction } from '../src/createAction'
import assert from 'assert'
const emulateState = (initialState, action) => {
|
chore: hide undocumented function
|
diff --git a/scrubadub/detectors/spacy.py b/scrubadub/detectors/spacy.py
index <HASH>..<HASH> 100644
--- a/scrubadub/detectors/spacy.py
+++ b/scrubadub/detectors/spacy.py
@@ -32,12 +32,12 @@ class SpacyEntityDetector(Detector):
>>> import scrubadub, scrubadub.detectors.spacy
>>> class MoneyFilth(scrubadub.filth.Filth):
- >>> type = 'money'
+ ... type = 'money'
>>> scrubadub.detectors.spacy.SpacyEntityDetector.filth_cls_map['MONEY'] = MoneyFilth
>>> detector = scrubadub.detectors.spacy.SpacyEntityDetector(named_entities=['MONEY'])
>>> scrubber = scrubadub.Scrubber(detector_list=[detector])
>>> scrubber.clean("You owe me 12 dollars man!")
- "You owe me {{MONEY}} man!"
+ 'You owe me {{MONEY}} man!'
The dictonary ``scrubadub.detectors.spacy.SpacyEntityDetector.filth_cls_map`` is used to map between the spaCy
named entity label and the type of scrubadub ``Filth``, while the ``named_entities`` argument sets which named
|
fix doc test so that it passes
|
diff --git a/yotta/lib/target.py b/yotta/lib/target.py
index <HASH>..<HASH> 100644
--- a/yotta/lib/target.py
+++ b/yotta/lib/target.py
@@ -65,6 +65,8 @@ class Target(pack.Pack):
build_type = ((None, 'Debug'), ('Release', 'RelWithDebInfo'))[release_build][debug_build]
if build_type:
commands.append(['cmake', '-D', 'CMAKE_BUILD_TYPE=%s' % build_type, '.'])
+ else:
+ commands.append(['cmake', '.'])
commands.append(['make'])
for cmd in commands:
child = subprocess.Popen(
|
fix building when no build type is set
|
diff --git a/lib/active_record/connection_adapters/h2_adapter.rb b/lib/active_record/connection_adapters/h2_adapter.rb
index <HASH>..<HASH> 100644
--- a/lib/active_record/connection_adapters/h2_adapter.rb
+++ b/lib/active_record/connection_adapters/h2_adapter.rb
@@ -1 +1,13 @@
-require 'active_record/connection_adapters/jdbc_adapter'
\ No newline at end of file
+tried_gem = false
+begin
+ require "jdbc/h2"
+rescue LoadError
+ unless tried_gem
+ require 'rubygems'
+ gem "jdbc-h2"
+ tried_gem = true
+ retry
+ end
+ # trust that the hsqldb jar is already present
+end
+require 'active_record/connection_adapters/jdbc_adapter'
|
Needed this to get h2 to load properly form simple script (w/o gem installed)
|
diff --git a/smartmin/users/views.py b/smartmin/users/views.py
index <HASH>..<HASH> 100644
--- a/smartmin/users/views.py
+++ b/smartmin/users/views.py
@@ -234,8 +234,14 @@ class UserCRUDL(SmartCRUDL):
def form_valid(self, form):
email = form.cleaned_data['email']
- hostname = getattr(settings, 'HOSTNAME', 'hostname')
- from_email = getattr(settings, 'DEFAULT_FROM_EMAIL', 'user@hostname')
+ hostname = getattr(settings, 'HOSTNAME', self.request.get_host())
+
+ col_index = hostname.find(':')
+ if col_index > 0:
+ domain = hostname[:col_index]
+
+ from_email = getattr(settings, 'DEFAULT_FROM_EMAIL', 'website@%s' % domain)
+
protocol = 'https' if self.request.is_secure() else 'http'
user = User.objects.filter(email=email)
|
better defaults for hostname for password resets
|
diff --git a/pylint_plugin_utils/__init__.py b/pylint_plugin_utils/__init__.py
index <HASH>..<HASH> 100644
--- a/pylint_plugin_utils/__init__.py
+++ b/pylint_plugin_utils/__init__.py
@@ -1,8 +1,8 @@
import sys
try:
- from pylint.utils import UnknownMessage
+ from pylint.exceptions import UnknownMessageError as UnknownMessage
except ImportError:
- from pylint.utils import UnknownMessageError as UnknownMessage
+ from pylint.exceptions import UnknownMessage
def get_class(module_name, kls):
|
Import exception from pylint.exceptions instead of utils
Also tries to use the newer name (already over three years old) first.
Fixes PyCQA/pylint-plugin-utils#<I>
|
diff --git a/spec/schema_dumper_spec.rb b/spec/schema_dumper_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/schema_dumper_spec.rb
+++ b/spec/schema_dumper_spec.rb
@@ -46,7 +46,7 @@ describe "schema dumping" do
end
end
- context "without schema.rb" do
+ context "with schema.rb" do
before do
ActiveRecord::SchemaDumper.previous_schema = dump_schema
end
|
spec: fix typo in group description
|
diff --git a/app/controllers/wafflemix/contact_forms_controller.rb b/app/controllers/wafflemix/contact_forms_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/wafflemix/contact_forms_controller.rb
+++ b/app/controllers/wafflemix/contact_forms_controller.rb
@@ -3,22 +3,22 @@ require_dependency "wafflemix/application_controller"
module Wafflemix
class ContactFormsController < ApplicationController
+ before_filter :find_page
+
def show
@contact_form = ContactForm.find(params[:id])
- @page = Page.find_by_link_url('contact-us')
respond_to do |format|
- format.html # show.html.erb
+ format.html
format.json { render json: @contact_form }
end
end
def new
@contact_form = ContactForm.new
- @page = Page.find_by_link_url('contact-us')
respond_to do |format|
- format.html # new.html.erb
+ format.html
format.json { render json: @contact_form }
end
end
@@ -37,5 +37,11 @@ module Wafflemix
end
end
+ private
+
+ def find_page
+ @page = Page.find_by_link_url('contact-us')
+ end
+
end
end
|
Give create access to the contact page for validations.
|
diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_dispatch/journey/router.rb
+++ b/actionpack/lib/action_dispatch/journey/router.rb
@@ -1,4 +1,3 @@
-require 'action_dispatch/journey/core-ext/hash'
require 'action_dispatch/journey/router/utils'
require 'action_dispatch/journey/router/strexp'
require 'action_dispatch/journey/routes'
|
Remove obsolete Hash extension needed for Ruby <I>.x support
[ci skip]
|
diff --git a/Net/OpenID/DiffieHellman.php b/Net/OpenID/DiffieHellman.php
index <HASH>..<HASH> 100644
--- a/Net/OpenID/DiffieHellman.php
+++ b/Net/OpenID/DiffieHellman.php
@@ -56,13 +56,6 @@ class Net_OpenID_DiffieHellman {
E_USER_ERROR);
}
- if ($this->lib->type == 'dumb') {
- trigger_error("No usable big integer library present ".
- "(gmp or bcmath). Use of this math library wrapper".
- "is not permitted without big integer support.",
- E_USER_ERROR);
- }
-
if ($mod === null) {
$this->mod = $this->lib->init($_Net_OpenID_DEFAULT_MOD);
} else {
|
[project @ Do not check for dumb math library in DiffieHellman module, since that's never instantiated now.]
|
diff --git a/test/attributes/attributeforinstanceof.js b/test/attributes/attributeforinstanceof.js
index <HASH>..<HASH> 100644
--- a/test/attributes/attributeforinstanceof.js
+++ b/test/attributes/attributeforinstanceof.js
@@ -19,7 +19,7 @@ describe("attributes/attributeforinstanceof", function () {
var exceptionCaught;
try {
var attribute = new gpf.attributes.AttributeForInstanceOf();
- assert(attribute);
+ throw new Error(attribute.toString());
} catch (e) {
exceptionCaught = e;
}
@@ -30,7 +30,7 @@ describe("attributes/attributeforinstanceof", function () {
var exceptionCaught;
try {
var attribute = new gpf.attributes.AttributeForInstanceOf(0);
- assert(attribute);
+ throw new Error(attribute.toString());
} catch (e) {
exceptionCaught = e;
}
|
Fixes DeepScan error (#<I>)
|
diff --git a/symbol/typedecl.py b/symbol/typedecl.py
index <HASH>..<HASH> 100644
--- a/symbol/typedecl.py
+++ b/symbol/typedecl.py
@@ -9,7 +9,7 @@
# the GNU General License
# ----------------------------------------------------------------------
-from api.constants import TYPE_SIZES
+from api.constants import TYPE
from symbol import Symbol
@@ -23,6 +23,15 @@ class SymbolTYPEDECL(Symbol):
'''
Symbol.__init__(self)
self.type_ = type_
- self.size = TYPE_SIZES[self.type_]
self.lineno = lineno
self.implicit = implicit
+
+ @property
+ def size(self):
+ return TYPE.size(self.type_)
+
+ def __str__(self):
+ return TYPE.to_string(self.type_)
+
+ def __repr__(self):
+ return "%s(%s)" % (self.token, str(self))
|
Refact: uses TYPE constants.
__str__() and __repr__() defined.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -7,7 +7,10 @@ module.exports = {
included: function(app) {
this._super.included(app);
- app.import(app.bowerDirectory + '/remodal/dist/remodal.js');
+ if (!process.env.EMBER_CLI_FASTBOOT) {
+ app.import(app.bowerDirectory + '/remodal/dist/remodal.js');
+ }
+
app.import(app.bowerDirectory + '/remodal/dist/remodal.css');
app.import(app.bowerDirectory + '/remodal/dist/remodal-default-theme.css');
app.import('vendor/style.css');
|
don't load remodal if EMBER_CLI_FASTBOOT is true
|
diff --git a/src/org/protege/xmlcatalog/XMLCatalog.java b/src/org/protege/xmlcatalog/XMLCatalog.java
index <HASH>..<HASH> 100644
--- a/src/org/protege/xmlcatalog/XMLCatalog.java
+++ b/src/org/protege/xmlcatalog/XMLCatalog.java
@@ -65,4 +65,10 @@ public class XMLCatalog implements XmlBaseContext {
public void removeEntry(Entry e) {
entries.remove(e);
}
+
+ public void replaceEntry(Entry original, Entry changed) {
+ int i = entries.indexOf(original);
+ entries.remove(original);
+ entries.add(i, changed);
+ }
}
|
added a replace entry method so the list ordercan be maintained.
|
diff --git a/plugin/geomajas-plugin-staticsecurity/staticsecurity/src/main/java/org/geomajas/plugin/staticsecurity/command/staticsecurity/LoginCommand.java b/plugin/geomajas-plugin-staticsecurity/staticsecurity/src/main/java/org/geomajas/plugin/staticsecurity/command/staticsecurity/LoginCommand.java
index <HASH>..<HASH> 100644
--- a/plugin/geomajas-plugin-staticsecurity/staticsecurity/src/main/java/org/geomajas/plugin/staticsecurity/command/staticsecurity/LoginCommand.java
+++ b/plugin/geomajas-plugin-staticsecurity/staticsecurity/src/main/java/org/geomajas/plugin/staticsecurity/command/staticsecurity/LoginCommand.java
@@ -50,6 +50,7 @@ import java.util.List;
* When comparing passwords, it assures that the base64 encoding padding is not required to be used.
*
* @author Joachim Van der Auwera
+ * @since 1.7.1
*/
@Api
@Component
|
MAJ-<I> add missing @Api declarations on layers
|
diff --git a/packages/blueprint/tests/lib/indexTest.js b/packages/blueprint/tests/lib/indexTest.js
index <HASH>..<HASH> 100644
--- a/packages/blueprint/tests/lib/indexTest.js
+++ b/packages/blueprint/tests/lib/indexTest.js
@@ -42,5 +42,9 @@ describe ('blueprint', function () {
expect (blueprint ('model://Person')).to.be.a.function;
expect (blueprint ('model://inner.TestModel2')).to.be.a.function;
});
+
+ it ('should resolve a controller in a module', function () {
+ expect (blueprint ('controller://test-module:ModuleTestController')).to.be.a.function;
+ });
});
});
\ No newline at end of file
|
Added test for resolving a module resource
|
diff --git a/lib/Doctrine/Connection.php b/lib/Doctrine/Connection.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/Connection.php
+++ b/lib/Doctrine/Connection.php
@@ -253,6 +253,19 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
}
/**
+ * setOption
+ *
+ * Set option value
+ *
+ * @param string $option
+ * @return void
+ */
+ public function setOption($option, $value)
+ {
+ return $this->options[$option] = $value;
+ }
+
+ /**
* getAttribute
* retrieves a database connection attribute
*
|
Merged r<I> to trunk
|
diff --git a/util.py b/util.py
index <HASH>..<HASH> 100644
--- a/util.py
+++ b/util.py
@@ -60,7 +60,7 @@ FixedLengthTypes = [
#
def java_name(type_name):
- return type_name.replace("_", "").replace("(", "").replace(")", "")
+ return "".join([capital(part) for part in type_name.replace("(", "").replace(")", "").split("_")])
def is_fixed_type(param):
|
capitalize type names that comes after underscore in the codec names (#<I>)
|
diff --git a/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardBondGenerator.java b/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardBondGenerator.java
index <HASH>..<HASH> 100644
--- a/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardBondGenerator.java
+++ b/display/renderbasic/src/main/java/org/openscience/cdk/renderer/generators/standard/StandardBondGenerator.java
@@ -53,7 +53,6 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Vector;
import static org.openscience.cdk.renderer.generators.standard.VecmathUtil.adjacentLength;
import static org.openscience.cdk.renderer.generators.standard.VecmathUtil.getNearestVector;
@@ -293,7 +292,7 @@ final class StandardBondGenerator {
final double adjacent = fromPoint.distance(toPoint);
// we subtract one due to fenceposts, this ensures the specified number
- // of hashed is drawn
+ // of hashed sections is drawn
final double step = adjacent / (hatchSections - 1);
final ElementGroup group = new ElementGroup();
|
Minor cleanup to documentation and an unused import.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ setup(
long_description=open('README').read(),
author='Baptiste Millou',
author_email='baptiste@smoothie-creative.com',
- url='https://github.com/Sheeprider/Py-BitBucket',
+ url='https://github.com/Sheeprider/BitBucket-api',
packages=['bitbucket'],
license=open('LICENSE').read(),
install_requires=['requests', ],
|
Renamed github repository name to match package name.
|
diff --git a/httpclient.go b/httpclient.go
index <HASH>..<HASH> 100644
--- a/httpclient.go
+++ b/httpclient.go
@@ -32,6 +32,7 @@ var (
NoRedirect = errors.New("No redirect")
TooManyRedirects = errors.New("stopped after 10 redirects")
+ NotModified = errors.New("Not modified")
)
//
@@ -179,6 +180,10 @@ func (r *HttpResponse) ResponseError() error {
}
}
+ if r.StatusCode == http.StatusNotModified {
+ return NotModified
+ }
+
return nil
}
|
On HTTP status <I> (Not Modified) return a NotModified error, since we are returning an empty body.
Note that for <I>/<I> we are not returning any error (we should) and we are not returning the location.
|
diff --git a/minio/helpers.py b/minio/helpers.py
index <HASH>..<HASH> 100644
--- a/minio/helpers.py
+++ b/minio/helpers.py
@@ -15,6 +15,7 @@ import cgi
import collections
import binascii
import hashlib
+import re
from .compat import compat_str_type, compat_pathname2url
@@ -54,8 +55,14 @@ def get_target_url(scheme, location, bucket=None, key=None, query=None):
def is_valid_bucket_name(name, input_string):
is_non_empty_string(name, input_string)
+ if len(input_string) < 3 or len(input_string) > 63:
+ raise ValueError(name)
if '/' in input_string:
raise ValueError(name)
+ if not re.match("^[a-z0-9]+[a-z0-9\-]*[a-z0-9]+$", name):
+ raise ValueError(name)
+ if re.match("/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/", name):
+ raise ValueError(name)
def is_non_empty_string(name, input_string):
|
is_valid_bucket_name now performs more tests. Fixes #<I>.
|
diff --git a/ui/plugins/controller.js b/ui/plugins/controller.js
index <HASH>..<HASH> 100644
--- a/ui/plugins/controller.js
+++ b/ui/plugins/controller.js
@@ -330,6 +330,7 @@ treeherder.controller('PluginCtrl', [
ThJobModel.retrigger($scope.repoName, job_id_list).then(function() {
// XXX: Remove this after 1134929 is resolved.
return ThJobDetailModel.getJobDetails({"title": "buildbot_request_id",
+ "repository": $scope.repoName,
"job_id__in": job_id_list.join(',')})
.then(function(data) {
var requestIdList = _.pluck(data, 'value');
|
Bug <I> - Pass the repository name to the API when retriggering
Since after bug <I>, retriggers error with:
"Unable to send retrigger: Must also filter on repository if filtering
on job id".
|
diff --git a/lib/connections/kcp_listen.go b/lib/connections/kcp_listen.go
index <HASH>..<HASH> 100644
--- a/lib/connections/kcp_listen.go
+++ b/lib/connections/kcp_listen.go
@@ -187,7 +187,6 @@ func (t *kcpListener) stunRenewal(listener net.PacketConn) {
client := stun.NewClientWithConnection(listener)
client.SetSoftwareName("syncthing")
- var uri url.URL
var natType stun.NATType
var extAddr *stun.Host
var err error
@@ -227,10 +226,12 @@ func (t *kcpListener) stunRenewal(listener net.PacketConn) {
for {
changed := false
- uri = *t.uri
+
+ uri := *t.uri
uri.Host = extAddr.TransportAddr()
t.mut.Lock()
+
if t.address == nil || t.address.String() != uri.String() {
l.Infof("%s resolved external address %s (via %s)", t.uri, uri.String(), addr)
t.address = &uri
|
lib/connections: Fix race (fixes #<I>)
|
diff --git a/sites/shared_conf.py b/sites/shared_conf.py
index <HASH>..<HASH> 100644
--- a/sites/shared_conf.py
+++ b/sites/shared_conf.py
@@ -8,6 +8,7 @@ import alabaster
# Alabaster theme + mini-extension
html_theme_path = [alabaster.get_path()]
extensions = ['alabaster', 'sphinx.ext.intersphinx']
+
# Paths relative to invoking conf.py - not this shared file
html_static_path = [join('..', '_shared_static')]
html_theme = 'alabaster'
@@ -19,6 +20,7 @@ html_theme_options = {
'github_user': 'fabric',
'github_repo': 'fabric',
'travis_button': True,
+ 'codecov_button': True,
'gittip_user': 'bitprophet',
'analytics_id': 'UA-18486793-1',
|
Added codecov button to website sidebar
|
diff --git a/spec/network/http/http_spec.rb b/spec/network/http/http_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/network/http/http_spec.rb
+++ b/spec/network/http/http_spec.rb
@@ -40,6 +40,12 @@ describe Network::HTTP do
Network::HTTP.proxy[:host].should == 'www.example.com'
Network::HTTP.proxy[:port].should == 9001
end
+
+ it "should raise a RuntimeError exception when given anything else" do
+ lambda {
+ Network::HTTP.proxy = 42
+ }.should raise_error(RuntimeError)
+ end
end
describe "expand_options" do
|
Added a spec for when Network::HTTP.proxy= receives a bad argument.
|
diff --git a/basis_set_exchange/bundle.py b/basis_set_exchange/bundle.py
index <HASH>..<HASH> 100644
--- a/basis_set_exchange/bundle.py
+++ b/basis_set_exchange/bundle.py
@@ -5,7 +5,6 @@ Functions for creating archives of all basis sets
import os
import zipfile
import tarfile
-import bz2
import io
from . import api, converters, refconverters
@@ -30,7 +29,6 @@ def _add_to_tbz(tfile, filename, data_str):
# Create a bytesio object for adding to a tarfile
# https://stackoverflow.com/a/52724508
encoded_data = data_str.encode('utf-8')
- data_len = len(encoded_data)
ti = tarfile.TarInfo(name=filename)
ti.size = len(encoded_data)
tfile.addfile(tarinfo=ti, fileobj=io.BytesIO(encoded_data))
@@ -147,5 +145,4 @@ def create_bundle(outfile, fmt, reffmt, archive_type=None, data_dir=None):
raise RuntimeError("Archive type '{}' is not valid. Must be one of: {}".format(
archive_type, ','.join(_valid_archive_types)))
- basis_names = api.get_all_basis_names()
_archive_handlers[archive_type](outfile, fmt, reffmt, data_dir)
|
Remove unused imports/variables
|
diff --git a/pipeline/storage.py b/pipeline/storage.py
index <HASH>..<HASH> 100644
--- a/pipeline/storage.py
+++ b/pipeline/storage.py
@@ -79,12 +79,6 @@ class GZIPMixin(object):
gzipped_path = self.save(gzipped_path, gzipped_file)
yield gzipped_path, gzipped_path, True
- def url(self, name, force=False):
- url = super(GZIPMixin, self).url(name, force)
- if matches_patterns(name, self.gzip_patterns):
- return "{0}.gz".format(url)
- return url
-
class NonPackagingMixin(object):
packing = False
|
Don't return .gz urls.
|
diff --git a/lib/between_meals/knife.rb b/lib/between_meals/knife.rb
index <HASH>..<HASH> 100755
--- a/lib/between_meals/knife.rb
+++ b/lib/between_meals/knife.rb
@@ -109,7 +109,7 @@ module BetweenMeals
cookbooks.each do |cb|
next unless File.exists?("#{path}/#{cb}")
@logger.warn("Running berkshelf on cookbook: #{cb}")
- exec!("cd #{path}/#{cb} && #{@berks} update #{berks_config} && " +
+ exec!("cd #{path}/#{cb} && #{@berks} install #{berks_config} && " +
"#{@berks} upload #{berks_config}", @logger)
end
end
|
remove need to include Berksfile.lock in git
- always run berks install if using berkshelf
|
diff --git a/lib/gh/remote.rb b/lib/gh/remote.rb
index <HASH>..<HASH> 100644
--- a/lib/gh/remote.rb
+++ b/lib/gh/remote.rb
@@ -27,9 +27,7 @@ module GH
@api_host = Addressable::URI.parse(api_host)
@headers = {
"User-Agent" => options[:user_agent] || "GH/#{GH::VERSION}",
- "Accept" => options[:accept] || "application/vnd.github.v3+json," \
- "application/vnd.github.beta+json;q=0.5," \
- "application/json;q=0.1",
+ "Accept" => options[:accept] || "application/vnd.github.v3+json",
"Accept-Charset" => "utf-8",
}
diff --git a/spec/custom_limit_spec.rb b/spec/custom_limit_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/custom_limit_spec.rb
+++ b/spec/custom_limit_spec.rb
@@ -9,7 +9,7 @@ describe GH::CustomLimit do
it 'adds client_id and client_secret to a request' do
headers = {
"User-Agent" => "GH/#{GH::VERSION}",
- "Accept" => "application/vnd.github.v3+json,application/vnd.github.beta+json;q=0.5,application/json;q=0.1",
+ "Accept" => "application/vnd.github.v3+json",
"Accept-Charset" => "utf-8"
}
|
Use a simple accept by default.
Same as octokit uses.
|
diff --git a/ck/repo/module/module/module.py b/ck/repo/module/module/module.py
index <HASH>..<HASH> 100644
--- a/ck/repo/module/module/module.py
+++ b/ck/repo/module/module/module.py
@@ -310,6 +310,13 @@ def show(i):
actions=lm.get('actions',{})
+ if lr=='default':
+ to_get=''
+ elif url.find('github.com/ctuning/')>0:
+ to_get='ck pull repo:'+lr
+ else:
+ to_get='ck pull repo --url='+url
+
###############################################################
if html:
h+=' <tr>\n'
@@ -348,8 +355,10 @@ def show(i):
ck.out('')
ck.out('=== '+ln+' ('+lr+') ===')
ck.out('')
- ck.out('Desc: '+ld+'<br>')
- ck.out('CK Repo URL: '+x)
+ ck.out('Desc: '+ld)
+ ck.out('<br>CK Repo URL: '+x)
+ if to_get!='':
+ ck.out('<br>How to get: <i>'+to_get+'</i>')
ck.out('')
if len(actions)>0:
|
improving module listing (with repo URL and all actions)
|
diff --git a/demo/src/index.js b/demo/src/index.js
index <HASH>..<HASH> 100644
--- a/demo/src/index.js
+++ b/demo/src/index.js
@@ -1,7 +1,5 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';
-import registerServiceWorker from './registerServiceWorker';
ReactDOM.render(<App />, document.getElementById('root'));
-registerServiceWorker();
|
Disable Service Workers (#<I>)
|
diff --git a/tests/basics/class_misc.py b/tests/basics/class_misc.py
index <HASH>..<HASH> 100644
--- a/tests/basics/class_misc.py
+++ b/tests/basics/class_misc.py
@@ -4,6 +4,6 @@ class C:
c = C()
try:
- d = bytearray(c)
+ d = bytes(c)
except TypeError:
print('TypeError')
diff --git a/tests/basics/subclass_native_buffer.py b/tests/basics/subclass_native_buffer.py
index <HASH>..<HASH> 100644
--- a/tests/basics/subclass_native_buffer.py
+++ b/tests/basics/subclass_native_buffer.py
@@ -12,5 +12,5 @@ print(b1 + b2)
print(b1 + b3)
print(b3 + b1)
-# bytearray construction will use the buffer protocol
-print(bytearray(b1))
+# bytes construction will use the buffer protocol
+print(bytes(b1))
|
tests/basics: Use bytes not bytearray when checking user buffer proto.
Using bytes will test the same path for the buffer protocol in
py/objtype.c.
|
diff --git a/salt/states/file.py b/salt/states/file.py
index <HASH>..<HASH> 100644
--- a/salt/states/file.py
+++ b/salt/states/file.py
@@ -1123,11 +1123,11 @@ def recurse(name,
keep = set()
vdir = set()
+ srcpath = source[7:]
for fn_ in __salt__['cp.list_master'](env):
if not fn_.strip():
continue
- srcpath = source[7:]
- if not fn_.startswith(srcpath):
+ if not fn_.startswith('{0}{1}'.format(srcpath, os.path.sep)):
continue
# fn_ here is the absolute source path of the file to copy from;
# it is either a normal file or an empty dir(if include_empty==true).
|
* fix bug: file.recurse state shoud treat source as dir
* 2 cents optimization: evaluate srcpath one time
|
diff --git a/commands/command_migrate.go b/commands/command_migrate.go
index <HASH>..<HASH> 100644
--- a/commands/command_migrate.go
+++ b/commands/command_migrate.go
@@ -249,7 +249,7 @@ func init() {
cmd.PersistentFlags().StringSliceVar(&migrateExcludeRefs, "exclude-ref", nil, "An explicit list of refs to exclude")
cmd.PersistentFlags().BoolVar(&migrateEverything, "everything", false, "Migrate all local references")
- cmd.PersistentPreRun = func(_ *cobra.Command, args []string) {
+ cmd.PersistentPreRun = func(_ *cobra.Command, args []string) {
// Initialize local storage before running any child
// subcommands, since migrations require lfs.TempDir to
// be initialized within ".git/lfs/objects".
@@ -260,6 +260,6 @@ func init() {
localstorage.InitStorageOrFail()
}
- cmd.AddCommand(importCmd, info)
+ cmd.AddCommand(importCmd, info)
})
}
|
commands/migrate: format incorrect indentation
|
diff --git a/uptick/info.py b/uptick/info.py
index <HASH>..<HASH> 100644
--- a/uptick/info.py
+++ b/uptick/info.py
@@ -83,7 +83,7 @@ def info(ctx, objects):
t.add_row([account])
click.echo(t)
else:
- click.echo("Public Key not known" % obj)
+ click.echo("Public Key not known: %s" % obj)
# Account name
elif re.match("^[a-zA-Z0-9\-\._]{2,64}$", obj):
|
[fix] minor issue when doing info with a nonexisting pubkey
|
diff --git a/grunt_tasks/plugin.js b/grunt_tasks/plugin.js
index <HASH>..<HASH> 100644
--- a/grunt_tasks/plugin.js
+++ b/grunt_tasks/plugin.js
@@ -28,6 +28,7 @@ module.exports = function (grunt) {
if (_.isString(plugins) && plugins) {
plugins = plugins.split(',');
} else if (!buildAll) {
+ fs.writeFileSync('clients/web/src/plugins.js', 'export {};');
return;
}
|
Reset plugins.js when no plugins are built
|
diff --git a/src/server/pachyderm_validation_test.go b/src/server/pachyderm_validation_test.go
index <HASH>..<HASH> 100644
--- a/src/server/pachyderm_validation_test.go
+++ b/src/server/pachyderm_validation_test.go
@@ -26,7 +26,7 @@ func TestInvalidCreatePipeline(t *testing.T) {
pipelineName := uniqueString("pipeline")
cmd := []string{"cp", path.Join("/pfs", dataRepo, "file"), "/pfs/out/file"}
- // Create pipeline named "out"
+ // Create pipeline with input named "out"
err := c.CreatePipeline(
pipelineName,
"",
@@ -57,22 +57,6 @@ func TestInvalidCreatePipeline(t *testing.T) {
)
require.YesError(t, err)
require.Matches(t, "glob", err.Error())
-
- // Create a pipeline with no cmd
- err = c.CreatePipeline(
- pipelineName,
- "",
- nil,
- nil,
- &pps.ParallelismSpec{
- Constant: 1,
- },
- client.NewAtomInputOpts("input", dataRepo, "", "/*", false, ""),
- "master",
- false,
- )
- require.YesError(t, err)
- require.Matches(t, "cmd", err.Error())
}
// Make sure that pipeline validation checks that all inputs exist
|
Remove a test for behavior that changed.
|
diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index <HASH>..<HASH> 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -169,7 +169,7 @@ class AutoRouterImproved implements AutoRouterInterface
);
// Ensure routes registered via $routes->cli() are not accessible via web.
- $this->protectDefinedCliRoutes();
+ $this->protectDefinedRoutes();
// Check _remao()
$this->checkRemap();
@@ -184,7 +184,7 @@ class AutoRouterImproved implements AutoRouterInterface
return [$this->directory, $this->controller, $this->method, $this->params];
}
- private function protectDefinedCliRoutes()
+ private function protectDefinedRoutes()
{
if ($this->httpVerb !== 'cli') {
$controller = strtolower($this->controller);
|
refactor: rename method name
|
diff --git a/app/lightblue/services/oad.js b/app/lightblue/services/oad.js
index <HASH>..<HASH> 100644
--- a/app/lightblue/services/oad.js
+++ b/app/lightblue/services/oad.js
@@ -59,6 +59,10 @@ class OADService extends BleService {
})
}
+ getName() {
+ return 'OAD Service'
+ }
+
setupNotifications() {
console.log('Setting up IDENTIFY and BLOCK notifications')
@@ -105,10 +109,6 @@ class OADService extends BleService {
this._registeredNotificationCallbacks[key].push(cb)
}
- getName() {
- return 'OAD Service'
- }
-
triggerIdentifyHeaderNotification() {
if (this._notificationsReady) {
this._writeZerosToIdentify()
diff --git a/app/lightblue/services/serial-transport.js b/app/lightblue/services/serial-transport.js
index <HASH>..<HASH> 100644
--- a/app/lightblue/services/serial-transport.js
+++ b/app/lightblue/services/serial-transport.js
@@ -18,7 +18,10 @@ class SerialTransportService extends BleService {
constructor(characteristics, nobleService) {
super(characteristics, nobleService)
- let x = 3
+ }
+
+ getName() {
+ return 'Serial Transport Service'
}
}
|
serial: add custom name to serial transport service
|
diff --git a/ceam_tests/util.py b/ceam_tests/util.py
index <HASH>..<HASH> 100644
--- a/ceam_tests/util.py
+++ b/ceam_tests/util.py
@@ -26,6 +26,7 @@ def setup_simulation(components, population_size = 100, start=datetime(1990, 1,
return simulation
def pump_simulation(simulation, time_step_days=30.5, duration=None, iterations=None, year_start=1990):
+ config.set('simulation_parameters', 'time_step', '{}'.format(time_step_days))
timestep = timedelta(days=time_step_days)
start_time = datetime(year_start, 1, 1)
simulation.current_time = start_time
@@ -33,7 +34,7 @@ def pump_simulation(simulation, time_step_days=30.5, duration=None, iterations=N
def should_stop():
if duration is not None:
- if simulation.current_time - start_time >= duration:
+ if simulation.current_time - start_time > duration:
return True
elif iterations is not None:
if iteration_count >= iterations:
@@ -116,7 +117,7 @@ def generate_test_population(event):
population['fractional_age'] = randomness.random('test_population_age', population.index) * 100
population['age'] = population['fractional_age'].astype(int)
- population['age'] = 0
+ population['age'] = 0.0
population['fractional_age'] = 0
population['sex'] = randomness.choice('test_population_sex', population.index, ['Male', 'Female'])
|
updated the duration code and made age variable a float
|
diff --git a/src/BigBlueButton.php b/src/BigBlueButton.php
index <HASH>..<HASH> 100644
--- a/src/BigBlueButton.php
+++ b/src/BigBlueButton.php
@@ -491,6 +491,7 @@ class BigBlueButton
throw new BadResponseException('Bad response, HTTP code: ' . $httpcode);
}
curl_close($ch);
+ unset($ch);
$cookies = file_get_contents($cookiefilepath);
if (strpos($cookies, 'JSESSIONID') !== false) {
|
Close Curl handle in php8
|
diff --git a/icalevents/icalparser.py b/icalevents/icalparser.py
index <HASH>..<HASH> 100644
--- a/icalevents/icalparser.py
+++ b/icalevents/icalparser.py
@@ -14,6 +14,8 @@ from icalendar import Calendar
from icalendar.prop import vDDDLists, vText
from pytz import timezone
+from icalendar.windows_to_olson import WINDOWS_TO_OLSON
+
def now():
"""
@@ -267,6 +269,9 @@ def parse_events(content, start=None, end=None, default_span=timedelta(days=7)):
# Keep track of the timezones defined in the calendar
timezones = {}
+ if 'X-WR-TIMEZONE' in calendar:
+ timezones[str(calendar['X-WR-TIMEZONE'])] = str(calendar['X-WR-TIMEZONE'])
+
for c in calendar.walk('VTIMEZONE'):
name = str(c['TZID'])
try:
@@ -282,6 +287,8 @@ def parse_events(content, start=None, end=None, default_span=timedelta(days=7)):
# assume it applies globally, otherwise UTC
if len(timezones) == 1:
cal_tz = gettz(list(timezones)[0])
+ if not cal_tz and timezone in WINDOWS_TO_OLSON:
+ cal_tz = gettz(WINDOWS_TO_OLSON[str(c['TZID'])])
else:
cal_tz = UTC
|
feat() uses ical tz translation for windows
|
diff --git a/nodeCacheModule.js b/nodeCacheModule.js
index <HASH>..<HASH> 100644
--- a/nodeCacheModule.js
+++ b/nodeCacheModule.js
@@ -136,11 +136,11 @@ function nodeCacheModule(config){
if(typeof keys === 'object'){
for(var i = 0; i < keys.length; i++){
var key = keys[i];
- refreshKeys[key] = undefined;
+ delete refreshKeys[key];
}
}
else{
- refreshKeys[keys] = undefined;
+ delete refreshKeys[keys];
}
} catch (err) {
log(true, 'Delete failed for cache of type ' + this.type, err);
|
Deleting rather than setting to undefined.
|
diff --git a/test/controllers/test-email-verification.js b/test/controllers/test-email-verification.js
index <HASH>..<HASH> 100644
--- a/test/controllers/test-email-verification.js
+++ b/test/controllers/test-email-verification.js
@@ -127,7 +127,7 @@ describe('email verification', function () {
request(expressApp)
.post(config.web.verifyEmail.uri)
.set('Accept', 'application/json')
- .expect(400, '{"status":400,"message":"login property cannot be null, empty, or blank."}', done);
+ .expect(400, '{"status":400,"message":"login property is required; it cannot be null, empty, or blank."}', done);
});
});
});
|
fix to match new error string for email verification flow
|
diff --git a/src/Controller/WidgetsController.php b/src/Controller/WidgetsController.php
index <HASH>..<HASH> 100644
--- a/src/Controller/WidgetsController.php
+++ b/src/Controller/WidgetsController.php
@@ -11,12 +11,8 @@
*/
namespace Search\Controller;
-use Cake\Core\Configure;
-use Cake\Event\Event;
-use Cake\Network\Exception\ForbiddenException;
use Cake\ORM\TableRegistry;
use Search\Controller\AppController;
-use Search\Model\Entity\Widget;
/**
* Widgets Controller
@@ -28,7 +24,7 @@ class WidgetsController extends AppController
/**
* Index Method
*
- * @return \Cake\Network\Response|null
+ * @return \Cake\Http\Response|void|null
*/
public function index()
{
|
Fixed coding style issues (task #<I>)
|
diff --git a/mqtt/packet/publish_test.go b/mqtt/packet/publish_test.go
index <HASH>..<HASH> 100644
--- a/mqtt/packet/publish_test.go
+++ b/mqtt/packet/publish_test.go
@@ -25,7 +25,7 @@ func Test_publish_setFixedHeader(t *testing.T) {
}
}
-func Test_setVariableHeader(t *testing.T) {
+func Test_publish_setVariableHeader(t *testing.T) {
p := &publish{
qos: mqtt.QoS1,
topicName: []byte("topicName"),
@@ -49,7 +49,7 @@ func Test_setVariableHeader(t *testing.T) {
}
}
-func Test_setPayload(t *testing.T) {
+func Test_publish_setPayload(t *testing.T) {
p := &publish{
message: []byte{0x00, 0x01},
}
@@ -60,3 +60,9 @@ func Test_setPayload(t *testing.T) {
t.Errorf("p.payload => %v, want => %v", p.payload, p.message)
}
}
+
+func TestNewPUBLISH_optsNil(t *testing.T) {
+ if _, err := NewPUBLISH(nil); err != nil {
+ nilErrorExpected(t, err)
+ }
+}
|
Update mqtt/packet/publish_test.go
|
diff --git a/view.go b/view.go
index <HASH>..<HASH> 100644
--- a/view.go
+++ b/view.go
@@ -282,7 +282,7 @@ func (v *View) DeleteFragment(slice uint64) error {
return ErrFragmentNotFound
}
- v.logger().Printf("delete fragment: %d", slice)
+ v.logger().Printf("delete fragment: (%s/%s/%s) %d", v.index, v.frame, v.name, slice)
// Close data files before deletion.
if err := fragment.Close(); err != nil {
|
add index/frame/view info to delete fragment log information
|
diff --git a/examples/measure-style.js b/examples/measure-style.js
index <HASH>..<HASH> 100644
--- a/examples/measure-style.js
+++ b/examples/measure-style.js
@@ -158,6 +158,8 @@ const source = new VectorSource();
const modify = new Modify({source: source, style: modifyStyle});
+let tipPoint;
+
function styleFunction(feature, segments, drawType, tip) {
const styles = [style];
const geometry = feature.getGeometry();
@@ -199,6 +201,7 @@ function styleFunction(feature, segments, drawType, tip) {
type === 'Point' &&
!modify.getOverlay().getSource().getFeatures().length
) {
+ tipPoint = geometry;
tipStyle.getText().setText(tip);
styles.push(tipStyle);
}
@@ -247,7 +250,11 @@ function addInteraction() {
tip = activeTip;
});
draw.on('drawend', function () {
+ modifyStyle.setGeometry(tipPoint);
modify.setActive(true);
+ map.once('pointermove', function () {
+ modifyStyle.setGeometry();
+ });
tip = idleTip;
});
modify.setActive(true);
@@ -263,4 +270,5 @@ addInteraction();
showSegments.onchange = function () {
vector.changed();
+ draw.getOverlay().changed();
};
|
Override modify style geometry until pointermove
|
diff --git a/src/server/pkg/deploy/assets/assets.go b/src/server/pkg/deploy/assets/assets.go
index <HASH>..<HASH> 100644
--- a/src/server/pkg/deploy/assets/assets.go
+++ b/src/server/pkg/deploy/assets/assets.go
@@ -30,7 +30,7 @@ var (
// that hasn't been released, and which has been manually applied
// to the official v3.2.7 release.
etcdImage = "quay.io/coreos/etcd:v3.3.5"
- grpcProxyImage = "pachyderm/grpc-proxy:0.4.4"
+ grpcProxyImage = "pachyderm/grpc-proxy:0.4.5"
dashName = "dash"
workerImage = "pachyderm/worker"
pauseImage = "gcr.io/google_containers/pause-amd64:3.0"
|
Update GRPC proxy to <I>
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.