diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/lib/ronin/ui/command_line/commands/extension.rb b/lib/ronin/ui/command_line/commands/extension.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/ui/command_line/commands/extension.rb
+++ b/lib/ronin/ui/command_line/commands/extension.rb
@@ -69,6 +69,7 @@ module Ronin
FileUtils.mkdir_p(path)
FileUtils.mkdir_p(lib_dir)
FileUtils.touch(File.join(lib_dir,File.basename(path) + '.rb'))
+ FileUtils.mkdir_p(File.join(lib_dir,File.basename(path)))
File.open(extension_path,'w') do |file|
template_path = File.join(Config::STATIC_DIR,'extension.rb.erb')
|
Also make a directory within the lib/ dir of an extension.
|
diff --git a/src/main/java/com/frostwire/jlibtorrent/IntSeries.java b/src/main/java/com/frostwire/jlibtorrent/IntSeries.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/frostwire/jlibtorrent/IntSeries.java
+++ b/src/main/java/com/frostwire/jlibtorrent/IntSeries.java
@@ -79,6 +79,16 @@ public final class IntSeries {
return buffer[(head + index) % size];
}
+ /**
+ * This method will always returns a value, if the series is empty
+ * {@code 0} is returned.
+ *
+ * @return the last value in the series
+ */
+ public long last() {
+ return end != 0 ? buffer[end] : 0;
+ }
+
public int size() {
return size;
}
|
added IntSeries#last method
|
diff --git a/endpoints/__init__.py b/endpoints/__init__.py
index <HASH>..<HASH> 100644
--- a/endpoints/__init__.py
+++ b/endpoints/__init__.py
@@ -34,4 +34,4 @@ from users_id_token import get_current_user, get_verified_jwt, convert_jwks_uri
from users_id_token import InvalidGetUserCall
from users_id_token import SKIP_CLIENT_ID_CHECK
-__version__ = '2.1.2'
+__version__ = '2.2.0'
|
Version bump (<I> -> <I>)
Rationale: Backwards-compatible but important changes to proxy.html
serving.
|
diff --git a/caliper/src/main/java/com/google/caliper/runner/ExperimentingCaliperRun.java b/caliper/src/main/java/com/google/caliper/runner/ExperimentingCaliperRun.java
index <HASH>..<HASH> 100644
--- a/caliper/src/main/java/com/google/caliper/runner/ExperimentingCaliperRun.java
+++ b/caliper/src/main/java/com/google/caliper/runner/ExperimentingCaliperRun.java
@@ -123,7 +123,7 @@ public final class ExperimentingCaliperRun implements CaliperRun {
.setDaemon(true)
.build()));
- private final Stopwatch trialStopwatch = new Stopwatch();
+ private final Stopwatch trialStopwatch = Stopwatch.createUnstarted();
/** This is 1-indexed because it's only used for display to users. E.g. "Trial 1 of 27" */
private volatile int trialNumber = 1;
|
new Stopwatch(); -> Stopwatch.createUnstarted();
(Reverted the files which didn't import com.google.common.base.Stopwatch)
-------------
Created by MOE: <URL>
|
diff --git a/lib/bolt/version.rb b/lib/bolt/version.rb
index <HASH>..<HASH> 100644
--- a/lib/bolt/version.rb
+++ b/lib/bolt/version.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
module Bolt
- VERSION = '3.16.0'
+ VERSION = '3.16.1'
end
|
(GEM) update bolt version to <I>
|
diff --git a/src/state.py b/src/state.py
index <HASH>..<HASH> 100644
--- a/src/state.py
+++ b/src/state.py
@@ -20,6 +20,7 @@ class State(Module):
processed_occ = {}
with self.lock:
for pc, state in occ.iteritems():
+ pc = pc.lower() # normalize HG075PC47 -> hg075pc47
# TODO do not hardcode this
if pc.startswith('cz'):
continue
|
state: normalize pc names to lowercase
|
diff --git a/hwt/code.py b/hwt/code.py
index <HASH>..<HASH> 100644
--- a/hwt/code.py
+++ b/hwt/code.py
@@ -58,7 +58,8 @@ class If(IfContainer):
self._now_is_event_dependent = arr_any(
discoverEventDependency(cond_sig), lambda x: True)
-
+
+ self._inputs.append(cond_sig)
cond_sig.endpoints.append(self)
case = []
|
add condition in elif to if-statement _inputs
|
diff --git a/marshmallow_jsonapi/schema.py b/marshmallow_jsonapi/schema.py
index <HASH>..<HASH> 100644
--- a/marshmallow_jsonapi/schema.py
+++ b/marshmallow_jsonapi/schema.py
@@ -107,6 +107,8 @@ class Schema(ma.Schema):
raise IncorrectTypeError(actual=item['type'], expected=self.opts.type_)
payload = self.dict_class()
+ if 'id' in item:
+ payload['id'] = item['id']
for key, value in iteritems(item.get('attributes', {})):
payload[key] = value
for key, value in iteritems(item.get('relationships', {})):
|
Marshaling payload id
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -112,7 +112,7 @@ setup(name='cldoc',
description='clang based documentation generator for C/C++',
author='Jesse van den Kieboom',
author_email='jessevdk@gmail.com',
- url='http://github.com/jessevdk/cldoc',
+ url='http://jessevdk.github.com/cldoc',
packages=['cldoc', 'cldoc.clang', 'cldoc.nodes', 'cldoc.generators'],
scripts=['scripts/cldoc'],
package_data={'cldoc': ['data/*.html', 'data/javascript/*.js', 'data/styles/*.css']},
|
Point website to cldoc website
|
diff --git a/src/python/grpcio/grpc/experimental/aio/_call.py b/src/python/grpcio/grpc/experimental/aio/_call.py
index <HASH>..<HASH> 100644
--- a/src/python/grpcio/grpc/experimental/aio/_call.py
+++ b/src/python/grpcio/grpc/experimental/aio/_call.py
@@ -400,11 +400,11 @@ class _StreamRequestMixin(Call):
if inspect.isasyncgen(request_iterator):
async for request in request_iterator:
await self._write(request)
- await self._done_writing()
else:
for request in request_iterator:
await self._write(request)
- await self._done_writing()
+
+ await self._done_writing()
except AioRpcError as rpc_error:
# Rpc status should be exposed through other API. Exceptions raised
# within this Task won't be retrieved by another coroutine. It's
|
Aggregate common statement in both branches
|
diff --git a/lib/features/modeling/cmd/MoveConnectionHandler.js b/lib/features/modeling/cmd/MoveConnectionHandler.js
index <HASH>..<HASH> 100644
--- a/lib/features/modeling/cmd/MoveConnectionHandler.js
+++ b/lib/features/modeling/cmd/MoveConnectionHandler.js
@@ -63,6 +63,8 @@ MoveConnectionHandler.prototype.revert = function(context) {
p.original.y -= delta.y;
}
});
+
+ return connection;
};
|
fix(modeling): update connection after move undo
|
diff --git a/config/routes.rb b/config/routes.rb
index <HASH>..<HASH> 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -111,6 +111,16 @@ Rails.application.routes.draw do
end
end
+ resources :feedback, only: [:index, :edit, :create, :update, :destroy], format: false do
+ collection do
+ post 'bulkops'
+ end
+ member do
+ get 'article'
+ post 'change_state'
+ end
+ end
+
resources :notes, only: [:index, :show, :edit, :create, :update, :destroy], format: false
resources :pages, only: [:index, :new, :edit, :create, :update, :destroy], format: false
@@ -172,7 +182,7 @@ Rails.application.routes.draw do
end
# Admin/XController
- %w{feedback}.each do |i|
+ %w{}.each do |i|
match "/admin/#{i}", controller: "admin/#{i}", action: :index, format: false, via: [:get, :post, :put, :delete] # TODO: convert this magic catchers to resources item to close un-needed HTTP method
match "/admin/#{i}(/:action(/:id))", controller: "admin/#{i}", action: nil, id: nil, format: false, via: [:get, :post, :put, :delete] # TODO: convert this magic catchers to resources item to close un-needed HTTP method
end
|
Make feedback controller use resourceful routes.
|
diff --git a/menuinst/win32.py b/menuinst/win32.py
index <HASH>..<HASH> 100644
--- a/menuinst/win32.py
+++ b/menuinst/win32.py
@@ -149,9 +149,9 @@ def to_bytes(var, codec=locale.getpreferredencoding()):
return var
-if u'\\envs\\' in to_unicode(sys.prefix):
- logger.warn('menuinst called from non-root env %s' % (sys.prefix))
unicode_root_prefix = to_unicode(sys.prefix)
+if u'\\envs\\' in unicode_root_prefix:
+ logger.warn('menuinst called from non-root env %s', unicode_root_prefix)
def substitute_env_variables(text, dir):
|
fix logging traceback from #<I>
|
diff --git a/addons/docs/src/mdx/mdx-compiler-plugin.js b/addons/docs/src/mdx/mdx-compiler-plugin.js
index <HASH>..<HASH> 100644
--- a/addons/docs/src/mdx/mdx-compiler-plugin.js
+++ b/addons/docs/src/mdx/mdx-compiler-plugin.js
@@ -218,8 +218,8 @@ function extractExports(node, options) {
},
value: {
type: 'StringLiteral',
- value: encodeURI(generate(ast, {}).code),
- /* ast.children
+ value: encodeURI(
+ ast.children
.map(
el =>
generate(el, {
@@ -228,7 +228,6 @@ function extractExports(node, options) {
)
.join('\n')
),
- */
},
});
}
|
code to use only the children of the <Preview components, maybe potential issue with line breaks?
|
diff --git a/draft-js-mention-plugin/src/SearchSuggestions/index.js b/draft-js-mention-plugin/src/SearchSuggestions/index.js
index <HASH>..<HASH> 100644
--- a/draft-js-mention-plugin/src/SearchSuggestions/index.js
+++ b/draft-js-mention-plugin/src/SearchSuggestions/index.js
@@ -234,7 +234,7 @@ export default class SearchSuggestions extends Component {
};
render() {
- if (!this.state.isActive) {
+ if (!this.state.isActive || this.props.suggestions.isEmpty()) {
return null;
}
|
only show the list if there is a result
|
diff --git a/commerce-discount-service/src/main/java/com/liferay/commerce/discount/model/impl/CommerceDiscountCommerceAccountGroupRelImpl.java b/commerce-discount-service/src/main/java/com/liferay/commerce/discount/model/impl/CommerceDiscountCommerceAccountGroupRelImpl.java
index <HASH>..<HASH> 100644
--- a/commerce-discount-service/src/main/java/com/liferay/commerce/discount/model/impl/CommerceDiscountCommerceAccountGroupRelImpl.java
+++ b/commerce-discount-service/src/main/java/com/liferay/commerce/discount/model/impl/CommerceDiscountCommerceAccountGroupRelImpl.java
@@ -18,10 +18,13 @@ import aQute.bnd.annotation.ProviderType;
import com.liferay.commerce.account.model.CommerceAccountGroup;
import com.liferay.commerce.account.service.CommerceAccountGroupLocalServiceUtil;
+import com.liferay.commerce.discount.model.CommerceDiscount;
+import com.liferay.commerce.discount.service.CommerceDiscountLocalServiceUtil;
import com.liferay.portal.kernel.exception.PortalException;
/**
* @author Marco Leo
+ * @author Alessio Antonio Rendina
*/
@ProviderType
public class CommerceDiscountCommerceAccountGroupRelImpl
@@ -38,4 +41,10 @@ public class CommerceDiscountCommerceAccountGroupRelImpl
getCommerceAccountGroupId());
}
+ @Override
+ public CommerceDiscount getCommerceDiscount() throws PortalException {
+ return CommerceDiscountLocalServiceUtil.getCommerceDiscount(
+ getCommerceDiscountId());
+ }
+
}
\ No newline at end of file
|
COMMERCE-<I> Refactor commerce discount commerce account group rel implementation
|
diff --git a/pkg/cmd/server/origin/master.go b/pkg/cmd/server/origin/master.go
index <HASH>..<HASH> 100644
--- a/pkg/cmd/server/origin/master.go
+++ b/pkg/cmd/server/origin/master.go
@@ -785,6 +785,7 @@ func (c *MasterConfig) RunDNSServer() {
glog.Fatalf("Could not start DNS: %v", err)
}
config.DnsAddr = c.Options.DNSConfig.BindAddress
+ config.NoRec = true // do not want to deploy an open resolver
_, port, err := net.SplitHostPort(c.Options.DNSConfig.BindAddress)
if err != nil {
|
SkyDNS: don't recurse requests
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -27,7 +27,7 @@ function PackeryComponent(React) {
initializePackery: function(force) {
if (!this.packery || force) {
- this.packery = new Masonry(
+ this.packery = new Packery(
this.refs[refName],
this.props.options
);
@@ -46,7 +46,7 @@ function PackeryComponent(React) {
var oldChildren = this.domChildren.filter(function(element) {
/*
* take only elements attached to DOM
- * (aka the parent is the masonry container, not null)
+ * (aka the parent is the packery container, not null)
*/
return !!element.parentNode;
});
|
Fix typo
Use Packery instead of Masonry :)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ except IOError: readme = ''
setup(
name = 'layered-yaml-attrdict-config',
- version = '12.06.1',
+ version = '12.06.2',
author = 'Mike Kazantsev',
author_email = 'mk.fraggod@gmail.com',
license = 'WTFPL',
@@ -38,4 +38,6 @@ setup(
'Topic :: Software Development :: Libraries :: Python Modules' ],
install_requires = ['PyYAML'],
- packages = find_packages() )
+ packages = find_packages(),
+ package_data = {'': ['README.txt']},
+ exclude_package_data = {'': ['README.*']} )
|
setup: included README.txt in the tarball
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -2073,7 +2073,7 @@ function AudioCB(voiceSession, audioChannels, encoder, maxStreamSize) {
};
this._read = function _read() {};
this.stop = function stop() {
- return this._systemEncoder.stdout.push(null);
+ return this._systemEncoder.stdout.read = function() { return null };
};
if (maxStreamSize) {
|
`Stream#stop` stops immediately
|
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -148,7 +148,7 @@ EOF
if ('/' === \DIRECTORY_SEPARATOR && $mounts = @file('/proc/mounts')) {
foreach ($mounts as $mount) {
$mount = array_slice(explode(' ', $mount), 1, -3);
- if (!\in_array(array_pop($mount), array('vboxfs', 'nfs'))) {
+ if (!\in_array(array_pop($mount), array('vboxsf', 'nfs'))) {
continue;
}
$mount = implode(' ', $mount).'/';
|
[FrameworkBundle] fix typo in CacheClearCommand
|
diff --git a/tests/cli/collectors.py b/tests/cli/collectors.py
index <HASH>..<HASH> 100644
--- a/tests/cli/collectors.py
+++ b/tests/cli/collectors.py
@@ -26,6 +26,7 @@ class Collector(base.TDataCollector):
)
outname = base.maybe_data_path(datadir / 'on', name, self.should_exist)
ref = base.maybe_data_path(datadir / 'r', name, self.should_exist)
+ oo_opts = base.maybe_data_path(datadir / 'oo', name, self.should_exist)
return datatypes.TData(
datadir,
@@ -33,7 +34,8 @@ class Collector(base.TDataCollector):
base.load_data(opts, default=[]),
datatypes.Expected(**exp_data),
base.load_data(outname, default=''),
- base.load_data(ref)
+ base.load_data(ref),
+ base.load_data(oo_opts, default={}),
)
# vim:sw=4:ts=4:et:
diff --git a/tests/cli/datatypes.py b/tests/cli/datatypes.py
index <HASH>..<HASH> 100644
--- a/tests/cli/datatypes.py
+++ b/tests/cli/datatypes.py
@@ -32,5 +32,6 @@ class TData(typing.NamedTuple):
# Optional extra data.
outname: str = ''
ref: typing.Optional[DictT] = None
+ oo_opts: DictT = {}
# vim:sw=4:ts=4:et:
|
change: add oo_opts member to TData and set it on load
|
diff --git a/bakery/management/commands/build.py b/bakery/management/commands/build.py
index <HASH>..<HASH> 100644
--- a/bakery/management/commands/build.py
+++ b/bakery/management/commands/build.py
@@ -1,5 +1,6 @@
import os
import six
+import glob
import shutil
from django.conf import settings
from optparse import make_option
@@ -77,6 +78,20 @@ settings.py or provide a list as arguments."
verbosity=0
)
target_dir = os.path.join(self.build_dir, settings.STATIC_URL[1:])
+ # walk through the static directory,
+ # and match for any .css or .js file
+ for (dirpath, dirnames, filenames) in walk(target_dir):
+ pattern = re.compile('(\.css|\.js|\.json)$')
+ for filename in filenames:
+ m = pattern.search(filename)
+ if m:
+ f_path = os.path.join(dirpath, filename)
+ f_in = open(f_path, 'rb')
+ f_out = gzip.open('%s.gz' % f_path, 'wb', mtime=0)
+ f_out.writelines(f_in)
+ f_out.close()
+ f_in.close()
+
if os.path.exists(settings.STATIC_ROOT) and settings.STATIC_URL:
shutil.copytree(settings.STATIC_ROOT, target_dir)
# If they exist in the static directory, copy the robots.txt
|
dirty attempt at regex searching for and gzipping static files
|
diff --git a/generic_positions/templatetags/position_tags.py b/generic_positions/templatetags/position_tags.py
index <HASH>..<HASH> 100644
--- a/generic_positions/templatetags/position_tags.py
+++ b/generic_positions/templatetags/position_tags.py
@@ -19,6 +19,9 @@ def order_by_position(qs, reverse=False):
position = 'position'
if reverse:
position = '-' + position
+ # Check that every item has a valid position item
+ for obj in qs:
+ ObjectPosition.objects.get_or_create(content_object=obj)
# Get content type of first queryset item
c_type = ContentType.objects.get_for_model(qs[0])
return [
|
fixed order by position tag if items have no position object
|
diff --git a/lib/test-server/test-server.js b/lib/test-server/test-server.js
index <HASH>..<HASH> 100644
--- a/lib/test-server/test-server.js
+++ b/lib/test-server/test-server.js
@@ -151,7 +151,7 @@ var routeCoverage = function (req, res, next) {
var jsonApi = function (req, res, next) {
var testServer = this;
- if (!req.path == "status.json") {
+ if (req.path !== "/status.json") {
return next();
}
var status = testServer.getStatus();
|
Fixing issue introduced in ba3aa<I>bd<I>aa<I>d<I>db<I>de6a<I>
The status page was returned instead of <I> errors.
|
diff --git a/src/Codeception/Codecept.php b/src/Codeception/Codecept.php
index <HASH>..<HASH> 100644
--- a/src/Codeception/Codecept.php
+++ b/src/Codeception/Codecept.php
@@ -7,7 +7,7 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
class Codecept
{
- const VERSION = "2.6.0";
+ const VERSION = "3.0.0";
/**
* @var \Codeception\PHPUnit\Runner
|
Set the VERSION constant to <I>
|
diff --git a/gsh/control_shell.py b/gsh/control_shell.py
index <HASH>..<HASH> 100644
--- a/gsh/control_shell.py
+++ b/gsh/control_shell.py
@@ -104,6 +104,9 @@ def switch_readline_history(new_histo):
add_history(line)
return prev_histo
+def handle_control_command(line):
+ singleton.onecmd(line)
+
class control_shell(cmd.Cmd):
"""The little command line brought when a SIGINT is received"""
def __init__(self, options):
diff --git a/gsh/stdin.py b/gsh/stdin.py
index <HASH>..<HASH> 100644
--- a/gsh/stdin.py
+++ b/gsh/stdin.py
@@ -130,9 +130,15 @@ class input_buffer(object):
def process_input_buffer():
"""Send the content of the input buffer to all remote processes, this must
be called in the main thread"""
+ from gsh.control_shell import handle_control_command
data = the_stdin_thread.input_buffer.get()
if not data:
return
+
+ if data.startswith(':'):
+ handle_control_command(data[1:-1])
+ return
+
for r in dispatchers.all_instances():
try:
r.dispatch_write(data)
|
Initial support of control commands prefixed by ':' in the main shell
|
diff --git a/connect.js b/connect.js
index <HASH>..<HASH> 100644
--- a/connect.js
+++ b/connect.js
@@ -25,10 +25,10 @@ exports.connect = function (config, PassedClass) {
return;
}
+ var dirPath = path.resolve(
+ internals.argv['migrations-dir'] || 'migrations'
+ );
if (internals.migrationMode) {
- var dirPath = path.resolve(
- internals.argv['migrations-dir'] || 'migrations'
- );
if (internals.migrationMode !== 'all') {
var switched = false;
var newConf;
@@ -56,7 +56,7 @@ exports.connect = function (config, PassedClass) {
null,
new PassedClass(
db,
- internals.argv['migrations-dir'],
+ dirPath,
internals.mode !== 'static',
internals,
prefix
@@ -69,7 +69,7 @@ exports.connect = function (config, PassedClass) {
null,
new PassedClass(
db,
- internals.argv['migrations-dir'],
+ dirPath,
internals.mode !== 'static',
internals,
prefix
@@ -112,7 +112,7 @@ exports.connect = function (config, PassedClass) {
null,
new PassedClass(
db,
- internals.argv['migrations-dir'],
+ dirPath,
internals.mode !== 'static',
internals,
prefix
|
fix wrong reference to migration folder
fixes #<I>
|
diff --git a/backbone.js b/backbone.js
index <HASH>..<HASH> 100644
--- a/backbone.js
+++ b/backbone.js
@@ -374,7 +374,7 @@
var prevId = this.id;
this.id = this.generateId(current);
- if (prevId !== this.id) this.trigger('changeId', this, prevId, options);
+ if (prevId !== this.id) this.trigger('change-id', this, prevId, options);
// Trigger all relevant attribute changes.
if (!silent) {
@@ -968,7 +968,7 @@
_onModelEvent: function(event, model, collection, options) {
if ((event === 'add' || event === 'remove') && collection !== this) return;
if (event === 'destroy') this.remove(model, options);
- if (event === 'changeId') {
+ if (event === 'change-id') {
if (collection != null) delete this._byId[collection];
if (model.id != null) this._byId[model.id] = model;
}
|
#<I> -- use 'change-id' as the event name
|
diff --git a/src/Di/ClassInspector.php b/src/Di/ClassInspector.php
index <HASH>..<HASH> 100644
--- a/src/Di/ClassInspector.php
+++ b/src/Di/ClassInspector.php
@@ -36,7 +36,7 @@ class ClassInspector
if ($method === '__construct') {
return $dependencies;
}
- throw new MethodNotFoundException($class, $method);
+ throw new MethodNotFoundException($r->getName(), $method);
}
$rp = $r->getMethod($method)->getParameters();
|
fix bug where MethodNotFoundException was not created correctly
|
diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go
index <HASH>..<HASH> 100644
--- a/runtime/v2/shim/util_unix.go
+++ b/runtime/v2/shim/util_unix.go
@@ -30,6 +30,7 @@ import (
"syscall"
"time"
+ "github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/dialer"
"github.com/containerd/containerd/sys"
@@ -63,7 +64,7 @@ func AdjustOOMScore(pid int) error {
return nil
}
-const socketRoot = "/run/containerd"
+const socketRoot = defaults.DefaultStateDir
// SocketAddress returns a socket address
func SocketAddress(ctx context.Context, socketPath, id string) (string, error) {
|
darwin: use the default values for socketRoot variable
Since the /run directory on macOS is read-only, darwin containerd should
use a different directory. Use the pre-defined default values instead
to avoid this issue.
Fixes: bd<I>acab ("Use path based unix socket for shims")
|
diff --git a/content/article.go b/content/article.go
index <HASH>..<HASH> 100644
--- a/content/article.go
+++ b/content/article.go
@@ -55,7 +55,6 @@ type Article interface {
Extract() ArticleExtract
}
-// TODO: merge with Article
type ScoredArticle interface {
Article
|
scores aren't used often enough to justify another join
|
diff --git a/lib/sy/quantity.rb b/lib/sy/quantity.rb
index <HASH>..<HASH> 100644
--- a/lib/sy/quantity.rb
+++ b/lib/sy/quantity.rb
@@ -449,7 +449,9 @@ class SY::Quantity
ɴλ.call % "Unit" # as for @Magnitude applies.)
end
end
- end.namespace! SY::Unit
+ end.tap do |unit_parametrized_subclass|
+ unit_parametrized_subclass.namespace = SY::Unit
+ end
end ).tap do |u|
puts "@Unit constructed, its namespace is #{u.namespace}" if SY::DEBUG
puts "its instances are #{u.namespace.instances}" if SY::DEBUG
diff --git a/lib/sy/version.rb b/lib/sy/version.rb
index <HASH>..<HASH> 100644
--- a/lib/sy/version.rb
+++ b/lib/sy/version.rb
@@ -1,5 +1,5 @@
module SY
- VERSION = "2.0.9"
+ VERSION = "2.0.14"
DEBUG = false # debug mode switch - sometimes there are lines like
# puts "something" if SY::DEBUG
end
|
adapting to y_support/name_magic change
|
diff --git a/modelcluster/fields.py b/modelcluster/fields.py
index <HASH>..<HASH> 100644
--- a/modelcluster/fields.py
+++ b/modelcluster/fields.py
@@ -62,7 +62,11 @@ def create_deferring_foreign_related_manager(related, original_manager_cls):
try:
results = self.instance._cluster_related_objects[relation_name]
except (AttributeError, KeyError):
- return self.get_live_queryset()
+ if self.instance.pk is None:
+ # use an empty fake queryset if the instance is unsaved
+ results = []
+ else:
+ return self.get_live_queryset()
return FakeQuerySet(related.related_model, results)
@@ -105,7 +109,10 @@ def create_deferring_foreign_related_manager(related, original_manager_cls):
try:
object_list = cluster_related_objects[relation_name]
except KeyError:
- object_list = list(self.get_live_queryset())
+ if self.instance.pk is None:
+ object_list = []
+ else:
+ object_list = list(self.get_live_queryset())
cluster_related_objects[relation_name] = object_list
return object_list
|
Avoid accessing live queryset on unsaved instances
In cases where a DeferringRelatedManager was read on an in-memory instance before being written to, it was accessing the real manager on an unsaved instance. This was tolerated up to Django <I>, but it's a hard fail as of <URL>
|
diff --git a/spec/public/reloading/directory/app/controllers/reload.rb b/spec/public/reloading/directory/app/controllers/reload.rb
index <HASH>..<HASH> 100644
--- a/spec/public/reloading/directory/app/controllers/reload.rb
+++ b/spec/public/reloading/directory/app/controllers/reload.rb
@@ -1,7 +1,6 @@
-
- class Reloader < Application
- end
+class Reloader < Application
+end
- class Hello < Application
- end
\ No newline at end of file
+class Hello < Application
+end
|
merge hcatlins doc patches, \m/
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100755
--- a/index.js
+++ b/index.js
@@ -773,9 +773,9 @@ FSWatcher.prototype._addToFsEvents = function(file, pathTransform) {
_this._readyCount++;
_this._addToFsEvents(linkPath, function(path) {
var ds = '.' + sysPath.sep;
- return linkPath && linkPath !== ds ?
+ return pathTransform(linkPath && linkPath !== ds ?
path.replace(linkPath, entryPath) :
- path === ds ? entryPath : sysPath.join(entryPath, path);
+ path === ds ? entryPath : sysPath.join(entryPath, path));
});
} else if (linkStats.isFile()) {
processEntry();
|
Adjust paths of nested symlinks
gh-<I>
|
diff --git a/core/server/master/src/test/java/alluxio/master/AlluxioMasterProcessTest.java b/core/server/master/src/test/java/alluxio/master/AlluxioMasterProcessTest.java
index <HASH>..<HASH> 100644
--- a/core/server/master/src/test/java/alluxio/master/AlluxioMasterProcessTest.java
+++ b/core/server/master/src/test/java/alluxio/master/AlluxioMasterProcessTest.java
@@ -230,6 +230,10 @@ public final class AlluxioMasterProcessTest {
waitForServing(ServiceType.MASTER_WEB);
assertTrue(isBound(mRpcPort));
assertTrue(isBound(mWebPort));
+ boolean testMode = ServerConfiguration.getBoolean(PropertyKey.TEST_MODE);
+ ServerConfiguration.set(PropertyKey.TEST_MODE, false);
+ master.waitForReady(5000);
+ ServerConfiguration.set(PropertyKey.TEST_MODE, testMode);
master.stop();
assertFalse(isBound(mRpcPort));
assertFalse(isBound(mWebPort));
|
Fix test startStopPrimary failure from time to time
Fix test startStopPrimary failure from time to time
pr-link: Alluxio/alluxio#<I>
change-id: cid-<I>fa<I>be<I>d5f9dd<I>c<I>f<I>d<I>ca<I>b2
|
diff --git a/src/main/java/org/telegram/botapi/api/internal/chat/updates/RequestUpdatesManager.java b/src/main/java/org/telegram/botapi/api/internal/chat/updates/RequestUpdatesManager.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/telegram/botapi/api/internal/chat/updates/RequestUpdatesManager.java
+++ b/src/main/java/org/telegram/botapi/api/internal/chat/updates/RequestUpdatesManager.java
@@ -30,8 +30,8 @@ public class RequestUpdatesManager extends UpdateManager {
super(telegramBot);
- new Thread(new UpdaterRunnable(this)).start();
eventManager = (ListenerRegistryImpl) telegramBot.getEventsManager();
+ new Thread(new UpdaterRunnable(this)).start();
}
public UpdateMethod getUpdateMethod() {
@@ -72,6 +72,8 @@ public class RequestUpdatesManager extends UpdateManager {
Update update = UpdateImpl.createUpdate(updates.getJSONObject(i));
+ System.out.println(update.getMessage().getContent().getType());
+
eventManager.callEvent(new MessageReceivedEvent(update.getMessage()));
switch(update.getMessage().getContent().getType()) {
|
Set updateManager variable before starting update thread.
|
diff --git a/defender/test_settings.py b/defender/test_settings.py
index <HASH>..<HASH> 100644
--- a/defender/test_settings.py
+++ b/defender/test_settings.py
@@ -29,6 +29,13 @@ INSTALLED_APPS = [
'defender',
]
+TEMPLATES = [
+ {
+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
+ 'APP_DIRS': True,
+ },
+]
+
SECRET_KEY = os.environ.get('SECRET_KEY', 'too-secret-for-test')
LOGIN_REDIRECT_URL = '/admin'
diff --git a/defender/travis_settings.py b/defender/travis_settings.py
index <HASH>..<HASH> 100644
--- a/defender/travis_settings.py
+++ b/defender/travis_settings.py
@@ -29,6 +29,13 @@ INSTALLED_APPS = [
'defender',
]
+TEMPLATES = [
+ {
+ 'BACKEND': 'django.template.backends.django.DjangoTemplates',
+ 'APP_DIRS': True,
+ },
+]
+
SECRET_KEY = os.environ.get('SECRET_KEY', 'too-secret-for-test')
LOGIN_REDIRECT_URL = '/admin'
|
Templates settings as recommended from Django <I>
|
diff --git a/elpy/jedibackend.py b/elpy/jedibackend.py
index <HASH>..<HASH> 100644
--- a/elpy/jedibackend.py
+++ b/elpy/jedibackend.py
@@ -215,6 +215,12 @@ def run_with_debug(jedi, name, *args, **kwargs):
# Bug in Python 2.6, see #275
if isinstance(e, OSError) and e.errno == 13:
return None
+ # Bug jedi#466
+ if (
+ isinstance(e, SyntaxError) and
+ "EOL while scanning string literal" in str(e)
+ ):
+ return None
from jedi import debug
diff --git a/elpy/tests/support.py b/elpy/tests/support.py
index <HASH>..<HASH> 100644
--- a/elpy/tests/support.py
+++ b/elpy/tests/support.py
@@ -215,6 +215,14 @@ x._|_
self.rpc(filename, source, offset)
+ def test_should_not_fail_on_literals(self):
+ # Bug #344 / jedi#466
+ source = u'lit = u"""\\\n# -*- coding: utf-8 -*-\n"""\n'
+ offset = 0
+ filename = self.project_file("project.py", source)
+
+ self.rpc(filename, source, offset)
+
class RPCGetCompletionsTests(GenericRPCTests):
METHOD = "rpc_get_completions"
|
Catch a SyntaxError from Jedi.
This is a workaround for a bug in Jedi.
Fixes #<I>.
|
diff --git a/lib/components/form/default-search-form.js b/lib/components/form/default-search-form.js
index <HASH>..<HASH> 100644
--- a/lib/components/form/default-search-form.js
+++ b/lib/components/form/default-search-form.js
@@ -26,7 +26,7 @@ export default class DefaultSearchForm extends Component {
render () {
const { icons, mobile } = this.props
- const actionText = mobile ? 'long press' : 'right-click'
+ const actionText = mobile ? 'tap' : 'click'
return (
<div>
|
fix(form): Update placeholder language in location field to reflect new mouse/tap interaction
Refs conveyal/trimet-mod-otp#<I>
|
diff --git a/src/Record.php b/src/Record.php
index <HASH>..<HASH> 100755
--- a/src/Record.php
+++ b/src/Record.php
@@ -255,6 +255,26 @@ class Record extends Origin implements IteratorAggregate
}
/**
+ * Update all data in Record
+ *
+ * @param array $public
+ * @param array $private
+ * @return Record
+ * @throws SimplesRecordReadonlyError
+ */
+ public function update(array $public, array $private = []): Record
+ {
+ if ($this->isEditable()) {
+ $this->public = $public;
+ if (count($private)) {
+ $this->private = $private;
+ }
+ return $this;
+ }
+ return static::make($public, $this->isEditable(), $this->mutations, $this->private);
+ }
+
+ /**
* Get the name of properties managed by Record
* @param array $except
* @return array
|
New method update to override all data into record
|
diff --git a/informationminer/__init__.py b/informationminer/__init__.py
index <HASH>..<HASH> 100644
--- a/informationminer/__init__.py
+++ b/informationminer/__init__.py
@@ -5,4 +5,4 @@ The ClassifierBasedGermanTagger can be used for POS-Tagging on the German langua
from .InformationMiner import InformationMiner
from .ClassifierBasedGermanTagger import ClassifierBasedGermanTagger
from .POSTagger import tag
-
+__version__ = '1.6'
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -2,12 +2,12 @@ from distutils.core import setup
setup(
name = 'informationminer',
packages = ['informationminer'],
- version = '1.3',
+ version = '1.6',
description = 'Automatically performs NLP techniques. Currently supports German and English language.',
author = 'Richard Polzin',
author_email = 'polzin.richard@gmail.com',
url = 'https://github.com/deastiny/informationminer',
- download_url = 'https://github.com/DeastinY/informationminer/archive/1.3.tar.gz',
+ download_url = 'https://github.com/DeastinY/informationminer/archive/1.6.tar.gz',
keywords = ['NLP', 'POS', 'NER', 'NLTK'],
classifiers = [],
include_package_data = True,
|
Trying to figure out PyPI updates
|
diff --git a/test/net/fortuna/ical4j/model/property/ExDateTest.java b/test/net/fortuna/ical4j/model/property/ExDateTest.java
index <HASH>..<HASH> 100644
--- a/test/net/fortuna/ical4j/model/property/ExDateTest.java
+++ b/test/net/fortuna/ical4j/model/property/ExDateTest.java
@@ -73,6 +73,7 @@ public class ExDateTest extends TestCase {
protected void tearDown() throws Exception {
CompatibilityHints.setHintEnabled(
CompatibilityHints.KEY_RELAXED_UNFOLDING, false);
+ CompatibilityHints.setHintEnabled(CompatibilityHints.KEY_RELAXED_PARSING, false);
}
/**
|
Reset compatibility flags on test completion
|
diff --git a/sk/passwords.php b/sk/passwords.php
index <HASH>..<HASH> 100644
--- a/sk/passwords.php
+++ b/sk/passwords.php
@@ -21,6 +21,6 @@ return [
"sent" => "Pripomienka k zmene hesla bola odoslaná!",
- "reset" => "Password has been reset!",
+ "reset" => "Heslo bolo zmenené!",
];
|
Translated key "reset" to slovak
|
diff --git a/src/Message/SecureXMLAbstractRequest.php b/src/Message/SecureXMLAbstractRequest.php
index <HASH>..<HASH> 100644
--- a/src/Message/SecureXMLAbstractRequest.php
+++ b/src/Message/SecureXMLAbstractRequest.php
@@ -65,7 +65,7 @@ abstract class SecureXMLAbstractRequest extends AbstractRequest
$xml = new \SimpleXMLElement('<SecurePayMessage/>');
$messageInfo = $xml->addChild('MessageInfo');
- $messageInfo->addChild('messageID', $this->getMessageId());
+ $messageInfo->messageID = $this->getMessageId();
$messageInfo->addChild('messageTimestamp', $this->generateTimestamp());
$messageInfo->addChild('timeoutValue', 60);
$messageInfo->addChild('apiVersion', 'xml-4.2');
@@ -98,7 +98,7 @@ abstract class SecureXMLAbstractRequest extends AbstractRequest
$transaction->addChild('txnSource', 23); // Must always be 23 for SecureXML.
$transaction->addChild('amount', $this->getAmountInteger());
$transaction->addChild('currency', $this->getCurrency());
- $transaction->addChild('purchaseOrderNo', $this->getTransactionId());
+ $transaction->purchaseOrderNo = $this->getTransactionId();
return $xml;
}
|
Always encode entities in messageID and purchaseOrderNo
This fixes an issue where a client submitting a transaction containing a
purchaseOrderNo with an ampersand in it resulted in an 'unterminated
entity reference' exception.
Turns out that in SimpleXML 'addChild' doesn't encode entities however
when assigning the value directly it does.
|
diff --git a/cake/tests/cases/libs/i18n.test.php b/cake/tests/cases/libs/i18n.test.php
index <HASH>..<HASH> 100644
--- a/cake/tests/cases/libs/i18n.test.php
+++ b/cake/tests/cases/libs/i18n.test.php
@@ -2591,7 +2591,9 @@ class I18nTest extends CakeTestCase {
function testTimeDefinition() {
Configure::write('Config.language', 'po');
- $abday = __c('abday', 5, true);
+ $result = __c('d_fmt', 5, true);
+ $expected = '%m/%d/%Y';
+ $this->assertEqual($result,$expected);
}
/**
|
Test case for date format definition using a LC_TIME locale file
|
diff --git a/example.js b/example.js
index <HASH>..<HASH> 100644
--- a/example.js
+++ b/example.js
@@ -2,6 +2,7 @@
var xml = require('xml4node');
var dual = require('./index');
var _ = require('underscore');
+var EventEmitter = require('events').EventEmitter;
var exampleHost = function () {
@@ -27,7 +28,36 @@ var exampleHost = function () {
var hostA = exampleHost();
var hostB = exampleHost();
-hostA.serve(hostB);
+if (true) {
+ var socket = (function () {
+
+ var sideA = new EventEmitter();
+ var sideB = new EventEmitter();
+
+ _.extend(sideA, {
+ trigger: function () {
+ sideB.emit.apply(sideB, arguments);
+ }
+ });
+
+ _.extend(sideB, {
+ trigger: function () {
+ sideA.emit.apply(sideA, arguments);
+ }
+ });
+
+ return {
+ sideA: sideA
+ , sideB: sideB;
+ }
+ })();
+
+ hostA.serve(socket.sideA);
+ hostB.serve(socket.sideB);
+}
+else {
+ hostA.serve(hostB);
+}
hostA.trigger('put', ['site', 'doc'], xml.elt('bands', [xml.elt('beatles'), xml.elt('doors')]));
hostB.emit('get', ['site', 'doc', 'bands']);
|
Add an example where hosts are connected by a socket.
|
diff --git a/jpx/src/main/java/io/jenetics/jpx/GPX.java b/jpx/src/main/java/io/jenetics/jpx/GPX.java
index <HASH>..<HASH> 100644
--- a/jpx/src/main/java/io/jenetics/jpx/GPX.java
+++ b/jpx/src/main/java/io/jenetics/jpx/GPX.java
@@ -1805,7 +1805,6 @@ public final class GPX implements Serializable {
}
-
/**
* Return a GPX reader, reading GPX files with the given version and in the
* given reading mode.
@@ -1889,7 +1888,6 @@ public final class GPX implements Serializable {
}
-
/**
* Read an GPX object from the given {@code input} stream. This method is a
* shortcut for
@@ -1908,7 +1906,6 @@ public final class GPX implements Serializable {
}
-
/**
* Read an GPX object from the given {@code input} stream. This method is a
* shortcut for
|
#<I>: Some code formatting.
|
diff --git a/utils/eslint-config/index.js b/utils/eslint-config/index.js
index <HASH>..<HASH> 100644
--- a/utils/eslint-config/index.js
+++ b/utils/eslint-config/index.js
@@ -4,7 +4,7 @@
* @see http://eslint.org/docs/user-guide/configuring.html
*/
-/* eslint-disable sort-keys */
+/* eslint-disable @typescript-eslint/no-magic-numbers, sort-keys */
'use strict';
@@ -261,6 +261,7 @@ module.exports = {
'*.test.tsx',
],
// `extends` aren't allowed in overrides so inject the config manually
+ // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
// @ts-ignore - We don't need types here
...require('eslint-plugin-jest').configs.recommended, // eslint-disable-line global-require
plugins: ['jest', 'import'],
@@ -268,6 +269,7 @@ module.exports = {
jest: true,
},
rules: {
+ '@typescript-eslint/no-magic-numbers': OFF, // too verbose for short unit tests
'import/no-extraneous-dependencies': [
ERROR,
{
|
Tweak lint rules
|
diff --git a/insights/client/__init__.py b/insights/client/__init__.py
index <HASH>..<HASH> 100644
--- a/insights/client/__init__.py
+++ b/insights/client/__init__.py
@@ -535,9 +535,10 @@ def pre_update():
updated = InsightsSchedule().remove_scheduling()
if updated:
logger.info('Automatic scheduling for Insights has been disabled.')
- elif not os.path.exists('/etc/cron.daily/' + constants.app_name):
+ elif not os.path.exists('/etc/cron.daily/' + constants.app_name) and not config['register']:
logger.info('Automatic scheduling for Insights already disabled.')
- die()
+ if not config['register']:
+ die()
if config['container_mode']:
logger.debug('Not scanning host.')
@@ -600,7 +601,7 @@ def post_update():
if config['register']:
client.try_register()
- if os.path.exists('/etc/cron.daily') and InsightsSchedule().set_daily():
+ if not config['disable_schedule'] and os.path.exists('/etc/cron.daily') and InsightsSchedule().set_daily():
logger.info('Automatic scheduling for Insights has been enabled.')
# check registration before doing any uploads
|
Fix disable schedule when registering (#<I>)
The `--disable-schedule` flag can now be run alongside `--register` so that the
registration will not automatically enable the cron job.
|
diff --git a/lib/navigator/menu.rb b/lib/navigator/menu.rb
index <HASH>..<HASH> 100644
--- a/lib/navigator/menu.rb
+++ b/lib/navigator/menu.rb
@@ -84,9 +84,9 @@ module Navigator
end
end
- def method_missing name, *positionals, **keywords, &block
+ def method_missing(name, *positionals, **keywords, &)
if respond_to_missing? name
- add(name, *positionals, **keywords, &block)
+ add(name, *positionals, **keywords, &)
else
template.public_send(name, *positionals, **keywords) || super
end
|
Refactored implementation to use anonymous block forwarding
Necessary to reduce typing and redundant code when we can use the
shorthand anonymous block forwarding syntax introduced in Ruby <I>.
These changes cause issues to crop up with the Rubocop
Style/MethodDefParentheses cop which is why it's being disabled on
certain methods. This issue has been logged with the Rubocop team and
hopefully will be fixed soon.
|
diff --git a/restclients_core/util/mock.py b/restclients_core/util/mock.py
index <HASH>..<HASH> 100644
--- a/restclients_core/util/mock.py
+++ b/restclients_core/util/mock.py
@@ -175,4 +175,4 @@ def attempt_open_query_permutations(url, orig_file_path, is_header_file):
def _compare_file_name(orig_file_path, directory, filename):
return (len(unquote(orig_file_path)) - len(unquote(directory)) ==
- len(filename))
+ len(unquote(filename)))
|
Switching both sides of file comparison to unquoted
|
diff --git a/lib/anycable/rails/action_cable_ext/channel.rb b/lib/anycable/rails/action_cable_ext/channel.rb
index <HASH>..<HASH> 100644
--- a/lib/anycable/rails/action_cable_ext/channel.rb
+++ b/lib/anycable/rails/action_cable_ext/channel.rb
@@ -3,13 +3,15 @@
require "action_cable/channel"
ActionCable::Channel::Base.prepend(Module.new do
- def subscribe_to_channel(force: false)
- return if anycabled? && !force
- super()
+ def subscribe_to_channel
+ super unless anycabled? && !@__anycable_subscribing__
end
def handle_subscribe
- subscribe_to_channel(force: true)
+ @__anycable_subscribing__ = true
+ subscribe_to_channel
+ ensure
+ @__anycable_subscribing__ = false
end
def start_periodic_timers
|
fix: do not change signatures in the channel patch
|
diff --git a/core/editor.js b/core/editor.js
index <HASH>..<HASH> 100644
--- a/core/editor.js
+++ b/core/editor.js
@@ -281,6 +281,10 @@ function convertHTML(blot, index, length, isRoot = false) {
}
const { outerHTML, innerHTML } = blot.domNode;
const [start, end] = outerHTML.split(`>${innerHTML}<`);
+ // TODO cleanup
+ if (start === '<table') {
+ return `<table style="border: 1px solid #000;">${parts.join('')}<${end}`;
+ }
return `${start}>${parts.join('')}<${end}`;
}
return blot.domNode.outerHTML;
|
workaround for copying table into other app
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
# python-quilt - A Python implementation of the quilt patch system
#
-# Copyright (C) 2012 Björn Ricks <bjoern.ricks@googlemail.com>
+# Copyright (C) 2012, 2017 Björn Ricks <bjoern.ricks@gmail.com>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
-from distutils.core import setup
+from setuptools import setup
import quilt
|
Use setuptools instead of distutils
setuptools are the standard to install python packages now.
|
diff --git a/kibitzr/transformer/factory.py b/kibitzr/transformer/factory.py
index <HASH>..<HASH> 100644
--- a/kibitzr/transformer/factory.py
+++ b/kibitzr/transformer/factory.py
@@ -47,7 +47,9 @@ class TransformPipeline(object):
if ok:
ok, content = transform(content)
else:
- content = self.on_error(content)
+ break
+ if not ok:
+ content = self.on_error(content)
if content:
content = content.strip()
return ok, content
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ def changelog_version():
setup(
name='kibitzr',
- version='4.0.2beta7',
+ version='4.0.2beta8',
description="Self hosted web page changes monitoring",
long_description=readme + '\n\n' + history,
author="Peter Demin",
|
Fixed error reporting policy when no transforms defined
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,6 @@ setup(
author_email="tjelvar.olsson@jic.ac.uk",
url=url,
install_requires=[
- "click",
"dtoolcore>=2.4.0",
],
entry_points={
|
Remove click requirment from setup.py
|
diff --git a/aiocqhttp/__init__.py b/aiocqhttp/__init__.py
index <HASH>..<HASH> 100644
--- a/aiocqhttp/__init__.py
+++ b/aiocqhttp/__init__.py
@@ -183,6 +183,9 @@ class CQHttp:
def run(self, host=None, port=None, *args, **kwargs):
self._server_app.run(host=host, port=port, *args, **kwargs)
+ async def call_action(self, action: str, **params) -> Any:
+ return await self._api.call_action(action=action, **params)
+
def __getattr__(self, item) -> Callable:
return self._api.__getattr__(item)
|
Add proxy for "call_action" method in CQHttp
|
diff --git a/Form/Type/SecurityRolesType.php b/Form/Type/SecurityRolesType.php
index <HASH>..<HASH> 100644
--- a/Form/Type/SecurityRolesType.php
+++ b/Form/Type/SecurityRolesType.php
@@ -57,7 +57,7 @@ class SecurityRolesType extends AbstractType
});
// POST METHOD
- $formBuilder->addEventListener(FormEvents::PRE_BIND, function(FormEvent $event) use ($transformer) {
+ $formBuilder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($transformer) {
$transformer->setOriginalRoles($event->getForm()->getData());
});
|
Fix deprecated FormEvents::PRE_BIND usage
|
diff --git a/lib/wiselinks/rendering.rb b/lib/wiselinks/rendering.rb
index <HASH>..<HASH> 100644
--- a/lib/wiselinks/rendering.rb
+++ b/lib/wiselinks/rendering.rb
@@ -7,7 +7,9 @@ module Wiselinks
protected
- def render_with_wiselinks(options = {}, *args, &block)
+ def render_with_wiselinks(*args)
+ options = _normalize_render(*args)
+
if self.request.wiselinks?
self.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
self.headers['Pragma'] = 'no-cache'
@@ -29,7 +31,7 @@ module Wiselinks
end
end
- self.render_without_wiselinks(options, args, &block)
+ self.render_without_wiselinks(options)
end
end
end
|
#4 undefined method for :check:Symbol
|
diff --git a/pylibdmtx/pylibdmtx.py b/pylibdmtx/pylibdmtx.py
index <HASH>..<HASH> 100644
--- a/pylibdmtx/pylibdmtx.py
+++ b/pylibdmtx/pylibdmtx.py
@@ -195,7 +195,12 @@ def decode(image, timeout=None, gap_size=None, shrink=1, shape=None,
elif 'numpy.ndarray' in str(type(image)):
if 'uint8' != str(image.dtype):
image = image.astype('uint8')
- pixels = image.tobytes()
+ try:
+ pixels = image.tobytes()
+ except AttributeError:
+ # `numpy.ndarray.tobytes()` introduced in `numpy` 1.9.0 - use the
+ # older `tostring` method.
+ pixels = image.tostring()
height, width = image.shape[:2]
else:
# image should be a tuple (pixels, width, height)
|
[#9] Reinstate numpy version check
|
diff --git a/lib/dpl/ctx/bash.rb b/lib/dpl/ctx/bash.rb
index <HASH>..<HASH> 100644
--- a/lib/dpl/ctx/bash.rb
+++ b/lib/dpl/ctx/bash.rb
@@ -410,9 +410,9 @@ module Dpl
`git log #{git_sha} -n 1 --pretty=%ae`.chomp
end
- # Whether or not the git working directory is dirty
+ # Whether or not the git working directory is dirty or has new or deleted files
def git_dirty?
- !Kernel.system('git diff --quiet')
+ !`git status --short`.chomp.empty?
end
# Returns the output of `git log`, using the given args.
|
do not skip if new or only deleted files are present
|
diff --git a/gutenberg/gutenberg.py b/gutenberg/gutenberg.py
index <HASH>..<HASH> 100644
--- a/gutenberg/gutenberg.py
+++ b/gutenberg/gutenberg.py
@@ -192,32 +192,3 @@ class EText(ORM_BASE):
title=self.title,
path=self.path,
))
-
-
-def _main():
- """This function implements the main/script/command-line functionality of
- the module and will be called from the `if __name__ == '__main__':` block.
-
- """
- import gutenberg.common.cliutil as cliutil
-
- doc = 'command line utilities to manage the Project Gutenberg corpus'
- parser = cliutil.ArgumentParser(description=doc)
- parser.add_argument('configfile', type=str, nargs='?',
- help='path to corpus configuration file')
- parser.add_argument('--download', action='store_true',
- help='download more etexts')
- parser.add_argument('--persist', action='store_true',
- help='persist meta-data of etexts to database')
-
- with parser.parse_args() as args:
- corpus = (GutenbergCorpus() if args.configfile is None
- else GutenbergCorpus.using_config(args.configfile))
- if args.download:
- corpus.download()
- if args.persist:
- corpus.persist()
-
-
-if __name__ == '__main__':
- _main()
|
Remove CLI functionality - use as module only
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,7 @@
-from pip.req import parse_requirements
+try: # for pip >= 10
+ from pip._internal.req import parse_requirements
+except ImportError: # for pip <= 9.0.3
+ from pip.req import parse_requirements
from setuptools import setup
from setuptools import find_packages
|
pip <I> support.
|
diff --git a/src/decorators/on.js b/src/decorators/on.js
index <HASH>..<HASH> 100644
--- a/src/decorators/on.js
+++ b/src/decorators/on.js
@@ -38,10 +38,12 @@ export default function on(eventDomain) {
let eventHandler = Eventhandler.create({
events: domNode.$appDecorators.on.events,
element: domNode,
+ bind: domNode,
});
// define namespace for eventhandler
- domNode.$ ? null : domNode.$ = { eventHandler };
+ domNode.$ ? null : domNode.$ = {};
+ domNode.$.eventHandler = eventHandler;
});
diff --git a/src/decorators/view.js b/src/decorators/view.js
index <HASH>..<HASH> 100644
--- a/src/decorators/view.js
+++ b/src/decorators/view.js
@@ -47,7 +47,8 @@ function view(template, templateName = 'base') {
});
// define namespace for view
- domNode.$ ? null : domNode.$ = { view };
+ domNode.$ ? null : domNode.$ = {};
+ domNode.$.view = view;
// render view
domNode.$.view.render();
|
Bugfix: it was not a good idea to use the shortform of object assigning, see {n}th pre commit
|
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/RunCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/RunCommand.java
index <HASH>..<HASH> 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/RunCommand.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/RunCommand.java
@@ -92,7 +92,7 @@ public class RunCommand extends OptionParsingCommand {
if (this.runner != null) {
throw new RuntimeException(
- "Already running. Please stop the current application before running another.");
+ "Already running. Please stop the current application before running another (use the 'stop' command).");
}
SourceOptions sourceOptions = new SourceOptions(options);
|
Add hint to user about 'stop' command
Improves gh-<I>
|
diff --git a/test/rngout/main.go b/test/rngout/main.go
index <HASH>..<HASH> 100644
--- a/test/rngout/main.go
+++ b/test/rngout/main.go
@@ -23,12 +23,12 @@ package main
import (
"bufio"
- "github.com/skarllot/raiqub"
+ "github.com/skarllot/raiqub/crypt"
"os"
)
func main() {
- rng := raiqub.NewRandom()
+ rng := crypt.NewRandom()
scanner := bufio.NewScanner(rng)
sout := bufio.NewWriter(os.Stdout)
|
Fixed rngout test to match last changes
|
diff --git a/telethon/client/downloads.py b/telethon/client/downloads.py
index <HASH>..<HASH> 100644
--- a/telethon/client/downloads.py
+++ b/telethon/client/downloads.py
@@ -962,7 +962,7 @@ class DownloadMethods:
f = file
try:
- with aiohttp.ClientSession() as session:
+ async with aiohttp.ClientSession() as session:
# TODO Use progress_callback; get content length from response
# https://github.com/telegramdesktop/tdesktop/blob/c7e773dd9aeba94e2be48c032edc9a78bb50234e/Telegram/SourceFiles/ui/images.cpp#L1318-L1319
async with session.get(web.url) as response:
|
Add missing async when downloading from URL (#<I>)
|
diff --git a/src/ol/Geolocation.js b/src/ol/Geolocation.js
index <HASH>..<HASH> 100644
--- a/src/ol/Geolocation.js
+++ b/src/ol/Geolocation.js
@@ -1,7 +1,6 @@
/**
* @module ol/Geolocation
*/
-import {inherits} from './util.js';
import GeolocationProperty from './GeolocationProperty.js';
import BaseObject, {getChangeEventType} from './Object.js';
import {listen} from './events.js';
@@ -44,10 +43,9 @@ import {get as getProjection, getTransformFromProjections, identityTransform} fr
* });
*
* @fires error
- * @extends {module:ol/Object}
* @api
*/
-class Geolocation {
+class Geolocation extends BaseObject {
/**
* @param {module:ol/Geolocation~Options=} opt_options Options.
@@ -100,7 +98,7 @@ class Geolocation {
*/
disposeInternal() {
this.setTracking(false);
- BaseObject.prototype.disposeInternal.call(this);
+ super.disposeInternal();
}
/**
@@ -333,7 +331,5 @@ class Geolocation {
}
}
-inherits(Geolocation, BaseObject);
-
export default Geolocation;
|
Use extends and super for Geolocation
|
diff --git a/src/Norm/Filter/Filter.php b/src/Norm/Filter/Filter.php
index <HASH>..<HASH> 100644
--- a/src/Norm/Filter/Filter.php
+++ b/src/Norm/Filter/Filter.php
@@ -157,7 +157,8 @@ class Filter
$innerMethodName = 'filter'.strtoupper($method[0]).substr($method, 1);
if (method_exists($this, $innerMethodName)) {
$method = $innerMethodName;
- $data[$k] = $this->$method($k, $data[$k], $data, $args);
+ $val = (isset($data[$k])) ? $data[$k] : null;
+ $data[$k] = $this->$method($k, $val, $data, $args);
} elseif (isset(static::$registries[$method]) && is_callable(static::$registries[$method])) {
$method = static::$registries[$method];
$data[$k] = call_user_func($method, $data[$k], $data, $args);
|
fixed empty post submission caused error for Filter
|
diff --git a/multi_form_view/base.py b/multi_form_view/base.py
index <HASH>..<HASH> 100644
--- a/multi_form_view/base.py
+++ b/multi_form_view/base.py
@@ -2,7 +2,6 @@
Django class based views for using more than one Form or ModelForm in a single view.
"""
from django.http import HttpResponseRedirect
-from django.shortcuts import render
from django.views.generic import FormView
import six
@@ -32,15 +31,13 @@ class MultiFormView(FormView):
"""
Renders a response containing the form errors.
"""
- context = self.get_context_data(forms=forms)
- return render(self.request, self.template_name, context)
+ return self.render_to_response(self.get_context_data(forms=forms))
- def get(self, request, **kwargs):
+ def get(self, request, *args, **kwargs):
"""
- Render the forms.
+ Handles GET requests and instantiates blank versions of the forms.
"""
- context = self.get_context_data()
- return render(request, self.template_name, context=context)
+ return self.render_to_response(self.get_context_data())
def get_context_data(self, **kwargs):
"""
|
prefer render_to_response over render
Matches FormView --> ProcessFormView implementation
and allows other rendering implementations
|
diff --git a/src/Illuminate/Support/ViewErrorBag.php b/src/Illuminate/Support/ViewErrorBag.php
index <HASH>..<HASH> 100644
--- a/src/Illuminate/Support/ViewErrorBag.php
+++ b/src/Illuminate/Support/ViewErrorBag.php
@@ -10,6 +10,17 @@ class ViewErrorBag implements Countable {
* @var array
*/
protected $bags = [];
+
+ /**
+ * Checks if a MessageBag exists.
+ *
+ * @param string $key
+ * @return boolean
+ */
+ public function hasBag($key = "default")
+ {
+ return isset($this->bags[$key]);
+ }
/**
* Get a MessageBag instance from the bags.
|
Add method hasBag to ViewErrorBag
When redirecting withErrors($validator) the edit form can show individual messages. But to show a generic message, something like: please check the red marked field below I don't know anything else but to flash a extra variable. This method would remedy that. Now I could check: $errors->hasBag() to see if the form is a redirect from a post with a errors message bag or a first get for input.
|
diff --git a/gns3server/compute/docker/docker_vm.py b/gns3server/compute/docker/docker_vm.py
index <HASH>..<HASH> 100644
--- a/gns3server/compute/docker/docker_vm.py
+++ b/gns3server/compute/docker/docker_vm.py
@@ -361,7 +361,7 @@ class DockerVM(BaseNode):
try:
yield from self._add_ubridge_connection(nio, adapter_number)
except UbridgeNamespaceError:
- log.error("Container {} failed to start", self.name)
+ log.error("Container %s failed to start", self.name)
yield from self.stop()
# The container can crash soon after the start, this means we can not move the interface to the container namespace
|
Fix an error when logging Docker container fail to start
|
diff --git a/src/Drivers/JsonDriver.php b/src/Drivers/JsonDriver.php
index <HASH>..<HASH> 100644
--- a/src/Drivers/JsonDriver.php
+++ b/src/Drivers/JsonDriver.php
@@ -18,7 +18,7 @@ class JsonDriver implements Driver
throw new CantBeSerialized('Resources can not be serialized to json');
}
- return json_encode($data, JSON_PRETTY_PRINT).PHP_EOL;
+ return json_encode($data, JSON_PRETTY_PRINT)."\n";
}
public function extension(): string
@@ -29,7 +29,7 @@ class JsonDriver implements Driver
public function match($expected, $actual)
{
if (is_array($actual)) {
- $actual = json_encode($actual, JSON_PRETTY_PRINT).PHP_EOL;
+ $actual = json_encode($actual, JSON_PRETTY_PRINT)."\n";
}
Assert::assertJsonStringEqualsJsonString($expected, $actual);
|
Fix inconsistent EOLs in JSON snapshots on Windows
It replaces OS dependent `PHP_EOL` with `\n`.
`json_encode` with `JSON_PRETTY_PRINT` flag always use `\n` regardless of OS, but `PHP_EOL` yields `\r\n` on Windows causing inconsistent line ends and unnecessary diff for git, if files are regenerated.
|
diff --git a/openquake/hazardlib/lt.py b/openquake/hazardlib/lt.py
index <HASH>..<HASH> 100644
--- a/openquake/hazardlib/lt.py
+++ b/openquake/hazardlib/lt.py
@@ -773,15 +773,13 @@ class CompositeLogicTree(object):
"""
def __init__(self, branchsets):
self.branchsets = branchsets
- self.shortener = {}
attach_to_branches(branchsets)
nb = len(branchsets)
paths = []
for bsno, bset in enumerate(branchsets):
for brno, br in enumerate(bset.branches):
- self.shortener[bsno, br.branch_id] = char = BASE64[brno]
path = ['*'] * nb
- path[bsno] = char
+ path[bsno] = br.short_id = BASE64[brno]
paths.append(''.join(path))
self.basepaths = paths
@@ -790,7 +788,7 @@ class CompositeLogicTree(object):
ordinal = 0
for weight, branches in self.branchsets[0].enumerate_paths():
value = [br.value for br in branches]
- lt_path = ''.join(branch.branch_id for branch in branches)
+ lt_path = ''.join(branch.short_id for branch in branches)
yield Realization(value, weight, ordinal, lt_path.ljust(nb, '.'))
ordinal += 1
|
Added .short_id
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,5 @@
$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'acme_client'
+require 'acme-client'
require 'rspec'
require 'vcr'
@@ -9,6 +9,9 @@ require 'webrick'
module TestHelper
def generate_private_key
OpenSSL::PKey::RSA.new(2048)
+ rescue OpenSSL::PKey::RSAError # Try again
+ sleep(0.05)
+ OpenSSL::PKey::RSA.new(2048)
end
def generate_csr(common_name, private_key)
@@ -33,7 +36,7 @@ module TestHelper
def serve_once(body)
dev_null = Logger.new(StringIO.new)
- server = WEBrick::HTTPServer.new(:Port => 5001, :Logger => dev_null, :AccessLog => dev_null)
+ server = WEBrick::HTTPServer.new(:Port => 5002, :Logger => dev_null, :AccessLog => dev_null)
thread = Thread.new do
server.mount_proc('/') do |_, response|
|
Try again when failing to generate RSA key
|
diff --git a/Resources/public/js/MMMediaBundle.js b/Resources/public/js/MMMediaBundle.js
index <HASH>..<HASH> 100644
--- a/Resources/public/js/MMMediaBundle.js
+++ b/Resources/public/js/MMMediaBundle.js
@@ -275,10 +275,7 @@ function MMMediaBundleFileDropzoneInitiateEvents() {
}
-/**
- * Start loading the dom is rdy
- */
-MMMediaBundleDomReady(function (event) {
+var MMMediaBundleInit = function (event) {
var elements = document.getElementsByClassName('mmmb-dropzone');
@@ -333,4 +330,10 @@ MMMediaBundleDomReady(function (event) {
MMMediaBundleFileDropzoneInitiateEvents();
-});
\ No newline at end of file
+};
+
+
+/**
+ * Start loading the dom is rdy
+ */
+MMMediaBundleDomReady(MMMediaBundleInit);
\ No newline at end of file
|
Callback event moved into a separate function -> MMMediaBundleInit
|
diff --git a/src/engine/engine-state.js b/src/engine/engine-state.js
index <HASH>..<HASH> 100644
--- a/src/engine/engine-state.js
+++ b/src/engine/engine-state.js
@@ -231,7 +231,7 @@ export class EngineState {
let i = 0
const servers = this.pluginState
- .sortStratumServers(this.io.Socket !== null, this.io.TLSSocket !== null)
+ .sortStratumServers(this.io.Socket != null, this.io.TLSSocket != null)
.filter(uri => !this.connections[uri])
while (Object.keys(this.connections).length < 5) {
const uri = servers[i++]
@@ -260,10 +260,14 @@ export class EngineState {
)
if (this.engineStarted) this.refillServers()
if (this.addressCacheDirty) {
- this.saveAddressCache().catch(e => console.error('saveAddressCache', e.message))
+ this.saveAddressCache().catch(e =>
+ console.error('saveAddressCache', e.message)
+ )
}
if (this.txCacheDirty) {
- this.saveTxCache().catch(e => console.error('saveTxCache', e.message))
+ this.saveTxCache().catch(e =>
+ console.error('saveTxCache', e.message)
+ )
}
},
|
Do not crash when TLS is unavailable
|
diff --git a/nomad/structs/diff.go b/nomad/structs/diff.go
index <HASH>..<HASH> 100644
--- a/nomad/structs/diff.go
+++ b/nomad/structs/diff.go
@@ -79,10 +79,6 @@ func (j *Job) Diff(other *Job, contextual bool) (*JobDiff, error) {
oldPrimitiveFlat = flatmap.Flatten(j, filter, true)
diff.ID = j.ID
} else {
- if !reflect.DeepEqual(j, other) {
- diff.Type = DiffTypeEdited
- }
-
if j.ID != other.ID {
return nil, fmt.Errorf("can not diff jobs with different IDs: %q and %q", j.ID, other.ID)
}
@@ -130,6 +126,20 @@ func (j *Job) Diff(other *Job, contextual bool) (*JobDiff, error) {
diff.Objects = append(diff.Objects, pDiff)
}
+ // If the job is not a delete or add, determine if there are edits.
+ if diff.Type == DiffTypeNone {
+ tgEdit := false
+ for _, tg := range diff.TaskGroups {
+ if tg.Type != DiffTypeNone {
+ tgEdit = true
+ break
+ }
+ }
+ if tgEdit || len(diff.Fields)+len(diff.Objects) != 0 {
+ diff.Type = DiffTypeEdited
+ }
+ }
+
return diff, nil
}
|
Fix determining whether a job is edited
|
diff --git a/app/assets/javascripts/thin_man.js b/app/assets/javascripts/thin_man.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/thin_man.js
+++ b/app/assets/javascripts/thin_man.js
@@ -130,6 +130,10 @@ var initThinMan = function(){
$(this.emptyOnSuccess()).empty();
}
}
+ if ($.contains(document, this.jq_obj[0])) {
+ this.jq_obj.find('.error').removeClass('error')
+ this.jq_obj.find('.help-inline').remove()
+ }
},
ajaxComplete: function(jqXHR) {
this.showTrigger();
diff --git a/lib/thin_man/version.rb b/lib/thin_man/version.rb
index <HASH>..<HASH> 100644
--- a/lib/thin_man/version.rb
+++ b/lib/thin_man/version.rb
@@ -1,3 +1,3 @@
module ThinMan
- VERSION = "0.12.0"
+ VERSION = "0.12.1"
end
|
remove error class and inline-help after successful response
|
diff --git a/lib/dm-core/adapters/data_objects_adapter.rb b/lib/dm-core/adapters/data_objects_adapter.rb
index <HASH>..<HASH> 100644
--- a/lib/dm-core/adapters/data_objects_adapter.rb
+++ b/lib/dm-core/adapters/data_objects_adapter.rb
@@ -551,7 +551,7 @@ module DataMapper
Query::Conditions::Comparison.new(:lt, comparison.property, value.last)
)
- statement, bind_values = operation_statement(operation, qualify)
+ statement, bind_values = conditions_statement(operation, qualify)
return "(#{statement})", bind_values
end
|
Condition statement construction should be controlled by conditions_statement
|
diff --git a/js/tests/unit/wee.dom.js b/js/tests/unit/wee.dom.js
index <HASH>..<HASH> 100644
--- a/js/tests/unit/wee.dom.js
+++ b/js/tests/unit/wee.dom.js
@@ -304,6 +304,10 @@ define(function(require) {
'Closest element was not identified'
);
+ assert.strictEqual(Wee.$closest('#inner', '#inner').length, 1,
+ 'Closest element was not identified'
+ );
+
assert.isArray(Wee.$closest('#inner', '#container'),
'Closest element was identified successfully'
);
|
Add test to $closest method
|
diff --git a/CmsManager/CmsSnapshotManager.php b/CmsManager/CmsSnapshotManager.php
index <HASH>..<HASH> 100644
--- a/CmsManager/CmsSnapshotManager.php
+++ b/CmsManager/CmsSnapshotManager.php
@@ -11,7 +11,6 @@
namespace Sonata\PageBundle\CmsManager;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\Templating\EngineInterface;
use Symfony\Component\HttpFoundation\Response;
@@ -190,7 +189,7 @@ class CmsSnapshotManager extends BaseCmsPageManager
$snapshot = $this->getPageManager()->findEnableSnapshot($parameters);
if (!$snapshot) {
- throw new NotFoundHttpException(sprintf('Unable to find the snapshot : %s', $value));
+ return false;
}
$page = new SnapshotPageProxy($this->getPageManager(), $snapshot);
|
Remove <I> from the CmsSnapshotManager
|
diff --git a/gunicorn_console.py b/gunicorn_console.py
index <HASH>..<HASH> 100755
--- a/gunicorn_console.py
+++ b/gunicorn_console.py
@@ -125,19 +125,23 @@ def handle_keypress(screen):
move_selection(reverse=True)
elif key in ("A", "+"):
send_signal("TTIN")
- gunicorns[selected_pid]["workers"] = 0
- elif key in ("W", "-"):
- if gunicorns[selected_pid]["workers"] != 1:
- send_signal("TTOU")
+ if selected_pid in gunicorns:
gunicorns[selected_pid]["workers"] = 0
+ elif key in ("W", "-"):
+ if selected_pid in gunicorns:
+ if gunicorns[selected_pid]["workers"] != 1:
+ send_signal("TTOU")
+ gunicorns[selected_pid]["workers"] = 0
elif key in ("R",):
- send_signal("HUP")
- del gunicorns[selected_pid]
- selected_pid = None
+ if selected_pid in gunicorns:
+ send_signal("HUP")
+ del gunicorns[selected_pid]
+ selected_pid = None
elif key in ("M", "-"):
- send_signal("QUIT")
- del gunicorns[selected_pid]
- selected_pid = None
+ if selected_pid in gunicorns:
+ send_signal("QUIT")
+ del gunicorns[selected_pid]
+ selected_pid = None
elif key in ("Q",):
raise KeyboardInterrupt
|
Add more "no gunicorn selected" protection.
Trying a command before cursoring into a selection was aborting.
|
diff --git a/component-1-util-1-object.js b/component-1-util-1-object.js
index <HASH>..<HASH> 100644
--- a/component-1-util-1-object.js
+++ b/component-1-util-1-object.js
@@ -161,7 +161,7 @@ _cs.clone = function (source, continue_recursion) {
/* helper functions */
var myself = arguments.callee;
var clone_func = function (f, continue_recursion) {
- var g = function () {
+ var g = function ComponentJS_function_clone () {
return f.apply(this, arguments);
};
g.prototype = f.prototype;
|
function clones occur in stack traces, so give the function clone a ComponentJS-indicating name
|
diff --git a/src/utils.js b/src/utils.js
index <HASH>..<HASH> 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -23,8 +23,8 @@ exports.serverFromURL = function(url) {
parts.host = parts.host.split(':');
sagRes = exports.server(
- parts.host.shift(),
- parts.host.shift() || (useSSL) ? 443 : 80,
+ parts.host[0],
+ parts.host[1] || ((useSSL) ? 443 : 80),
useSSL);
//log the user in (if provided)
|
Fixing ternary in c5a<I>f0ba0dc<I>cf<I>cd<I>bd4dd<I>ed3b (#<I>)
|
diff --git a/telethon/client/telegrambaseclient.py b/telethon/client/telegrambaseclient.py
index <HASH>..<HASH> 100644
--- a/telethon/client/telegrambaseclient.py
+++ b/telethon/client/telegrambaseclient.py
@@ -433,6 +433,9 @@ class TelegramBaseClient(abc.ABC):
if not sender:
sender = await self._create_exported_sender(dc_id)
sender.dc_id = dc_id
+ elif not n:
+ dc = await self._get_dc(dc_id)
+ await sender.connect(dc.ip_address, dc.port)
self._borrowed_senders[dc_id] = (n + 1, sender)
@@ -447,12 +450,10 @@ class TelegramBaseClient(abc.ABC):
dc_id = sender.dc_id
n, _ = self._borrowed_senders[dc_id]
n -= 1
- if n > 0:
- self._borrowed_senders[dc_id] = (n, sender)
- else:
+ self._borrowed_senders[dc_id] = (n, sender)
+ if not n:
__log__.info('Disconnecting borrowed sender for DC %d', dc_id)
await sender.disconnect()
- del self._borrowed_senders[dc_id]
async def _get_cdn_client(self, cdn_redirect):
"""Similar to ._borrow_exported_client, but for CDNs"""
|
Assume exported auths last forever
This implies that export senders will NOT be deleted from
memory once all borrows are returned, thus their auth_key
remains as well. When borrowing them if they existed they
will be connect()ed if it's the first borrow.
This probably fixes #<I>.
|
diff --git a/superset/assets/javascripts/dashboard/reducers.js b/superset/assets/javascripts/dashboard/reducers.js
index <HASH>..<HASH> 100644
--- a/superset/assets/javascripts/dashboard/reducers.js
+++ b/superset/assets/javascripts/dashboard/reducers.js
@@ -39,16 +39,21 @@ export function getInitialState(bootstrapData) {
dashboard.posDict[position.slice_id] = position;
});
}
- dashboard.slices.forEach((slice, index) => {
+ const lastRowId = Math.max.apply(null,
+ dashboard.position_json.map(pos => (pos.row + pos.size_y)));
+ let newSliceCounter = 0;
+ dashboard.slices.forEach((slice) => {
const sliceId = slice.slice_id;
let pos = dashboard.posDict[sliceId];
if (!pos) {
+ // append new slices to dashboard bottom, 3 slices per row
pos = {
- col: (index * 4 + 1) % 12,
- row: Math.floor((index) / 3) * 4,
- size_x: 4,
- size_y: 4,
+ col: (newSliceCounter % 3) * 16 + 1,
+ row: lastRowId + Math.floor(newSliceCounter / 3) * 16,
+ size_x: 16,
+ size_y: 16,
};
+ newSliceCounter++;
}
dashboard.layout.push({
|
for <I> columns layout, adjust default size and layout for newly added slices (#<I>)
|
diff --git a/cereslib/_version.py b/cereslib/_version.py
index <HASH>..<HASH> 100644
--- a/cereslib/_version.py
+++ b/cereslib/_version.py
@@ -1,2 +1,2 @@
# Versions compliant with PEP 440 https://www.python.org/dev/peps/pep-0440
-__version__ = "0.1.13"
+__version__ = "0.1.14"
|
Update version number to <I>
|
diff --git a/lib/chore/queues/filesystem/publisher.rb b/lib/chore/queues/filesystem/publisher.rb
index <HASH>..<HASH> 100644
--- a/lib/chore/queues/filesystem/publisher.rb
+++ b/lib/chore/queues/filesystem/publisher.rb
@@ -25,12 +25,11 @@ module Chore
begin
f.write(job.to_json)
rescue StandardError => e
- Chore.logger.error "#{e.class.name}: #{e.message}. Could not write #{job[:class]} job to #{queue_name} file.\n#{e.stacktrace}"
- raise e
+ Chore.logger.error "#{e.class.name}: #{e.message}. Could not write #{job[:class]} job to '#{queue_name}' queue file.\n#{e.backtrace}"
ensure
f.flock(File::LOCK_UN)
- break
end
+ break
end
end
end
|
Remove ambiguous control-flow in error handling
The 'break' in the ensure block actually aborts the bubbling of errors
to higher level code. So even though we don't explicitly catch errors,
they are still swallowed.
|
diff --git a/src/ZfcUser/Controller/UserController.php b/src/ZfcUser/Controller/UserController.php
index <HASH>..<HASH> 100644
--- a/src/ZfcUser/Controller/UserController.php
+++ b/src/ZfcUser/Controller/UserController.php
@@ -156,7 +156,11 @@ class UserController extends AbstractActionController
// redirect to the login redirect route
return $this->redirect()->toRoute($this->getOptions()->getLoginRedirectRoute());
}
-
+ // if registration is disabled
+ if (!$this->getOptions()->getEnableRegistration()) {
+ return array('enableRegistration' => false);
+ }
+
$request = $this->getRequest();
$service = $this->getUserService();
$form = $this->getRegisterForm();
|
Update src/ZfcUser/Controller/UserController.php
The view was only place where was checked if registration was
disabled. Sending post data would still register new user.
|
diff --git a/output/html/languages.php b/output/html/languages.php
index <HASH>..<HASH> 100644
--- a/output/html/languages.php
+++ b/output/html/languages.php
@@ -77,7 +77,11 @@ class QM_Output_Html_Languages extends QM_Output_Html {
echo '<td class="qm-ltr">';
if ( $mofile['file'] ) {
- echo esc_html( QM_Util::standard_dir( $mofile['file'], '' ) );
+ if ( 'jed' === $mofile['type'] && self::has_clickable_links() ) {
+ echo self::output_filename( QM_Util::standard_dir( $mofile['file'], '' ), $mofile['file'], 1, true ); // WPCS: XSS ok.
+ } else {
+ echo esc_html( QM_Util::standard_dir( $mofile['file'], '' ) );
+ }
} else {
echo '<em>' . esc_html__( 'None', 'query-monitor' ) . '</em>';
}
|
Allow JED translation file paths to be clickable.
|
diff --git a/tests/src/test/java/alluxio/master/file/FileSystemMasterIntegrationTest.java b/tests/src/test/java/alluxio/master/file/FileSystemMasterIntegrationTest.java
index <HASH>..<HASH> 100644
--- a/tests/src/test/java/alluxio/master/file/FileSystemMasterIntegrationTest.java
+++ b/tests/src/test/java/alluxio/master/file/FileSystemMasterIntegrationTest.java
@@ -119,6 +119,9 @@ public class FileSystemMasterIntegrationTest {
}
}
+ /*
+ * This class provides multiple concurrent threads to free all files in one directory.
+ */
class ConcurrentFreer implements Callable<Void> {
private int mDepth;
private int mConcurrencyDepth;
@@ -173,7 +176,9 @@ public class FileSystemMasterIntegrationTest {
}
}
}
-
+ /*
+ * This class provides multiple concurrent threads to delete all files in one directory.
+ */
class ConcurrentDeleter implements Callable<Void> {
private int mDepth;
private int mConcurrencyDepth;
|
[SMALLFIX] Add comments in ConcurrentFree test.
|
diff --git a/HISTORY.rst b/HISTORY.rst
index <HASH>..<HASH> 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,11 @@
History
-------
+0.5.2 (2015-10-22)
+------------------
+
+* added `management` to `MANIFEST.in`
+
0.5.1 (2015-10-22)
------------------
diff --git a/liquimigrate/__init__.py b/liquimigrate/__init__.py
index <HASH>..<HASH> 100644
--- a/liquimigrate/__init__.py
+++ b/liquimigrate/__init__.py
@@ -3,4 +3,4 @@
__author__ = 'Marek Wywiał'
__email__ = 'onjinx@gmail.com'
-__version__ = '0.5.1'
+__version__ = '0.5.2'
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ test_requirements = [
setup(
name='liquimigrate',
- version='0.5.1',
+ version='0.5.2',
description="Liquibase migrations with django",
long_description=readme + '\n\n' + history,
author="Marek Wywiał",
|
Bumped version to <I>
|
diff --git a/lib/cocoapods-deploy/deploy_transformer.rb b/lib/cocoapods-deploy/deploy_transformer.rb
index <HASH>..<HASH> 100644
--- a/lib/cocoapods-deploy/deploy_transformer.rb
+++ b/lib/cocoapods-deploy/deploy_transformer.rb
@@ -3,10 +3,12 @@ module Pod
attr_accessor :lockfile
attr_accessor :sandbox
+ attr_accessor :metadata
def initialize(lockfile, sandbox)
@lockfile = lockfile
@sandbox = sandbox
+ @metadata = Source::Metadata.new({'prefix_lengths' => [1, 1, 1]})
end
def transform_podfile(podfile)
@@ -64,7 +66,8 @@ module Pod
end
def podspec_url(pod, version)
- "{root-url}/#{pod}/#{version}/#{pod}"
+ path_fragment = metadata.path_fragment(pod)
+ "{root-url}/#{path_fragment}/#{version}/#{pod}"
end
def collect_podspec_dependencies(name_or_hash)
|
Compatibility with the new CocoaPods Spec layout
|
diff --git a/gcsio/src/test/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageFileSystemIntegrationTest.java b/gcsio/src/test/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageFileSystemIntegrationTest.java
index <HASH>..<HASH> 100644
--- a/gcsio/src/test/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageFileSystemIntegrationTest.java
+++ b/gcsio/src/test/java/com/google/cloud/hadoop/gcsio/GoogleCloudStorageFileSystemIntegrationTest.java
@@ -209,12 +209,12 @@ public class GoogleCloudStorageFileSystemIntegrationTest {
"stale file? testStartTime: %s, fileCreationTime: %s",
testStartTime, fileCreationTime)
.that(fileCreationTime)
- .isGreaterThan(testStartTime);
+ .isAtLeast(testStartTime);
assertWithMessage(
"unexpected creation-time: clock skew? currentTime: %s, fileCreationTime: %s",
currentTime, fileCreationTime)
.that(fileCreationTime)
- .isLessThan(currentTime);
+ .isAtMost(currentTime);
} else {
assertThat(fileInfo.getCreationTime()).isEqualTo(0);
}
|
Fix test flakiness.
Failed test example:
[]
|
diff --git a/lib/wupee/notifier.rb b/lib/wupee/notifier.rb
index <HASH>..<HASH> 100644
--- a/lib/wupee/notifier.rb
+++ b/lib/wupee/notifier.rb
@@ -77,16 +77,22 @@ module Wupee
end
end
+ notifications = []
+
notif_type_configs.each do |notif_type_config|
notification = Wupee::Notification.new(receiver: notif_type_config.receiver, notification_type: @notification_type, attached_object: @attached_object)
notification.is_read = true unless notif_type_config.wants_notification?
notification.save!
+ notifications << notification
+
subject_interpolations = interpolate_vars(@subject_vars, notification)
locals_interpolations = interpolate_vars(@locals, notification)
send_email(notification, subject_interpolations, locals_interpolations) if notif_type_config.wants_email?
end
+
+ notifications
end
private
|
Wupee::Notifier#execute method now returns an array of sent notifications
|
diff --git a/dev/io.openliberty.concurrent.cdi/src/io/openliberty/concurrent/cdi/interceptor/AsyncInterceptor.java b/dev/io.openliberty.concurrent.cdi/src/io/openliberty/concurrent/cdi/interceptor/AsyncInterceptor.java
index <HASH>..<HASH> 100644
--- a/dev/io.openliberty.concurrent.cdi/src/io/openliberty/concurrent/cdi/interceptor/AsyncInterceptor.java
+++ b/dev/io.openliberty.concurrent.cdi/src/io/openliberty/concurrent/cdi/interceptor/AsyncInterceptor.java
@@ -57,7 +57,7 @@ public class AsyncInterceptor implements Serializable {
Class<?> returnType = method.getReturnType();
if (!returnType.equals(CompletableFuture.class)
&& !returnType.equals(CompletionStage.class)
- && !returnType.equals(Void.class))
+ && !returnType.equals(Void.TYPE)) // void
throw new UnsupportedOperationException("@Asynchronous " + returnType.getName() + " " + method.getName()); // TODO NLS?
ManagedExecutorService executor;
|
Void.class is different from void
|
diff --git a/chess/pgn.py b/chess/pgn.py
index <HASH>..<HASH> 100644
--- a/chess/pgn.py
+++ b/chess/pgn.py
@@ -1597,7 +1597,10 @@ def read_game(handle: TextIO, *, Visitor: Any = GameBuilder) -> Any:
board.pop()
board_stack.append(board)
elif token == ")":
- if skip_variation_depth:
+ if skip_variation_depth == 1:
+ skip_variation_depth = 0
+ visitor.end_variation()
+ elif skip_variation_depth:
skip_variation_depth -= 1
elif len(board_stack) > 1:
visitor.end_variation()
|
Call matching end_variation while skipping (#<I>)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.