diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/hcl2template/types.packer_config.go b/hcl2template/types.packer_config.go
index <HASH>..<HASH> 100644
--- a/hcl2template/types.packer_config.go
+++ b/hcl2template/types.packer_config.go
@@ -155,6 +155,7 @@ func (c *PackerConfig) evaluateLocalVariable(local *Local) hcl.Diagnostics {
return diags
}
c.LocalVariables[local.Name] = &Variable{
+ Name: local.Name,
DefaultValue: value,
Type: value.Type(),
}
|
evaluateLocalVariable: also pass the variable name
|
diff --git a/Module.php b/Module.php
index <HASH>..<HASH> 100644
--- a/Module.php
+++ b/Module.php
@@ -17,6 +17,7 @@
*/
namespace Rcm;
+
use Zend\Mvc\MvcEvent;
use Zend\Mvc\ResponseSender\SendResponseEvent;
use Zend\Console\Request as ConsoleRequest;
@@ -55,6 +56,13 @@ class Module
return;
}
+ $siteInfo = $serviceManager->get('Rcm\Service\SiteManager')
+ ->getCurrentSiteInfo();
+ setlocale(
+ LC_ALL,
+ $siteInfo['language']['iso639_1'] . '_' . $siteInfo['country']['iso2']
+ );
+
//Add Domain Checker
$routeListener = $serviceManager->get('Rcm\EventListener\RouteListener');
|
Set php locale based on site country and language
|
diff --git a/tinymce/widgets.py b/tinymce/widgets.py
index <HASH>..<HASH> 100644
--- a/tinymce/widgets.py
+++ b/tinymce/widgets.py
@@ -34,6 +34,14 @@ logger.setLevel(20)
def language_file_exists(language_code):
+ """
+ Check if TinyMCE has a language file for the specified lang code
+
+ :param language_code: language code
+ :type language_code: str
+ :return: check result
+ :rtype: bool
+ """
filename = '{0}.js'.format(language_code)
path = os.path.join('tinymce', 'js', 'tinymce', 'langs', filename)
return finders.find(path) is not None
|
Add docstring for language_file_exists
|
diff --git a/lib/mobility/arel/nodes.rb b/lib/mobility/arel/nodes.rb
index <HASH>..<HASH> 100644
--- a/lib/mobility/arel/nodes.rb
+++ b/lib/mobility/arel/nodes.rb
@@ -5,10 +5,8 @@ module Mobility
class Unary < ::Arel::Nodes::Unary; end
class Binary < ::Arel::Nodes::Binary; end
class Grouping < ::Arel::Nodes::Grouping; end
- class Equality < ::Arel::Nodes::Equality; end
::Arel::Visitors::ToSql.class_eval do
- alias :visit_Mobility_Arel_Nodes_Equality :visit_Arel_Nodes_Equality
alias :visit_Mobility_Arel_Nodes_Grouping :visit_Arel_Nodes_Grouping
end
end
diff --git a/lib/mobility/arel/nodes/pg_ops.rb b/lib/mobility/arel/nodes/pg_ops.rb
index <HASH>..<HASH> 100644
--- a/lib/mobility/arel/nodes/pg_ops.rb
+++ b/lib/mobility/arel/nodes/pg_ops.rb
@@ -19,10 +19,6 @@ module Mobility
include ::Arel::OrderPredications
include ::Arel::AliasPredication
- def eq other
- Equality.new self, quoted_node(other)
- end
-
def lower
super self
end
|
Remove unused Mobility::Arel::Nodes::Equality
|
diff --git a/lib/xcodeproj/constants.rb b/lib/xcodeproj/constants.rb
index <HASH>..<HASH> 100644
--- a/lib/xcodeproj/constants.rb
+++ b/lib/xcodeproj/constants.rb
@@ -6,7 +6,7 @@ module Xcodeproj
# @return [String] The last known iOS SDK (stable).
#
- LAST_KNOWN_IOS_SDK = '6.1'
+ LAST_KNOWN_IOS_SDK = '7.0'
# @return [String] The last known OS X SDK (stable).
#
|
[Constants] Bump last known iOS version
|
diff --git a/aiogram/utils/parts.py b/aiogram/utils/parts.py
index <HASH>..<HASH> 100644
--- a/aiogram/utils/parts.py
+++ b/aiogram/utils/parts.py
@@ -15,12 +15,13 @@ def split_text(text: str, length: int = MAX_MESSAGE_LENGTH) -> typing.List[str]:
return [text[i:i + length] for i in range(0, len(text), length)]
-def safe_split_text(text: str, length: int = MAX_MESSAGE_LENGTH) -> typing.List[str]:
+def safe_split_text(text: str, length: int = MAX_MESSAGE_LENGTH, split_separator: str = ' ') -> typing.List[str]:
"""
Split long text
:param text:
:param length:
+ :param split_separator
:return:
"""
# TODO: More informative description
@@ -30,7 +31,7 @@ def safe_split_text(text: str, length: int = MAX_MESSAGE_LENGTH) -> typing.List[
while temp_text:
if len(temp_text) > length:
try:
- split_pos = temp_text[:length].rindex(' ')
+ split_pos = temp_text[:length].rindex(split_separator)
except ValueError:
split_pos = length
if split_pos < length // 4 * 3:
|
Update safe_split_text function, added split_separator param (#<I>)
|
diff --git a/Model/View/Asset/Image.php b/Model/View/Asset/Image.php
index <HASH>..<HASH> 100644
--- a/Model/View/Asset/Image.php
+++ b/Model/View/Asset/Image.php
@@ -99,7 +99,7 @@ class Image extends ImageModel
ScopeConfigInterface $scopeConfig,
ImageHelper $imageHelper,
StoreManagerInterface $storeManager,
- $filePath,
+ string $filePath,
array $miscParams
) {
$this->scopeConfig = $scopeConfig;
|
resolves compilation error caused by <I>aff<I>d<I>dda<I>d2d8bbfcbaccee<I>
specify type in phpdoc resolves error during compilation
|
diff --git a/src/function/abstract.js b/src/function/abstract.js
index <HASH>..<HASH> 100644
--- a/src/function/abstract.js
+++ b/src/function/abstract.js
@@ -33,7 +33,7 @@ define(
};
if (invocation) {
errorDetails.signature = invocation.signature;
- errorDetails.nonMatchingSignatures = invocation.nonMatchingImplementationSignatures;
+ errorDetails.nonMatchingSignatures = invocation.nonMatchingSignatures;
invocation.reset();
}
if (!errorDetails.signature) {
|
fixing reference to invocation.nonMatchingImplementationSignatures property to nonMatchingSignatures
|
diff --git a/app/transitions/explode.js b/app/transitions/explode.js
index <HASH>..<HASH> 100644
--- a/app/transitions/explode.js
+++ b/app/transitions/explode.js
@@ -6,17 +6,22 @@ import { Promise } from "liquid-fire";
// animations.
export default function explode(...pieces) {
- return Promise.all(pieces.map((piece) => {
+ var result = Promise.all(pieces.map((piece) => {
if (piece.matchBy) {
return matchAndExplode(this, piece);
} else {
return explodePiece(this, piece);
}
- })).then(() => {
- // The default transition guarantees that we didn't leave our
- // original new element invisible
- this.lookup('default').apply(this);
- });
+ }));
+
+ if (this.newElement) {
+ this.newElement.css({visibility: ''});
+ }
+ if (this.oldElement) {
+ this.oldElement.css({visibility: 'hidden'});
+ }
+
+ return result;
}
function explodePiece(context, piece) {
|
show new and hide old immediately after giving each exploded piece a
chance to animate
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -17,9 +17,6 @@
import re
import io
-import textwrap
-import sys
-import shutil
from setuptools import setup
@@ -63,12 +60,3 @@ setup(
'Programming Language :: Python'
]
)
-
-# Check that the pandoc-eqnos script is on the PATH
-if not shutil.which('pandoc-eqnos'):
- msg = """
- ERROR: `pandoc-eqnos` script not found. This will need to
- be corrected. If you need help, please file an Issue at
- https://github.com/tomduck/pandoc-eqnos/issues.\n"""
- print(textwrap.dedent(msg))
- sys.exit(-1)
|
Removed script check that was causing a developer pip error.
|
diff --git a/lib/core/Docs.js b/lib/core/Docs.js
index <HASH>..<HASH> 100644
--- a/lib/core/Docs.js
+++ b/lib/core/Docs.js
@@ -78,10 +78,12 @@ class Docs {
const previous = this.find(metadata.previous);
if (previous) {
metadata.previous_title = previous.title || 'Previous';
+ metadata.previous_sidebar_label = previous.sidebar_label || 'Previous';
}
const next = this.find(metadata.next);
if (next) {
metadata.next_title = next.title || 'Next';
+ metadata.next_sidebar_label = next.sidebar_label || 'Next';
}
});
}
|
prev | next sidebar_label
|
diff --git a/examples/14-recurring-first-payment.php b/examples/14-recurring-first-payment.php
index <HASH>..<HASH> 100644
--- a/examples/14-recurring-first-payment.php
+++ b/examples/14-recurring-first-payment.php
@@ -8,7 +8,7 @@ try
/*
* Initialize the Mollie API library with your API key or OAuth access token.
*/
- include "initialize.php";
+ require "initialize.php";
/*
* Retrieve the last created customer for this example.
|
Update <I>-recurring-first-payment.php
|
diff --git a/lib/utils/result-summary.js b/lib/utils/result-summary.js
index <HASH>..<HASH> 100644
--- a/lib/utils/result-summary.js
+++ b/lib/utils/result-summary.js
@@ -2,7 +2,7 @@
const CoreObject = require('core-object');
const chalk = require('chalk');
-const Table = require('cli-table2');
+const Table = require('cli-table3');
module.exports = CoreObject.extend({
print() {
|
Update require to cli-table3
|
diff --git a/tests/integration/test_install_twists.py b/tests/integration/test_install_twists.py
index <HASH>..<HASH> 100644
--- a/tests/integration/test_install_twists.py
+++ b/tests/integration/test_install_twists.py
@@ -92,7 +92,8 @@ setup(
assert "version" in pipenv_instance.lockfile["default"]["test-private-dependency"]
assert "0.1" in pipenv_instance.lockfile["default"]["test-private-dependency"]["version"]
- with PipenvInstance(pypi=pypi, chdir=True) as p:
+ with temp_environ(), PipenvInstance(pypi=pypi, chdir=True) as p:
+ os.environ['PIP_PROCESS_DEPENDENCY_LINKS'] = '1'
test_deplink(p, 'git+https://github.com/atzannes/[email protected]#egg=test-private-dependency-v0.1')
# with PipenvInstance(pypi=pypi, chdir=True) as p:
|
Enable dependency link processing
- Use `PIP_PROCESS_DEPENDENCY_LINKS` to toggle the processing of dependency links
|
diff --git a/src/Services/BaseFileService.php b/src/Services/BaseFileService.php
index <HASH>..<HASH> 100644
--- a/src/Services/BaseFileService.php
+++ b/src/Services/BaseFileService.php
@@ -767,11 +767,12 @@ abstract class BaseFileService extends BaseRestService implements FileServiceInt
);
$out[$key] = $tmp;
} else {
- $err[] = $name;
+ $err[$name] = $error;
}
}
if (!empty($err)) {
- $msg = 'Failed to upload the following files to folder ' . $this->folderPath . ': ' . implode(', ', $err);
+ $msg = 'Failed to upload the following files to folder ' . $this->folderPath . ': ' . implode(', ', array_keys($err)) .
+ '. Error codes are: ' . implode(', ', array_values($err)) . '. See https://www.php.net/manual/en/features.file-upload.errors.php';
throw new InternalServerErrorException($msg);
}
|
DP-<I> Windows IIS install File Upload does not work
- Show error codes for files uploading
|
diff --git a/loadConn.go b/loadConn.go
index <HASH>..<HASH> 100644
--- a/loadConn.go
+++ b/loadConn.go
@@ -38,6 +38,7 @@ type ChildSAConf struct {
CloseAction string `json:"close_action"`
ReqID string `json:"reqid"`
RekeyTime string `json:"rekey_time"`
+ ReplayWindow string `json:"replay_window,omitempty"`
Mode string `json:"mode"`
InstallPolicy string `json:"policies"`
UpDown string `json:"updown,omitempty"`
|
Adding replay_window to struct
|
diff --git a/tej/main.py b/tej/main.py
index <HASH>..<HASH> 100644
--- a/tej/main.py
+++ b/tej/main.py
@@ -36,8 +36,9 @@ def _setup(args):
def _submit(args):
- RemoteQueue(args.destination, args.queue).submit(
- args.id, args.directory, args.script)
+ job_id = RemoteQueue(args.destination, args.queue).submit(
+ args.id, args.directory, args.script)
+ print(job_id)
def _status(args):
diff --git a/tej/submission.py b/tej/submission.py
index <HASH>..<HASH> 100644
--- a/tej/submission.py
+++ b/tej/submission.py
@@ -413,6 +413,7 @@ class RemoteQueue(object):
job_id, target,
script))
logger.info("Submitted job %s", job_id)
+ return job_id
def status(self, job_id):
"""Gets the status of a previously-submitted job.
|
Makes 'submit' return the job identifier
This is both for the API (RemoteQueue#submit()) and the CLI
('tej submit').
|
diff --git a/gcsproxy/mutable_object.go b/gcsproxy/mutable_object.go
index <HASH>..<HASH> 100644
--- a/gcsproxy/mutable_object.go
+++ b/gcsproxy/mutable_object.go
@@ -48,6 +48,8 @@ type MutableObject struct {
// Mutable state
/////////////////////////
+ destroyed bool
+
// A record for the specific generation of the object from which our local
// state is branched.
src gcs.Object
@@ -139,6 +141,10 @@ func (mo *MutableObject) SourceGeneration() int64 {
// at appropriate times to help debug weirdness. Consider using
// syncutil.InvariantMutex to automate the process.
func (mo *MutableObject) CheckInvariants() {
+ if mo.destroyed {
+ return
+ }
+
// INVARIANT: atomic.LoadInt64(&sourceGeneration) == src.Generation
{
g := atomic.LoadInt64(&mo.sourceGeneration)
@@ -166,6 +172,8 @@ func (mo *MutableObject) CheckInvariants() {
// state. The MutableObject must not be used after calling this method,
// regardless of outcome.
func (mo *MutableObject) Destroy() (err error) {
+ mo.destroyed = true
+
// If we have no read/write lease, there's nothing to do.
if mo.readWriteLease == nil {
return
|
Don't check invariants for destroyed objects.
|
diff --git a/Kwf/Component/Events/ViewCache.php b/Kwf/Component/Events/ViewCache.php
index <HASH>..<HASH> 100644
--- a/Kwf/Component/Events/ViewCache.php
+++ b/Kwf/Component/Events/ViewCache.php
@@ -206,7 +206,7 @@ class Kwf_Component_Events_ViewCache extends Kwf_Component_Events
}
// namechanged and filnamechanged-events
- public function onPageChanged(Kwf_Component_Event_Page_ContentChanged $event)
+ public function onPageChanged(Kwf_Component_Event_Component_Abstract $event)
{
$this->_updates[] = array(
'type' => 'componentLink',
|
fix test: (File)Name_Cachend's parent class was changed
|
diff --git a/py/testdir_single_jvm_fvec/test_exec2_cbind_like_R.py b/py/testdir_single_jvm_fvec/test_exec2_cbind_like_R.py
index <HASH>..<HASH> 100644
--- a/py/testdir_single_jvm_fvec/test_exec2_cbind_like_R.py
+++ b/py/testdir_single_jvm_fvec/test_exec2_cbind_like_R.py
@@ -86,16 +86,6 @@ class Basic(unittest.TestCase):
execResult, result = h2e.exec_expr(h2o.nodes[0], execExpr, resultKey=None, timeoutSecs=300)
execTime = time.time() - start
print 'exec took', execTime, 'seconds'
- c = h2o.nodes[0].get_cloud()
- c = c['nodes']
-
- # print (h2o.dump_json(c))
- k = [i['num_keys'] for i in c]
- v = [i['value_size_bytes'] for i in c]
-
-
- print "keys: %s" % " ".join(map(str,k))
- print "value_size_bytes: %s" % " ".join(map(str,v))
h2o.check_sandbox_for_errors()
|
get rid of the get_cloud probes
|
diff --git a/tests/test_modeling_common.py b/tests/test_modeling_common.py
index <HASH>..<HASH> 100644
--- a/tests/test_modeling_common.py
+++ b/tests/test_modeling_common.py
@@ -67,6 +67,8 @@ class ModelTesterMixin:
if model_class in MODEL_FOR_MULTIPLE_CHOICE_MAPPING.values():
return {
k: v.unsqueeze(1).expand(-1, self.model_tester.num_choices, -1).contiguous()
+ if isinstance(v, torch.Tensor) and v.ndim != 0
+ else v
for k, v in inputs_dict.items()
}
return inputs_dict
@@ -157,7 +159,7 @@ class ModelTesterMixin:
model.to(torch_device)
model.eval()
with torch.no_grad():
- outputs = model(**inputs_dict)
+ outputs = model(**self._prepare_for_class(inputs_dict, model_class))
attentions = outputs[-1]
self.assertEqual(model.config.output_hidden_states, False)
self.assertEqual(len(attentions), self.model_tester.num_hidden_layers)
|
Fix the CI (#<I>)
* Fix CI
|
diff --git a/neuropythy/__init__.py b/neuropythy/__init__.py
index <HASH>..<HASH> 100644
--- a/neuropythy/__init__.py
+++ b/neuropythy/__init__.py
@@ -79,7 +79,7 @@ try:
except: pass
# Version information...
-__version__ = '0.8.1'
+__version__ = '0.8.2'
diff --git a/neuropythy/util/core.py b/neuropythy/util/core.py
index <HASH>..<HASH> 100644
--- a/neuropythy/util/core.py
+++ b/neuropythy/util/core.py
@@ -493,7 +493,7 @@ class CurveSpline(ObjectWithMetaData):
'''
return CurveSpline(
np.flip(self.coordinates, axis=1),
- distances=(None if self.distances is None else np.flip(self.distances)),
+ distances=(None if self.distances is None else np.flip(self.distances, axis=0)),
order=self.order, weights=self.weights, smoothing=self.smoothing,
periodic=self.periodic, meta_data=self.meta_data)
def subcurve(self, t0, t1):
|
minor compatibility with numpy <I> issue
|
diff --git a/src/experimentalcode/remigius/Visualizers/DotVisualizer.java b/src/experimentalcode/remigius/Visualizers/DotVisualizer.java
index <HASH>..<HASH> 100644
--- a/src/experimentalcode/remigius/Visualizers/DotVisualizer.java
+++ b/src/experimentalcode/remigius/Visualizers/DotVisualizer.java
@@ -34,7 +34,9 @@ public class DotVisualizer<NV extends NumberVector<NV, ?>> extends Projection2DV
@Override
public Element visualize(SVGPlot svgp) {
Element layer = super.visualize(svgp);
+ //MarkerLibrary ml = context.getMarkerLibrary();
for(int id : database) {
+ //Element dot = ml.useMarker(svgp, layer, getProjected(id, 0), getProjected(id, 1), 0, 0.01);
Element dot = ShapeLibrary.createMarkerDot(svgp.getDocument(), getProjected(id, 0), getProjected(id, 1));
// setting ID for efficient use of ToolTips.
dot.setAttribute("id", ShapeLibrary.createID(ShapeLibrary.MARKER, id));
|
Add code (still commented) for calling MarkerLibrary
|
diff --git a/core-bundle/src/Resources/contao/controllers/BackendInstall.php b/core-bundle/src/Resources/contao/controllers/BackendInstall.php
index <HASH>..<HASH> 100644
--- a/core-bundle/src/Resources/contao/controllers/BackendInstall.php
+++ b/core-bundle/src/Resources/contao/controllers/BackendInstall.php
@@ -454,6 +454,12 @@ class BackendInstall extends \Backend
continue;
}
+ // The port number must not be empty (see #7950)
+ if ($strKey == 'dbPort' && \Input::post($strKey, true) == '')
+ {
+ \Input::setPost($strKey, 3306);
+ }
+
\Config::persist($strKey, \Input::post($strKey, true));
}
|
[Core] Ensure that the database port is not empty (see #<I>).
|
diff --git a/lib/codemirror.js b/lib/codemirror.js
index <HASH>..<HASH> 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -700,7 +700,7 @@ window.CodeMirror = (function() {
// parse correctly.
function findStartLine(doc, n) {
var minindent, minline;
- for (var search = n, lim = n - 40; search > lim; --search) {
+ for (var search = n, lim = n - 100; search > lim; --search) {
if (search == 0) return 0;
var line = getLine(doc, search-1);
if (line.stateAfter) return search;
|
Increase getStateBefore's scan limit
|
diff --git a/pyiso.py b/pyiso.py
index <HASH>..<HASH> 100644
--- a/pyiso.py
+++ b/pyiso.py
@@ -678,10 +678,10 @@ class PrimaryVolumeDescriptor(object):
self.path_tbl_size = 10
# By default the Little Endian Path Table record starts at extent 19
# (right after the Volume Terminator).
- self.path_table_location_le = 19*self.log_block_size
+ self.path_table_location_le = 19
# By default the Big Endian Path Table record starts at extent 21
# (two extents after the Little Endian Path Table Record).
- self.path_table_location_be = 21*self.log_block_size
+ self.path_table_location_be = 21
# FIXME: we don't support the optional path table location right now
self.optional_path_table_location_le = 0
self.optional_path_table_location_be = 0
|
Store the path table location as extents.
That's what they get written out as anyway.
|
diff --git a/pandas/io/tests/test_parsers.py b/pandas/io/tests/test_parsers.py
index <HASH>..<HASH> 100644
--- a/pandas/io/tests/test_parsers.py
+++ b/pandas/io/tests/test_parsers.py
@@ -812,6 +812,8 @@ bar,foo,foo"""
@slow
def test_file(self):
# FILE
+ if sys.version_info[:2] < (2, 6):
+ raise nose.SkipTest("file:// not supported with Python < 2.6")
dirpath = curpath()
localtable = os.path.join(dirpath, 'salary.table')
local_table = read_table(localtable)
|
ENH: skip test_file test with python <I> (not supported AFAIK)
|
diff --git a/package-testing/spec/package/update_module_spec.rb b/package-testing/spec/package/update_module_spec.rb
index <HASH>..<HASH> 100644
--- a/package-testing/spec/package/update_module_spec.rb
+++ b/package-testing/spec/package/update_module_spec.rb
@@ -25,7 +25,7 @@ describe 'Updating an existing module' do
create_remote_file(get_working_node, File.join(module_dir, 'metadata.json'), metadata.to_json)
sync_yaml = YAML.safe_load(open("https://raw.githubusercontent.com/#{mod}/master/.sync.yml").read)
- sync_yaml['Gemfile']['required'][':system_tests'] << { 'gem' => 'nokogiri', 'version' => '1.8.2' }
+ sync_yaml['Gemfile']['required'][':system_tests'] << { 'gem' => 'nokogiri', 'version' => '1.8.5' }
create_remote_file(get_working_node, File.join(module_dir, '.sync.yml'), sync_yaml.to_yaml)
end
let(:cwd) { repo_dir }
|
(maint) Fix pin for nokogiri in package tests
|
diff --git a/base/app/models/relation/custom.rb b/base/app/models/relation/custom.rb
index <HASH>..<HASH> 100644
--- a/base/app/models/relation/custom.rb
+++ b/base/app/models/relation/custom.rb
@@ -99,7 +99,7 @@ class Relation::Custom < Relation
# JSON compatible with SocialCheesecake
def to_cheesecake_hash(options = {})
- { :name => name }.tap do |hash|
+ {:id => id, :name => name}.tap do |hash|
if options[:subsector]
hash[:actors] = ties.map{ |t| [t.contact.receiver_id, t.contact.receiver.name] }.uniq
else
|
Adding ids to cheesecake_hash for relation custom
|
diff --git a/src/Stack/RouterStack.php b/src/Stack/RouterStack.php
index <HASH>..<HASH> 100644
--- a/src/Stack/RouterStack.php
+++ b/src/Stack/RouterStack.php
@@ -62,7 +62,7 @@ class RouterStack implements MiddlewareInterface
$app->prepend($filter);
}
}
- if($route->trailing()) {
+ if($route->matched()) {
$request = $request->withPathToMatch($route->matched(), $route->trailing());
}
$request = $request->withAttribute(App::ROUTE_NAMES, $this->router->getReverseRoute($request));
|
trailing sometimes returns empty string; use matched to check if route is matched.
|
diff --git a/src/mina.js b/src/mina.js
index <HASH>..<HASH> 100644
--- a/src/mina.js
+++ b/src/mina.js
@@ -338,6 +338,6 @@ var mina = (function (eve) {
}
return l;
};
-
+ window.mina = mina;
return mina;
})(typeof eve == "undefined" ? function () {} : eve);
\ No newline at end of file
|
fix issue in last checkin that broke mina
|
diff --git a/tests/TestCase/Shell/Task/ImportTaskTest.php b/tests/TestCase/Shell/Task/ImportTaskTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/Shell/Task/ImportTaskTest.php
+++ b/tests/TestCase/Shell/Task/ImportTaskTest.php
@@ -58,7 +58,7 @@ class ImportTaskTest extends TestCase
$this->assertSame(1, $query->count());
$entity = $query->firstOrFail();
- Assert::nullOrIsInstanceOf($entity, \Cake\Datasource\EntityInterface::class);
+ Assert::isInstanceOf($entity, \Cake\Datasource\EntityInterface::class);
$group = $entity->toArray();
$this->assertSame([], array_diff_assoc($data, $group));
@@ -72,7 +72,7 @@ class ImportTaskTest extends TestCase
$this->Task->main();
$entity = $this->Groups->find()->where(['name' => $data['name']])->firstOrFail();
- Assert::nullOrIsInstanceOf($entity, \Cake\Datasource\EntityInterface::class);
+ Assert::isInstanceOf($entity, \Cake\Datasource\EntityInterface::class);
$updated = $entity->toArray();
$data['deny_edit'] ?
|
Use stricter assertion (task #<I>)
|
diff --git a/desktop/webpack.config.development.js b/desktop/webpack.config.development.js
index <HASH>..<HASH> 100644
--- a/desktop/webpack.config.development.js
+++ b/desktop/webpack.config.development.js
@@ -72,6 +72,7 @@ if (USING_DLL) {
config.plugins.push(
new webpack.DllReferencePlugin({
context: './renderer',
+ // $FlowIssue
manifest: require('./dll/vendor-manifest.json'),
})
)
|
Declare webpack dll manifest's type to flow (#<I>)
|
diff --git a/spec/quality_spec.rb b/spec/quality_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/quality_spec.rb
+++ b/spec/quality_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe 'Code Quality', :quality => true do
+describe 'Code Quality', :quality do
unless RUBY_VERSION < '1.9'
it 'has no style-guide violations' do
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
@@ -12,9 +12,10 @@ RSpec.configure do |config|
config.color = true
config.fail_fast = true unless ENV['CI']
config.formatter = 'documentation'
+ config.treat_symbols_as_metadata_keys_with_true_values = true
config.include Helpers
- # disables should syntax
+ # disables 'should' syntax
config.expect_with :rspec do |c|
c.syntax = :expect
end
|
minor: tweaking rspec tag handling, using symbols as keys
|
diff --git a/lib/taopaipai/io.rb b/lib/taopaipai/io.rb
index <HASH>..<HASH> 100644
--- a/lib/taopaipai/io.rb
+++ b/lib/taopaipai/io.rb
@@ -25,8 +25,16 @@ module Taopaipai
end
private
- def write_to_file(path, content)
- File.open(relative(path), 'w'){|f| f.write(content) }
+ def write_to_file(path, content, last_attempt = false)
+ begin
+ File.open(relative(path), 'w'){|f| f.write(content) }
+ rescue => e
+ if last_attempt
+ write_to_file(path, content, true)
+ else
+ raise e
+ end
+ end
end
def relative(path)
|
IO now tries to write twice.
|
diff --git a/lib/shopify_api.rb b/lib/shopify_api.rb
index <HASH>..<HASH> 100644
--- a/lib/shopify_api.rb
+++ b/lib/shopify_api.rb
@@ -190,7 +190,7 @@ module ShopifyAPI
# the shop.
class Shop < Base
def self.current
- find(:one, :from => "/admin/shop.xml")
+ find(:one, :from => "/admin/shop.#{format.extension}")
end
def metafields
@@ -423,7 +423,7 @@ module ShopifyAPI
if args[0].is_a?(Symbol)
super
else
- find(:one, :from => "/admin/assets.xml", :params => {:asset => {:key => args[0]}})
+ find(:one, :from => "/admin/assets.#{format.extension}", :params => {:asset => {:key => args[0]}})
end
end
|
Don't hard code xml URLs
The Shopify API supports JSON as well as XML,
these two method calls were causing clients to
receive XML responses, even when they had told
ActiveResource to use JSON.
|
diff --git a/bees/bees.go b/bees/bees.go
index <HASH>..<HASH> 100644
--- a/bees/bees.go
+++ b/bees/bees.go
@@ -22,6 +22,7 @@
package bees
import (
+ "fmt"
"sync"
"time"
@@ -335,14 +336,14 @@ func (bee *Bee) Logln(args ...interface{}) {
// Logf logs a formatted string
func (bee *Bee) Logf(format string, args ...interface{}) {
- log.Printf("[%s]: ", bee.Name())
- log.Printf(format, args...)
+ s := fmt.Sprintf(format, args...)
+ log.Printf("[%s]: %s", bee.Name(), s)
}
// LogErrorf logs a formatted error string
func (bee *Bee) LogErrorf(format string, args ...interface{}) {
- log.Printf("[%s]: ", bee.Name())
- log.Errorf(format, args...)
+ s := fmt.Sprintf(format, args...)
+ log.Errorf("[%s]: %s", bee.Name(), s)
}
// LogFatal logs a fatal error
|
Fixed Logf & LogErrorf methods printing multiple lines
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -97,6 +97,9 @@ function main (processArgv, conf) {
// Configure opts and run command (inside a domain to catch any error)
commands.run(command, opts, conf, function (e) {
console.error(e.message);
+ if (process.env.DEBUG) {
+ throw e;
+ }
process.exit(1);
});
}
@@ -109,6 +112,9 @@ function safeMain (processArgv) {
if (err) {
console.error("Error found in your current environment:");
console.error(err.message);
+ if (process.env.DEBUG) {
+ throw err;
+ }
process.exit(2);
}
|
if env DEBUG is set, throw errors instead of just showing message
|
diff --git a/lib/data_mapper/relation/mapper.rb b/lib/data_mapper/relation/mapper.rb
index <HASH>..<HASH> 100644
--- a/lib/data_mapper/relation/mapper.rb
+++ b/lib/data_mapper/relation/mapper.rb
@@ -99,8 +99,9 @@ module DataMapper
#
# @api public
def self.key(*names)
+ attribute_set = attributes
names.each do |name|
- attributes << attributes[name].clone(:key => true)
+ attribute_set << attribute_set[name].clone(:key => true)
end
self
end
@@ -316,8 +317,11 @@ module DataMapper
#
# @api public
def order(*names)
- order_attributes = names.map { |attribute| attributes.field_name(attribute) }
- order_attributes.concat(attributes.fields).uniq!
+ attribute_set = attributes
+ order_attributes = names.map { |attribute|
+ attribute_set.field_name(attribute)
+ }
+ order_attributes.concat(attribute_set.fields).uniq!
new(relation.order(*order_attributes))
end
@@ -599,7 +603,8 @@ module DataMapper
#
# @api public
def inspect
- "#<#{self.class.name} @model=#{model.name} @relation_name=#{relation_name} @repository=#{self.class.repository}>"
+ klass = self.class
+ "#<#{klass.name} @model=#{model.name} @relation_name=#{relation_name} @repository=#{klass.repository}>"
end
private
|
Avoid duplicate method calls by using an lvar
|
diff --git a/src/main/java/org/primefaces/component/api/FilterableTable.java b/src/main/java/org/primefaces/component/api/FilterableTable.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/primefaces/component/api/FilterableTable.java
+++ b/src/main/java/org/primefaces/component/api/FilterableTable.java
@@ -165,10 +165,12 @@ public interface FilterableTable extends ColumnHolder {
else {
UIColumn column = filterMeta.getColumn();
UIComponent filterFacet = column.getFacet("filter");
- boolean hasCustomFilter = ComponentUtils.shouldRenderFacet(filterFacet);
+ boolean hasCustomFilter = filterFacet != null;
if (column instanceof DynamicColumn) {
if (hasCustomFilter) {
((DynamicColumn) column).applyModel();
+ // UIColumn#rendered might change after restoring p:columns state at the right index
+ hasCustomFilter = ComponentUtils.shouldRenderFacet(filterFacet);
}
else {
((DynamicColumn) column).applyStatelessModel();
|
Fix #<I> - Datatable: filter facet does not work with p:columns
|
diff --git a/serverless-plugin/index.js b/serverless-plugin/index.js
index <HASH>..<HASH> 100644
--- a/serverless-plugin/index.js
+++ b/serverless-plugin/index.js
@@ -43,23 +43,29 @@ class ServerlessPlugin {
{}
);
- this.stackArgs = [];
- if (process.platform !== 'linux') {
- // Use Stack's Docker build
- this.serverless.cli.log("Using Stack's Docker image.");
- this.runStack(['docker', 'pull']);
- this.stackArgs.push('--docker');
- }
+ this.docker = {
+ required: process.platform !== 'linux',
+ haveImage: false,
+ };
this.additionalFiles = [];
}
runStack(args, captureOutput) {
+ const dockerArgs = [];
+ if (this.docker.required) {
+ if (!this.docker.haveImage) {
+ this.serverless.cli.log("Using Stack's Docker image.");
+ spawnSync('stack', ['docker', 'pull'], NO_OUTPUT_CAPTURE);
+ this.docker.haveImage = true;
+ }
+ dockerArgs.push('--docker');
+ }
return spawnSync(
'stack',
[
...args,
- ...this.stackArgs,
+ ...dockerArgs,
...this.custom.stackBuildArgs,
],
captureOutput ? {} : NO_OUTPUT_CAPTURE
|
Do not pull Docker image unless needed
|
diff --git a/tests/Payum/Payex/Tests/Functional/Api/OrderApiTest.php b/tests/Payum/Payex/Tests/Functional/Api/OrderApiTest.php
index <HASH>..<HASH> 100644
--- a/tests/Payum/Payex/Tests/Functional/Api/OrderApiTest.php
+++ b/tests/Payum/Payex/Tests/Functional/Api/OrderApiTest.php
@@ -13,10 +13,10 @@ class OrderApiTest extends \PHPUnit_Framework_TestCase
public static function setUpBeforeClass()
{
- if (false == isset($GLOBALS['__PAYUM_PAYEX_ACCOUNT_NUMBER'])) {
+ if (empty($GLOBALS['__PAYUM_PAYEX_ACCOUNT_NUMBER'])) {
throw new \PHPUnit_Framework_SkippedTestError('Please configure __PAYUM_PAYEX_ACCOUNT_NUMBER in your phpunit.xml');
}
- if (false == isset($GLOBALS['__PAYUM_PAYEX_ENCRYPTION_KEY'])) {
+ if (empty($GLOBALS['__PAYUM_PAYEX_ENCRYPTION_KEY'])) {
throw new \PHPUnit_Framework_SkippedTestError('Please configure __PAYUM_PAYEX_ENCRYPTION_KEY in your phpunit.xml');
}
}
|
fix skipp functional tests on travis.
|
diff --git a/src/Tag/METER.php b/src/Tag/METER.php
index <HASH>..<HASH> 100644
--- a/src/Tag/METER.php
+++ b/src/Tag/METER.php
@@ -5,7 +5,7 @@ namespace Mpdf\Tag;
use Mpdf\Mpdf;
-class METER extends Tag
+class METER extends InlineTag
{
public function open($attr, &$ahtml, &$ihtml)
@@ -304,6 +304,7 @@ class METER extends Tag
public function close(&$ahtml, &$ihtml)
{
+ parent::close($ahtml, $ihtml);
$this->mpdf->ignorefollowingspaces = false;
$this->mpdf->inMeter = false;
}
|
fix: make PROGRESS and METER inline tags again
|
diff --git a/cmux.go b/cmux.go
index <HASH>..<HASH> 100644
--- a/cmux.go
+++ b/cmux.go
@@ -115,7 +115,8 @@ type cMux struct {
func matchersToMatchWriters(matchers []Matcher) []MatchWriter {
mws := make([]MatchWriter, 0, len(matchers))
- for _, m := range matchers {
+ for _, _m := range matchers {
+ m := _m
mws = append(mws, func(w io.Writer, r io.Reader) bool {
return m(r)
})
|
Fix bug matchers are ignored except last one
|
diff --git a/pyccc/docker_utils.py b/pyccc/docker_utils.py
index <HASH>..<HASH> 100644
--- a/pyccc/docker_utils.py
+++ b/pyccc/docker_utils.py
@@ -132,7 +132,7 @@ def make_tar_stream(build_context, buffer):
"""
tf = tarfile.TarFile(fileobj=buffer, mode='w')
for context_path, fileobj in build_context.items():
- if isinstance(fileobj, (files.LocalDirectoryReference, files.LocalFile)):
+ if getattr(fileobj, 'localpath', None) is not None:
tf.add(fileobj.localpath, arcname=context_path)
else:
tar_add_bytes(tf, context_path, fileobj.read('rb'))
|
Duck-typed approach to checking for local instances of file references
|
diff --git a/resources/lang/en-US/cachet.php b/resources/lang/en-US/cachet.php
index <HASH>..<HASH> 100644
--- a/resources/lang/en-US/cachet.php
+++ b/resources/lang/en-US/cachet.php
@@ -75,10 +75,11 @@ return [
// Subscriber
'subscriber' => [
- 'subscribe' => 'Subscribe to get the most recent updates',
- 'unsubscribe' => 'Unsubscribe at :link',
- 'button' => 'Subscribe',
- 'manage' => [
+ 'subscribe' => 'Subscribe to get the most recent updates',
+ 'unsubscribe' => 'Unsubscribe',
+ 'button' => 'Subscribe',
+ 'manage_subscription' => 'Manage subscription',
+ 'manage' => [
'no_subscriptions' => 'You\'re currently subscribed to all updates.',
'my_subscriptions' => 'You\'re currently subscribed to the following updates.',
'manage_at_link' => 'Manage your subscriptions at :link',
|
New translations cachet.php (English)
|
diff --git a/components/Templates/includes/auto-template/Pods_Templates_Auto_Template_Settings.php b/components/Templates/includes/auto-template/Pods_Templates_Auto_Template_Settings.php
index <HASH>..<HASH> 100644
--- a/components/Templates/includes/auto-template/Pods_Templates_Auto_Template_Settings.php
+++ b/components/Templates/includes/auto-template/Pods_Templates_Auto_Template_Settings.php
@@ -192,7 +192,7 @@ class Pods_Templates_Auto_Template_Settings {
}
- $options[ 'pods-pfat' ][ 'pfat_archive' ][ 'data' ] = array_combine( $this->get_template_titles(), $this->get_template_titles() );
+ $options[ 'pods-pfat' ][ 'pfat_archive' ][ 'data' ] = array( null => __('No Archive view template', 'pods') ) + ( array_combine( $this->get_template_titles(), $this->get_template_titles() ) );
$options[ 'pods-pfat' ][ 'pfat_single' ][ 'data' ] = array_combine( $this->get_template_titles(), $this->get_template_titles() );
}
|
Added option to deselect auto template for archive views
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -32,10 +32,10 @@ extras_require = {
}
# add packages with choices, using already installed ones if available
-qt_option = 'PySide2'
-if sys.version_info >= (3, 10, 0):
- qt_option = 'PySide6'
-for name in 'PySide2', 'PySide6', 'PyQt5':
+qt_option = 'PySide6'
+if sys.version_info < (3, 6, 0):
+ qt_option = 'PySide2'
+for name in 'PySide6', 'PySide2', 'PyQt5':
if importlib.util.find_spec(name) is not None:
qt_option = None
break
diff --git a/src/photini/__init__.py b/src/photini/__init__.py
index <HASH>..<HASH> 100644
--- a/src/photini/__init__.py
+++ b/src/photini/__init__.py
@@ -1,4 +1,4 @@
from __future__ import unicode_literals
__version__ = '2021.12.0'
-build = '1890 (b669767)'
+build = '1891 (17a7ff7)'
|
Prefer PySide6 over PySide2 or PyQt5
when none of them is already installed.
|
diff --git a/lib/pytaf/tafdecoder.py b/lib/pytaf/tafdecoder.py
index <HASH>..<HASH> 100644
--- a/lib/pytaf/tafdecoder.py
+++ b/lib/pytaf/tafdecoder.py
@@ -268,7 +268,8 @@ class Decoder(object):
"SG" : "snow grains",
"IC" : "ice",
"PL" : "ice pellets",
- "GR" : "small snow/hail pellets",
+ "GR" : "hail",
+ "GS" : "small snow/hail pellets",
"UP" : "unknown precipitation",
"BR" : "mist",
"FG" : "fog",
|
fixed dict_phenomenons which was missing "GS" ("small now/hail pellets")
while GR (actually "hail") was incorrectly labeled "small now/hail
pellets"
|
diff --git a/bfg9000/tools/cc/linker.py b/bfg9000/tools/cc/linker.py
index <HASH>..<HASH> 100644
--- a/bfg9000/tools/cc/linker.py
+++ b/bfg9000/tools/cc/linker.py
@@ -156,10 +156,10 @@ class CcLinker(BuildCommand):
changed = False
for i in options:
if isinstance(i, opts.lib):
- lib = i.library
- if isinstance(lib, Library) and lib.runtime_file:
- local = self._local_rpath(lib, output)[0][0]
- installed = file_install_path(lib, cross=self.env).parent()
+ if isinstance(i.library, Library) and i.library.runtime_file:
+ runtime = i.library.runtime_file
+ local = self._local_rpath(runtime, output)[0][0]
+ installed = file_install_path(runtime, self.env).parent()
result.append(installed)
if not isinstance(local, BasePath) or local != installed:
changed = True
|
Be more precise about the installed rpaths
Technically speaking, the rpath is based on the location of the *runtime* file
associated with the library, not the library passed in as an argument. For
example, with a versioned shared lib, the input file is libfoo.so, but the
runtime file is libfoo.so<I>. We want the latter.
|
diff --git a/lib/AssetGraph.js b/lib/AssetGraph.js
index <HASH>..<HASH> 100644
--- a/lib/AssetGraph.js
+++ b/lib/AssetGraph.js
@@ -288,8 +288,8 @@ AssetGraph.prototype = {
if (this.getBaseAssetForRelation(affectedRelation) === asset) {
if (affectedRelation.to.url) {
affectedRelation._setRawUrlString(fileUtils.buildRelativeUrl(asset.url, affectedRelation.to.url));
+ this.markAssetDirty(affectedRelation.from);
}
- this.markAssetDirty(asset);
}
}, this);
this.findRelations({to: asset}).forEach(function (incomingRelation) {
diff --git a/lib/relations/HTMLScript.js b/lib/relations/HTMLScript.js
index <HASH>..<HASH> 100644
--- a/lib/relations/HTMLScript.js
+++ b/lib/relations/HTMLScript.js
@@ -12,7 +12,7 @@ util.inherits(HTMLScript, Base);
_.extend(HTMLScript.prototype, {
_getRawUrlString: function () {
- return this.node.getAttribute('src', url) || undefined;
+ return this.node.getAttribute('src') || undefined;
},
_setRawUrlString: function (url) {
|
AssetGraph.setAssetUrl: Marked the wrong asset dirty.
|
diff --git a/libraries/joomla/database/database.php b/libraries/joomla/database/database.php
index <HASH>..<HASH> 100644
--- a/libraries/joomla/database/database.php
+++ b/libraries/joomla/database/database.php
@@ -36,6 +36,24 @@ abstract class JDatabase
}
/**
+ * Get a list of available database connectors. The list will only be populated with connectors that both
+ * the class exists and the static test method returns true. This gives us the ability to have a multitude
+ * of connector classes that are self-aware as to whether or not they are able to be used on a given system.
+ *
+ * @return array An array of available database connectors.
+ *
+ * @since 11.1
+ * @deprecated 13.1
+ */
+ public static function getConnectors()
+ {
+ // Deprecation warning.
+ JLog::add('JDatabase::getConnectors() is deprecated, use JDatabaseDriver::getConnectors() instead.', JLog::NOTICE, 'deprecated');
+
+ return JDatabaseDriver::getConnectors();
+ }
+
+ /**
* Gets the error message from the database connection.
*
* @param boolean $escaped True to escape the message string for use in JavaScript.
|
Add JDatabase::getConnectors for B/C
|
diff --git a/javatools/__init__.py b/javatools/__init__.py
index <HASH>..<HASH> 100644
--- a/javatools/__init__.py
+++ b/javatools/__init__.py
@@ -1699,7 +1699,7 @@ class JavaExceptionInfo(object):
ct = self.get_catch_type()
if ct:
- return "Class " + ct
+ return "Class " + _pretty_class(ct)
else:
return "any"
|
make pretty_catch_type actually pretty
|
diff --git a/inginious/frontend/webapp/app.py b/inginious/frontend/webapp/app.py
index <HASH>..<HASH> 100644
--- a/inginious/frontend/webapp/app.py
+++ b/inginious/frontend/webapp/app.py
@@ -14,7 +14,6 @@ import web
from frontend.common.arch_helper import create_arch, start_asyncio_and_zmq
from inginious.frontend.common.static_middleware import StaticMiddleware
-from inginious.frontend.common.webpy_fake_mapping import WebPyCustomMapping
from inginious.frontend.webapp.database_updater import update_database
from inginious.frontend.common.plugin_manager import PluginManager
from inginious.common.course_factory import create_factories
|
Forgot to remove a WebPyFakeMapping reference
|
diff --git a/lib/que/version.rb b/lib/que/version.rb
index <HASH>..<HASH> 100644
--- a/lib/que/version.rb
+++ b/lib/que/version.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Que
- VERSION = '2.0.0.beta1'
+ VERSION = '2.0.0'
def self.job_schema_version
2
|
Update version number to <I>
|
diff --git a/router.go b/router.go
index <HASH>..<HASH> 100644
--- a/router.go
+++ b/router.go
@@ -60,7 +60,6 @@ func (router *Router) On(name string, callback interface{}) {
callbackDataType := reflect.TypeOf(callback).In(1)
- fmt.Println(callbackDataType, reflect.TypeOf([]byte{}))
if reflect.TypeOf([]byte{}) == callbackDataType {
router.callbacks[name] = callback.(func(*Connection, []byte))
return
@@ -69,7 +68,7 @@ func (router *Router) On(name string, callback interface{}) {
callbackValue := reflect.ValueOf(callback)
callbackDataElem := callbackDataType.Elem()
- preCallbackParser := func(conn *Connection, data []byte) {
+ unmarshalThenCallback := func(conn *Connection, data []byte) {
result := reflect.New(callbackDataElem)
err := json.Unmarshal(data, &result)
@@ -80,7 +79,7 @@ func (router *Router) On(name string, callback interface{}) {
fmt.Println("[JSON-FORWARD]", data, err) // TODO: Proper debug output!
}
}
- router.callbacks[name] = preCallbackParser
+ router.callbacks[name] = unmarshalThenCallback
}
func (router *Router) parse(conn *Connection, rawdata []byte) {
|
Got rid of debug output and renamed functor.
|
diff --git a/config/webpack.dev.js b/config/webpack.dev.js
index <HASH>..<HASH> 100644
--- a/config/webpack.dev.js
+++ b/config/webpack.dev.js
@@ -87,8 +87,10 @@ module.exports = webpackMerge(commonConfig, {
*
* See: http://webpack.github.io/docs/configuration.html#output-chunkfilename
*/
- chunkFilename: '[id].chunk.js'
+ chunkFilename: '[id].chunk.js',
+ library: 'ac_[name]',
+ libraryTarget: 'var',
},
plugins: [
|
chore: provide var lib for dev
|
diff --git a/proso/release.py b/proso/release.py
index <HASH>..<HASH> 100644
--- a/proso/release.py
+++ b/proso/release.py
@@ -1 +1 @@
-VERSION = '3.20.4'
+VERSION = '3.20.5.dev'
|
start working on <I>.dev
|
diff --git a/dockerscripts/healthcheck.go b/dockerscripts/healthcheck.go
index <HASH>..<HASH> 100755
--- a/dockerscripts/healthcheck.go
+++ b/dockerscripts/healthcheck.go
@@ -83,6 +83,11 @@ func findEndpoint() string {
if strings.Count(addr, ":") > 0 {
addr = strings.Join([]string{"[", addr, "]"}, "")
}
+ // wait for cmd to complete before return
+ if err = cmd.Wait(); err != nil {
+ // command failed to run
+ log.Fatal(err.Error())
+ }
// return joint address and port
return strings.Join([]string{addr, port}, ":")
}
|
Fix healthcheck script to wait for netstat command output (#<I>)
Fixes #<I>
|
diff --git a/impl/src/main/java/org/apache/camel/cdi/Main.java b/impl/src/main/java/org/apache/camel/cdi/Main.java
index <HASH>..<HASH> 100644
--- a/impl/src/main/java/org/apache/camel/cdi/Main.java
+++ b/impl/src/main/java/org/apache/camel/cdi/Main.java
@@ -90,14 +90,10 @@ public class Main extends MainSupport {
cdiContainer = container;
super.doStart();
postProcessContext();
- for (CamelContext context : getCamelContexts())
- context.start();
}
@Override
protected void doStop() throws Exception {
- for (CamelContext context : getCamelContexts())
- context.stop();
super.doStop();
if (cdiContainer != null)
((org.apache.deltaspike.cdise.api.CdiContainer) cdiContainer).shutdown();
|
Remove Camel contexts lifecycle management in Main support
|
diff --git a/src/main/java/ru/vyarus/dropwizard/guice/test/TestCommand.java b/src/main/java/ru/vyarus/dropwizard/guice/test/TestCommand.java
index <HASH>..<HASH> 100644
--- a/src/main/java/ru/vyarus/dropwizard/guice/test/TestCommand.java
+++ b/src/main/java/ru/vyarus/dropwizard/guice/test/TestCommand.java
@@ -22,6 +22,7 @@ public class TestCommand<C extends Configuration> extends EnvironmentCommand<C>
public TestCommand(final Application<C> application) {
super(application, "guicey-test", "Specific command to run guice context without jetty server");
+ cleanupAsynchronously();
configurationClass = application.getConfigurationClass();
}
@@ -41,6 +42,7 @@ public class TestCommand<C extends Configuration> extends EnvironmentCommand<C>
throw new IllegalStateException("Failed to stop managed objects container", e);
}
container.destroy();
+ cleanup();
}
@Override
|
Make test command clean up asynchornously
|
diff --git a/examples/gae/showcase/main.py b/examples/gae/showcase/main.py
index <HASH>..<HASH> 100644
--- a/examples/gae/showcase/main.py
+++ b/examples/gae/showcase/main.py
@@ -2,12 +2,17 @@
import os
import logging
+import sys
+reload(sys)
+sys.setdefaultencoding('utf-8')
import jinja2
import webapp2
from authomatic import Authomatic
from authomatic.adapters import Webapp2Adapter
+
+
# import config
import config_public as config
|
Fixed utf-8 error.
|
diff --git a/openpnm/core/ModelsMixin.py b/openpnm/core/ModelsMixin.py
index <HASH>..<HASH> 100644
--- a/openpnm/core/ModelsMixin.py
+++ b/openpnm/core/ModelsMixin.py
@@ -284,7 +284,17 @@ class ModelsMixin():
try:
self[prop] = model(target=self, **kwargs)
except KeyError:
- logger.warning(prop+' was not run due to missing dependencies')
+ missing_deps = []
+ for key in kwargs.values():
+ if type(key) == str and key.split('.')[0] in ['pore', 'throat']:
+ try:
+ self[key]
+ except KeyError:
+ missing_deps.append(key)
+
+ logger.warning(prop+' was not run since the following'
+ + ' properties are missing: '
+ + str(missing_deps))
self.models[prop]['regen_mode'] = 'deferred'
def remove_model(self, propname=None, mode=['model', 'data']):
|
Enhancing missing dependencies check...seems to work!
|
diff --git a/dsync.go b/dsync.go
index <HASH>..<HASH> 100644
--- a/dsync.go
+++ b/dsync.go
@@ -45,8 +45,8 @@ func SetNodesWithClients(rpcClnts []RPC, rpcOwnNode int) (err error) {
// Validate if number of nodes is within allowable range.
if dnodeCount != 0 {
return errors.New("Cannot reinitialize dsync package")
- } else if len(rpcClnts) < 4 {
- return errors.New("Dsync not designed for less than 4 nodes")
+ } else if len(rpcClnts) < 2 {
+ return errors.New("Dsync not designed for less than 2 nodes")
} else if len(rpcClnts) > 16 {
return errors.New("Dsync not designed for more than 16 nodes")
} else if len(rpcClnts)&1 == 1 {
|
Relax minimum number of nodes to 2
Now that we have relaxed the quorum for reads to N/2, it actually makes sense to lower the minimum number of nodes from 4 down to 2.
This means that for a 2 node system, both nodes need to be up in order to acquire a (write) lock. To obtain a read lock just a single node (which one doesn't matter) needs to be up.
|
diff --git a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifParser.java b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifParser.java
index <HASH>..<HASH> 100644
--- a/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifParser.java
+++ b/biojava-structure/src/main/java/org/biojava/nbio/structure/io/mmcif/SimpleMMcifParser.java
@@ -979,7 +979,7 @@ public class SimpleMMcifParser implements MMcifParser {
Type[] gpType = m.getGenericParameterTypes();
// all of the mmCif container classes have only one argument (they are beans)
- if ( pType[0].getTypeName().equals(Integer.class.getName())) {
+ if ( pType[0].getName().equals(Integer.class.getName())) {
if ( val != null && ! val.equals("?")) {
Integer intVal = Integer.parseInt(val);
|
don;t use Java 8 specific method names
|
diff --git a/src/Dev/DevelopmentAdmin.php b/src/Dev/DevelopmentAdmin.php
index <HASH>..<HASH> 100644
--- a/src/Dev/DevelopmentAdmin.php
+++ b/src/Dev/DevelopmentAdmin.php
@@ -148,12 +148,14 @@ class DevelopmentAdmin extends Controller
*/
protected static function get_links()
{
- $links = array();
+ $links = [];
$reg = Config::inst()->get(__CLASS__, 'registered_controllers');
foreach ($reg as $registeredController) {
- foreach ($registeredController['links'] as $url => $desc) {
- $links[$url] = $desc;
+ if (isset($registeredController['links'])) {
+ foreach ($registeredController['links'] as $url => $desc) {
+ $links[$url] = $desc;
+ }
}
}
return $links;
|
Added isset check for registered controller links in dev admin
|
diff --git a/public/javascripts/streamrules.js b/public/javascripts/streamrules.js
index <HASH>..<HASH> 100644
--- a/public/javascripts/streamrules.js
+++ b/public/javascripts/streamrules.js
@@ -25,7 +25,7 @@ $(document).ready(function() {
value = $(this).attr("placeholder");
}
- $($(this).attr("data-reflect"), modalBody).html(value);
+ $($(this).attr("data-reflect"), modalBody).text(value);
});
$(".streamrules-list").on("click", "li a.remove-streamrule", function(event) {
@@ -69,7 +69,7 @@ $(document).ready(function() {
new_val = old_val;
}
}
- $("#sr-result-category", modalBody).html(new_val);
+ $("#sr-result-category", modalBody).text(new_val);
})
$(document.body).on("click", "button.streamrule-form-submit", function(e) {
|
use .text() not .html() in stream rule editor to prevent DOM XSS
fixes #<I>
|
diff --git a/ipa/ipa_utils.py b/ipa/ipa_utils.py
index <HASH>..<HASH> 100644
--- a/ipa/ipa_utils.py
+++ b/ipa/ipa_utils.py
@@ -100,30 +100,6 @@ def ssh_connect(client,
)
-@contextmanager
-def ssh_connection(client,
- ip,
- ssh_private_key,
- ssh_user='root',
- port=22):
- """Redirect standard out to file."""
- try:
- wait_on_ssh_connection(
- client,
- ip,
- ssh_private_key,
- ssh_user,
- port
- )
- yield client
- except:
- print('Error!')
- raise
- finally:
- if client:
- client.close()
-
-
def wait_on_ssh_connection(client,
ip,
ssh_private_key,
|
Remove unused context manager for SSH connections.
|
diff --git a/openquake/baselib/parallel.py b/openquake/baselib/parallel.py
index <HASH>..<HASH> 100644
--- a/openquake/baselib/parallel.py
+++ b/openquake/baselib/parallel.py
@@ -397,6 +397,7 @@ def safely_call(func, args, monitor=dummy_mon):
zsocket.send(err)
if res.tb_str == 'TASK_ENDED':
break
+ mon.duration = 0
return zsocket.num_sent
|
Fixed monitor times [skip CI]
|
diff --git a/app/helpers/siesta/application_helper.rb b/app/helpers/siesta/application_helper.rb
index <HASH>..<HASH> 100644
--- a/app/helpers/siesta/application_helper.rb
+++ b/app/helpers/siesta/application_helper.rb
@@ -9,10 +9,10 @@ module Siesta
end
def include_test_harness
- if asset_exists?('test_harness.js')
- javascript_include_tag 'test_harness'
- else
+ if Siesta.config.auto_organizing
content_tag(:script, test_harness, { type: 'text/javascript' }, false)
+ else
+ javascript_include_tag 'test_harness'
end
end
|
Do not check the existance of `test_harness.js`
|
diff --git a/tasks/protractor_coverage.js b/tasks/protractor_coverage.js
index <HASH>..<HASH> 100644
--- a/tasks/protractor_coverage.js
+++ b/tasks/protractor_coverage.js
@@ -103,11 +103,11 @@ module.exports = function(grunt) {
coverageDir = coverageDir.replace(/\\/g,'/');
var noInject = opts.noInject;
if (!noInject) {
- var saveCucumberCoverageTemplate = grunt.file.expand([ opts.saveCoverageTemplate, "node_modules/grunt-protractor-coverage/resources/saveCoverage.tmpl", process.cwd()+'/**/resources/saveCoverage.tmpl']).shift();
- if(!saveCucumberCoverageTemplate){
+ saveCoverageTemplate = grunt.file.expand([ opts.saveCoverageTemplate, "node_modules/grunt-protractor-coverage/resources/saveCoverage.tmpl", process.cwd()+'/**/resources/saveCoverage.tmpl']).shift();
+ if(!saveCoverageTemplate){
grunt.fail.fatal("Coverage template file not found.");
}
- var saveCoverageSource = grunt.file.read(saveCucumberCoverageTemplate);
+ var saveCoverageSource = grunt.file.read(saveCoverageTemplate);
var saveCoverageContent=grunt.template.process( saveCoverageSource, {
data: {
dirname: coverageDir,
|
Renamed incorrectly renamed variable back to original
|
diff --git a/tests/setup.py b/tests/setup.py
index <HASH>..<HASH> 100644
--- a/tests/setup.py
+++ b/tests/setup.py
@@ -13,7 +13,6 @@ PACKAGE_NAME = 'asn1crypto'
PACKAGE_VERSION = '1.3.0'
TEST_PACKAGE_NAME = '%s_tests' % PACKAGE_NAME
TESTS_ROOT = os.path.dirname(os.path.abspath(__file__))
-PACKAGE_ROOT = os.path.abspath(os.path.join(TESTS_ROOT, '..'))
# setuptools 38.6.0 and newer know about long_description_content_type, but
@@ -60,7 +59,7 @@ class EggInfoCommand(egg_info):
if not os.path.exists(egg_info_path):
os.mkdir(egg_info_path)
shutil.copy2(
- os.path.join(PACKAGE_ROOT, 'LICENSE'),
+ os.path.join(TESTS_ROOT, 'LICENSE'),
os.path.join(egg_info_path, 'LICENSE')
)
egg_info.run(self)
|
Fix an issue with asn1crypto_tests when running egg_info from sdist
|
diff --git a/lib/wed/wed.js b/lib/wed/wed.js
index <HASH>..<HASH> 100644
--- a/lib/wed/wed.js
+++ b/lib/wed/wed.js
@@ -825,14 +825,14 @@ Editor.prototype._postInitialize = log.wrap(function () {
}
}
- this.validator.start();
-
this.domlistener.processImmediately();
// Flush whatever has happened earlier.
this._undo = new undo.UndoList();
this.$gui_root.focus();
+ this.validator.start();
+
this._setCondition("initialized", {editor: this});
});
|
Start validation just before ending the initialization process.
|
diff --git a/packages/eqh-client-vault/src/.eslintrc.js b/packages/eqh-client-vault/src/.eslintrc.js
index <HASH>..<HASH> 100644
--- a/packages/eqh-client-vault/src/.eslintrc.js
+++ b/packages/eqh-client-vault/src/.eslintrc.js
@@ -10,5 +10,11 @@ module.exports = {
sourceType: 'module',
},
},
+ {
+ files: ['main.js', 'util/*.js'],
+ env: {
+ browser: true,
+ },
+ },
],
}
diff --git a/packages/eqh-client-vault/src/main.js b/packages/eqh-client-vault/src/main.js
index <HASH>..<HASH> 100644
--- a/packages/eqh-client-vault/src/main.js
+++ b/packages/eqh-client-vault/src/main.js
@@ -1,5 +1,3 @@
-/* eslint-disable no-undef */
-
import { safeHtml } from 'common-tags'
import loadVault from './vault'
|
Change eslint env to browser for main.js in vault
|
diff --git a/xdis/cross_dis.py b/xdis/cross_dis.py
index <HASH>..<HASH> 100644
--- a/xdis/cross_dis.py
+++ b/xdis/cross_dis.py
@@ -328,7 +328,10 @@ def xstack_effect(opcode, opc, oparg=None, jump=None):
elif opname == "MAKE_FUNCTION":
if opc.version >= 3.5:
if 0 <= oparg <= 10:
- return [-1, -2, -2, -3, -2, -3, -3 , -4, -2, -3, -3, -4][oparg]
+ if opc.version == 3.5:
+ return [-1, -2, -3, -3, -2, -3, -3 , -4, -2, -3, -3, -4][oparg]
+ elif opc.version >= 3.6:
+ return [-1, -2, -2, -3, -2, -3, -3 , -4, -2, -3, -3, -4][oparg]
else:
return None
elif opname == "CALL_FUNCTION_EX":
|
Last <I> stack effect correction before release
|
diff --git a/exchange_actions/exchange_actions.go b/exchange_actions/exchange_actions.go
index <HASH>..<HASH> 100644
--- a/exchange_actions/exchange_actions.go
+++ b/exchange_actions/exchange_actions.go
@@ -7,7 +7,6 @@ import (
"path"
"path/filepath"
"sort"
- "strings"
"time"
"github.com/qor/i18n"
@@ -102,7 +101,12 @@ func RegisterExchangeJobs(I18n *i18n.I18n, Worker *worker.Worker) {
for _, values := range records[1:] {
for idx, value := range values[1:] {
- if strings.Contains(values[0], "Amount") {
+ if value == "" {
+ I18n.DeleteTranslation(&i18n.Translation{
+ Key: values[0],
+ Locale: locales[idx],
+ })
+ } else {
I18n.SaveTranslation(&i18n.Translation{
Key: values[0],
Locale: locales[idx],
|
Delete translation if translation value is blank string
|
diff --git a/assets/js/postmessage.js b/assets/js/postmessage.js
index <HASH>..<HASH> 100755
--- a/assets/js/postmessage.js
+++ b/assets/js/postmessage.js
@@ -25,6 +25,7 @@
}
}, _base_url);
},
+ _hasParent = ('' !== _parent_url),
$window = $(window),
$html = $('html');
@@ -58,8 +59,14 @@
// Post height of a child right after window is loaded.
$(window).bind('load', function () {
FS.PostMessage.postHeight();
- });
+ // Post message that window was loaded.
+ FS.PostMessage.post('loaded');
+ });
+ },
+ hasParent : function ()
+ {
+ return _hasParent;
},
postHeight : function (diff, wrapper) {
diff = diff || 0;
|
[post-message] [bug-fix] Fixed issues after bad file merge.
|
diff --git a/gems/rake-support/lib/torquebox/deploy_utils.rb b/gems/rake-support/lib/torquebox/deploy_utils.rb
index <HASH>..<HASH> 100644
--- a/gems/rake-support/lib/torquebox/deploy_utils.rb
+++ b/gems/rake-support/lib/torquebox/deploy_utils.rb
@@ -310,7 +310,7 @@ module TorqueBox
Thread.new(stdin) { |stdin_io|
begin
until exiting
- stdin_io.write(STDIN.readpartial(1024))
+ stdin_io.write(readpartial(STDIN))
stdin_io.flush
end
rescue Errno::EBADF, IOError
@@ -322,7 +322,7 @@ module TorqueBox
[ Thread.new(stdout) { |stdout_io|
begin
while true
- STDOUT.write(stdout_io.readpartial(1024))
+ STDOUT.write(readpartial(stdout_io))
end
rescue EOFError
end
@@ -331,7 +331,7 @@ module TorqueBox
Thread.new(stderr) { |stderr_io|
begin
while true
- STDERR.write(stderr_io.readpartial(1024))
+ STDERR.write(readpartial(stderr_io))
end
rescue EOFError
end
@@ -341,6 +341,10 @@ module TorqueBox
end
+ def readpartial(stream)
+ windows? ? stream.read(1) : stream.readpartial(1024)
+ end
+
def windows?
RbConfig::CONFIG['host_os'] =~ /mswin/
end
|
fall back to read(1) on Windows instead of readpartial
|
diff --git a/lib/Pool.js b/lib/Pool.js
index <HASH>..<HASH> 100644
--- a/lib/Pool.js
+++ b/lib/Pool.js
@@ -116,6 +116,7 @@ Pool.prototype._createConnection = function() {
// the connection to end as well, thus we only need to watch for the end event
// and we will be notified of disconnects.
connection.on('end', this._handleConnectionEnd.bind(this, connection));
+ connection.on('error', this._handleConnectionError.bind(this, connection));
return connection;
};
@@ -127,6 +128,13 @@ Pool.prototype._handleConnectionEnd = function(connection) {
this._removeConnection(connection);
};
+Pool.prototype._handleConnectionError = function(connection) {
+ if (this._closed || connection._poolRemoved) {
+ return;
+ }
+ this._removeConnection(connection);
+};
+
Pool.prototype._removeConnection = function(connection) {
connection._poolRemoved = true;
for (var i = 0; i < this._allConnections.length; ++i) {
|
Changes Pool to handle 'error' events and dispose connection
|
diff --git a/lib/Cake/Utility/CakeTime.php b/lib/Cake/Utility/CakeTime.php
index <HASH>..<HASH> 100644
--- a/lib/Cake/Utility/CakeTime.php
+++ b/lib/Cake/Utility/CakeTime.php
@@ -1041,7 +1041,7 @@ class CakeTime {
/**
* Returns a formatted date string, given either a UNIX timestamp or a valid strtotime() date string.
- * It take in account the default date format for the current language if a LC_TIME file is used.
+ * It takes into account the default date format for the current language if a LC_TIME file is used.
*
* @param integer|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object
* @param string $format strftime format string.
|
Updated CakeTime::i<I>nFormat() doc block description
|
diff --git a/aiodocker/__init__.py b/aiodocker/__init__.py
index <HASH>..<HASH> 100644
--- a/aiodocker/__init__.py
+++ b/aiodocker/__init__.py
@@ -1,7 +1,7 @@
from .docker import Docker
-__version__ = '0.11.0'
+__version__ = '0.12.0a0'
__all__ = ("Docker", )
|
Bump to next alpha. (#<I>)
|
diff --git a/keyboard/_darwinkeyboard.py b/keyboard/_darwinkeyboard.py
index <HASH>..<HASH> 100644
--- a/keyboard/_darwinkeyboard.py
+++ b/keyboard/_darwinkeyboard.py
@@ -142,6 +142,10 @@ class KeyMap(object):
def character_to_vk(self, character):
""" Returns a tuple of (scan_code, modifiers) where ``scan_code`` is a numeric scan code
and ``modifiers`` is an array of string modifier names (like 'shift') """
+ # Mapping to preserve cross-platform hotkeys
+ if character.lower() == "windows":
+ character = "command"
+
for vk in self.non_layout_keys:
if self.non_layout_keys[vk] == character.lower():
return (vk, [])
diff --git a/keyboard/_keyboard_event.py b/keyboard/_keyboard_event.py
index <HASH>..<HASH> 100644
--- a/keyboard/_keyboard_event.py
+++ b/keyboard/_keyboard_event.py
@@ -64,7 +64,7 @@ canonical_names = {
'win': 'windows',
# Mac keys
- 'command': 'command',
+ 'command': 'windows',
'control': 'ctrl',
'option': 'alt',
|
Mapping "windows" to "command"
Reverted change in _keyboard_event to preserve cross-platform hotkeys;
added mapping in _darwinkeyboard instead.
|
diff --git a/sos/plugins/usb.py b/sos/plugins/usb.py
index <HASH>..<HASH> 100644
--- a/sos/plugins/usb.py
+++ b/sos/plugins/usb.py
@@ -17,15 +17,16 @@ from glob import glob
import os
class Usb(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
- """USB subsystem information
+ """USB device related information
"""
plugin_name = "usb"
def setup(self):
self.add_copy_spec("/sys/bus/usb")
-
+
self.add_cmd_output("lsusb")
self.add_cmd_output("lsusb -v")
self.add_cmd_output("lsusb -t")
+
|
Tidy up description and code formatting in usb plug-in
|
diff --git a/lib/codemirror.js b/lib/codemirror.js
index <HASH>..<HASH> 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -99,7 +99,7 @@ window.CodeMirror = (function() {
function makeDisplay(place, docStart) {
var d = {};
- var input = d.input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none; font-size: 4px;");
+ var input = d.input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
if (webkit) input.style.width = "1000px";
else input.setAttribute("wrap", "off");
// if border: 0; -- iOS fails to open keyboard (issue #1287)
|
Remove tiny font on hidden textarea
It causes autozooming on some mobile platforms.
Closes #<I>
|
diff --git a/src/Worker.php b/src/Worker.php
index <HASH>..<HASH> 100644
--- a/src/Worker.php
+++ b/src/Worker.php
@@ -83,26 +83,9 @@ class Worker
*/
public function send(string $payload = null, string $header = null): void
{
- if ($header === null) {
- $this->relay->send('', Relay::PAYLOAD_CONTROL | Relay::PAYLOAD_NONE);
- } else {
- $this->relay->send($header, Relay::PAYLOAD_CONTROL | Relay::PAYLOAD_RAW);
- }
-
- $this->relay->send((string)$payload, Relay::PAYLOAD_RAW);
- }
-
- /**
- * Respond to the server with result of task execution and execution context. Uses less amount of sys_calls.
- *
- * @param string|null $payload
- * @param string|null $header
- */
- public function sendPackage(string $payload = null, string $header = null): void
- {
$this->relay->sendPackage(
(string)$header,
- Relay::PAYLOAD_CONTROL | ($header ? Relay::PAYLOAD_NONE : Relay::PAYLOAD_RAW),
+ Relay::PAYLOAD_CONTROL | ($header === null ? Relay::PAYLOAD_NONE : Relay::PAYLOAD_RAW),
(string)$payload,
Relay::PAYLOAD_RAW
);
|
#<I> Replace multiple sys_calls with a combined one
|
diff --git a/Classes/Service/HttpPush/ImageHttpPush.php b/Classes/Service/HttpPush/ImageHttpPush.php
index <HASH>..<HASH> 100644
--- a/Classes/Service/HttpPush/ImageHttpPush.php
+++ b/Classes/Service/HttpPush/ImageHttpPush.php
@@ -56,7 +56,7 @@ class ImageHttpPush extends AbstractHttpPush
return [];
}
- \preg_match_all('/(?<=["\'])[^="\']*\.(' . $this->lastExtension . ')\.*\d*\.*(?=["\'])/', $content, $imagesFiles);
+ \preg_match_all('/(?<=["\'])[^="\'\\\\]*\.(' . $this->lastExtension . ')\.*\d*\.*(?=["\'])/', $content, $imagesFiles);
$paths = $this->streamlineFilePaths((array)$imagesFiles[0]);
return $this->mapPathsWithType($paths, 'image');
|
[BUGFIX] Do not detect images in JSON files
|
diff --git a/rah_bitly.php b/rah_bitly.php
index <HASH>..<HASH> 100644
--- a/rah_bitly.php
+++ b/rah_bitly.php
@@ -179,9 +179,9 @@ class rah_bitly {
public function update($event, $step, $r) {
- global $app_mode;
+ global $app_mode, $ID;
- $this->permlink = permlinkurl_id($r['ID']);
+ $this->permlink = permlinkurl_id($ID ? $ID : $r['ID']);
callback_event('rah_bitly.update');
|
ID isn't available on article_posted event.
Need to use the global $ID.
|
diff --git a/core/src/main/java/org/jboss/hal/core/elytron/CredentialReference.java b/core/src/main/java/org/jboss/hal/core/elytron/CredentialReference.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/jboss/hal/core/elytron/CredentialReference.java
+++ b/core/src/main/java/org/jboss/hal/core/elytron/CredentialReference.java
@@ -111,7 +111,7 @@ public class CredentialReference {
Metadata crMetadata = metadata.forComplexAttribute(credentialReferenceName);
EmptyState.Builder emptyStateBuilder = new EmptyState.Builder(
- Ids.build(baseId, credentialReferenceName, Ids.EMPTY),
+ Ids.build(baseId, credentialReferenceName, Ids.FORM, Ids.EMPTY),
resources.constants().noResource());
if (crMetadata.getSecurityContext().isWritable()) {
|
Change ID for empty state in cred-ref forms
|
diff --git a/integration-tests/src/test/java/tachyon/master/MasterFaultToleranceIntegrationTest.java b/integration-tests/src/test/java/tachyon/master/MasterFaultToleranceIntegrationTest.java
index <HASH>..<HASH> 100644
--- a/integration-tests/src/test/java/tachyon/master/MasterFaultToleranceIntegrationTest.java
+++ b/integration-tests/src/test/java/tachyon/master/MasterFaultToleranceIntegrationTest.java
@@ -155,6 +155,8 @@ public class MasterFaultToleranceIntegrationTest {
}
}
+ // TODO: Resolve the issue with HDFS as UnderFS
+ @Ignore
@Test
public void createFilesTest() throws Exception {
int clients = 10;
@@ -172,6 +174,8 @@ public class MasterFaultToleranceIntegrationTest {
}
}
+ // TODO: Resolve the issue with HDFS as UnderFS
+ @Ignore
@Test
public void killStandbyTest() throws Exception {
// If standby masters are killed(or node failure), current leader should not be affected and the
|
All cases can not pass in hdfs1Test profile
cannot pass in hdfs
|
diff --git a/lib/tumugi/logger/scoped_logger.rb b/lib/tumugi/logger/scoped_logger.rb
index <HASH>..<HASH> 100644
--- a/lib/tumugi/logger/scoped_logger.rb
+++ b/lib/tumugi/logger/scoped_logger.rb
@@ -4,7 +4,8 @@ require 'forwardable'
module Tumugi
class ScopedLogger
extend Forwardable
- def_delegators :@logger, :debug?, :error?, :fatal?, :info?, :warn?, :level
+ def_delegators :@logger, :init, :verbose!, :quiet!, :workflow_id, :workflow_id=,
+ :debug?, :error?, :fatal?, :info?, :warn?, :level
def initialize(scope)
@scope = scope
|
Add delgationm method to Logger
|
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
index <HASH>..<HASH> 100644
--- a/pythonforandroid/build.py
+++ b/pythonforandroid/build.py
@@ -669,8 +669,12 @@ def run_pymodules_install(ctx, modules):
venv = sh.Command(ctx.virtualenv)
with current_directory(join(ctx.build_dir)):
shprint(venv,
- '--python=python{}'.format(ctx.python_recipe.major_minor_version_string),
- 'venv')
+ '--python=python{}'.format(
+ ctx.python_recipe.major_minor_version_string.
+ partition(".")[0]
+ ),
+ 'venv'
+ )
info('Creating a requirements.txt file for the Python modules')
with open('requirements.txt', 'w') as fileh:
|
Fix incorrect assumption that OS python minor version matches hostpython
|
diff --git a/app/mailers/activity_notification/mailer.rb b/app/mailers/activity_notification/mailer.rb
index <HASH>..<HASH> 100644
--- a/app/mailers/activity_notification/mailer.rb
+++ b/app/mailers/activity_notification/mailer.rb
@@ -4,7 +4,6 @@ if defined?(ActionMailer)
include ActivityNotification::Mailers::Helpers
# Sends notification email
- #
# @param [Notification] notification Notification instance to send email
# @param [Hash] options Options for notification email
# @option options [String, Symbol] :fallback (:default) Fallback template to use when MissingTemplate is raised
|
Update mailer to complete docs
|
diff --git a/spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java b/spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
index <HASH>..<HASH> 100644
--- a/spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
+++ b/spring-ldap/src/main/java/org/springframework/ldap/core/support/AbstractContextSource.java
@@ -281,10 +281,10 @@ public abstract class AbstractContextSource implements ContextSource,
+ "using default implementation");
if (StringUtils.isBlank(userDn)) {
log
- .warn("Property 'userDn' not set - "
+ .info("Property 'userDn' not set - "
+ "anonymous context will be used for read-write operations");
} else if (StringUtils.isBlank(password)) {
- log.warn("Property 'password' not set - "
+ log.info("Property 'password' not set - "
+ "blank password will be used");
}
authenticationSource = new SimpleAuthenticationSource();
|
Fix for LDAP-<I>: modified log level for blank userDn and password.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -290,6 +290,7 @@ SETUP_KWARGS = {'name': NAME,
'packages': ['salt',
'salt.cli',
'salt.client',
+ 'salt.client.ssh',
'salt.ext',
'salt.auth',
'salt.wheel',
|
include salt.client.ssh in setup.py
|
diff --git a/ez_setup.py b/ez_setup.py
index <HASH>..<HASH> 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -30,7 +30,7 @@ try:
except ImportError:
USER_SITE = None
-DEFAULT_VERSION = "14.0"
+DEFAULT_VERSION = "14.1"
DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
DEFAULT_SAVE_DIR = os.curdir
diff --git a/setuptools/version.py b/setuptools/version.py
index <HASH>..<HASH> 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '14.0'
+__version__ = '14.1'
|
Bumped to <I> in preparation for next release.
|
diff --git a/lib/event_listeners.js b/lib/event_listeners.js
index <HASH>..<HASH> 100644
--- a/lib/event_listeners.js
+++ b/lib/event_listeners.js
@@ -359,7 +359,7 @@ AWS.EventListeners = {
code: 'UnknownEndpoint',
region: err.region,
hostname: err.hostname,
- retryable: false,
+ retryable: true,
originalError: err
});
}
|
set ENOTFOUND_ERROR errors to be retryable
|
diff --git a/plumbing/transport/common.go b/plumbing/transport/common.go
index <HASH>..<HASH> 100644
--- a/plumbing/transport/common.go
+++ b/plumbing/transport/common.go
@@ -94,7 +94,7 @@ type ReceivePackSession interface {
// Endpoint represents a Git URL in any supported protocol.
type Endpoint struct {
- // Protocol is the protocol of the endpoint (e.g. git, https, file). I
+ // Protocol is the protocol of the endpoint (e.g. git, https, file).
Protocol string
// User is the user.
User string
|
plumbing/transport: Fix truncated comment in Endpoint
|
diff --git a/pypeerassets/kutil.py b/pypeerassets/kutil.py
index <HASH>..<HASH> 100644
--- a/pypeerassets/kutil.py
+++ b/pypeerassets/kutil.py
@@ -25,7 +25,10 @@ class Kutil:
self.network = network
try:
- setup(self.network)
+ if self.network.startswith('t'):
+ setup('testnet')
+ else:
+ setup('mainnet')
except ValueError:
pass
|
workaround to let btcpy know is it testnet or mainnet
|
diff --git a/Serializer/GraphNavigator.php b/Serializer/GraphNavigator.php
index <HASH>..<HASH> 100644
--- a/Serializer/GraphNavigator.php
+++ b/Serializer/GraphNavigator.php
@@ -95,8 +95,18 @@ final class GraphNavigator
*/
public function accept($data, array $type = null, VisitorInterface $visitor)
{
- // determine type if not given
+ // If the type was not given, we infer the most specific type from the
+ // input data in serialization mode.
if (null === $type) {
+ if (self::DIRECTION_DESERIALIZATION === $this->direction) {
+ $msg = 'The type must be given for all properties when deserializing.';
+ if (null !== $path = $this->getCurrentPath()) {
+ $msg .= ' Path: '.$path;
+ }
+
+ throw new \RuntimeException($msg);
+ }
+
if (null === $data) {
return null;
}
|
added a sanity check
|
diff --git a/nodeconductor/cloud/backend/openstack.py b/nodeconductor/cloud/backend/openstack.py
index <HASH>..<HASH> 100644
--- a/nodeconductor/cloud/backend/openstack.py
+++ b/nodeconductor/cloud/backend/openstack.py
@@ -209,7 +209,7 @@ class OpenStackBackend(object):
def get_resource_stats(self, auth_url):
try:
credentials = self.get_credentials(auth_url)
- nova = self.get_nova_client(credentials)
+ nova = self.get_nova_client(**credentials)
return nova.hypervisors.statistics()._info
except (nova_exceptions.ClientException, keystone_exceptions.ClientException):
logger.exception('Failed to get statics for auth_url: %s', auth_url)
|
Unpack credentials into a kwargs
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.