diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/client/lib/i18n-utils/switch-locale.js b/client/lib/i18n-utils/switch-locale.js
index <HASH>..<HASH> 100644
--- a/client/lib/i18n-utils/switch-locale.js
+++ b/client/lib/i18n-utils/switch-locale.js
@@ -24,6 +24,7 @@ function languageFileUrl( localeSlug ) {
function setLocaleInDOM( localeSlug, isRTL ) {
document.documentElement.lang = localeSlug;
document.documentElement.dir = isRTL ? 'rtl' : 'ltr';
+ document.body.classList[ isRTL ? 'add' : 'remove' ]( 'rtl' );
const directionFlag = isRTL ? '-rtl' : '';
const debugFlag = process.env.NODE_ENV === 'development' ? '-debug' : '';
|
When switching locale at runtime, modify the body element's LTR/RTL class (#<I>)
In RTL mode, the `body` element is expected to have a `rtl` CSS class. This patch
ensures that the class is added/removed when switching locales dynamically at runtime.
Some styles, i.e., the ones that horizontally flip Gridicon arrows, depend on the `body.rtl`
class being present.
|
diff --git a/flux_led/models_db.py b/flux_led/models_db.py
index <HASH>..<HASH> 100755
--- a/flux_led/models_db.py
+++ b/flux_led/models_db.py
@@ -1012,10 +1012,14 @@ MODELS = [
model_num=0x44,
# v8 - AK001-ZJ200 aka old flux
# v9 - AK001-ZJ210
+ # v10.49 - AK001-ZJ2101
models=["AK001-ZJ200", "AK001-ZJ210"],
description="Bulb RGBW",
always_writes_white_and_colors=False, # Formerly rgbwprotocol
- protocols=[MinVersionProtocol(0, PROTOCOL_LEDENET_8BYTE)],
+ protocols=[
+ MinVersionProtocol(0, PROTOCOL_LEDENET_8BYTE),
+ MinVersionProtocol(10, PROTOCOL_LEDENET_8BYTE_AUTO_ON),
+ ],
mode_to_color_mode={},
color_modes=COLOR_MODES_RGB_W, # Formerly rgbwcapable
channel_map={},
|
Add newer 0x<I> bulb to the database (#<I>)
|
diff --git a/languagetool-wikipedia/src/main/java/org/languagetool/dev/wikipedia/atom/MatchDatabase.java b/languagetool-wikipedia/src/main/java/org/languagetool/dev/wikipedia/atom/MatchDatabase.java
index <HASH>..<HASH> 100644
--- a/languagetool-wikipedia/src/main/java/org/languagetool/dev/wikipedia/atom/MatchDatabase.java
+++ b/languagetool-wikipedia/src/main/java/org/languagetool/dev/wikipedia/atom/MatchDatabase.java
@@ -73,7 +73,14 @@ class MatchDatabase {
prepSt.setLong(10, ruleMatch.getDiffId());
prepSt.execute();
} catch (SQLException e) {
- throw new RuntimeException("Could not add rule match " + ruleMatch + " to database", e);
+ if (e.toString().contains("Incorrect string value")) {
+ // Let's accept this - i.e. not crash - for now:
+ // See http://stackoverflow.com/questions/1168036/ and http://stackoverflow.com/questions/10957238/
+ System.err.println("Could not add rule match " + ruleMatch + " to database - stacktrace follows:");
+ e.printStackTrace();
+ } else {
+ throw new RuntimeException("Could not add rule match " + ruleMatch + " to database", e);
+ }
}
}
|
feed checker: don't crash on "Incorrect string value" MySQL problem, just log it
|
diff --git a/lib/client.js b/lib/client.js
index <HASH>..<HASH> 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -553,7 +553,8 @@ transports.sse = function(uri, params) {
}
});
// #### Aborting the transport
- // Aborts the current request.
+ // Aborts the current request. The rest of work, firing the close
+ // event, will be done by `error` event handler.
transport.abort = function() {
req.abort();
};
|
Found which event handler fires close event
|
diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
index <HASH>..<HASH> 100644
--- a/src/bootstrap-table.js
+++ b/src/bootstrap-table.js
@@ -2165,6 +2165,8 @@
}
this._xhr = $.ajax(request)
}
+
+ return data
}
initSearchText () {
@@ -3009,9 +3011,8 @@
if (params && params.pageSize) {
this.options.pageSize = params.pageSize
}
- this.initServer(params && params.silent,
- params && params.query, params && params.url)
- this.trigger('refresh', params)
+ this.trigger('refresh', this.initServer(params && params.silent,
+ params && params.query, params && params.url))
}
resetWidth () {
|
ref #<I>: Updated refresh event params.
|
diff --git a/client/selfrepair/self_repair_runner.js b/client/selfrepair/self_repair_runner.js
index <HASH>..<HASH> 100644
--- a/client/selfrepair/self_repair_runner.js
+++ b/client/selfrepair/self_repair_runner.js
@@ -1,5 +1,3 @@
-import uuid from 'node-uuid';
-
import JexlEnvironment from './JexlEnvironment.js';
const registeredActions = {};
@@ -58,21 +56,6 @@ export function fetchAction(recipe) {
}
fetchAction._cache = {};
-
-/**
- * Get a user id. If one doesn't exist yet, make one up and store it in local storage.
- * @return {String} A stored or generated UUID
- */
-export function getUserId() {
- let userId = localStorage.getItem('userId');
- if (userId === null) {
- userId = uuid.v4();
- localStorage.setItem('userId', userId);
- }
- return userId;
-}
-
-
/**
* Fetch all enabled recipes from the server.
* @promise Resolves with a list of all enabled recipes.
@@ -134,7 +117,7 @@ export async function filterContext(driver) {
return {
normandy: {
locale: driver.locale,
- userId: getUserId(),
+ userId: driver.userId,
...client,
...classification,
},
|
Removed uuid stuff from self repair runner
|
diff --git a/remi/server.py b/remi/server.py
index <HASH>..<HASH> 100644
--- a/remi/server.py
+++ b/remi/server.py
@@ -417,6 +417,9 @@ class App(BaseHTTPRequestHandler, object):
- file requests
"""
+ re_static_file = re.compile(r"^/*res\/(.*)$")
+ re_attr_call = re.compile(r"^\/*(\w+)\/(\w+)\?{0,1}(\w*\={1}\w+\${0,1})*$")
+
def __init__(self, request, client_address, server, **app_args):
self._app_args = app_args
self.client = None
@@ -828,8 +831,8 @@ function uploadFile(widgetID, eventSuccess, eventFail, eventData, file){
def _process_all(self, function):
self.log.debug('get: %s' % function)
- static_file = re.match(r"^/*res\/(.*)$", function)
- attr_call = re.match(r"^\/*(\w+)\/(\w+)\?{0,1}(\w*\={1}\w+\${0,1})*$", function)
+ static_file = self.re_static_file.match(function)
+ attr_call = self.re_attr_call.match(function)
if (function == '/') or (not function):
# build the root page once if necessary
should_call_main = not hasattr(self.client, 'root')
|
static: cache regexs for speed
|
diff --git a/salt/states/dockerio.py b/salt/states/dockerio.py
index <HASH>..<HASH> 100644
--- a/salt/states/dockerio.py
+++ b/salt/states/dockerio.py
@@ -459,8 +459,8 @@ def run(name,
docked_onlyif=None,
docked_unless=None,
*args, **kwargs):
- '''Run a command in a specific container
-
+ '''
+ Run a command in a specific container
You can match by either name or hostname
@@ -487,9 +487,10 @@ def run(name,
'''
if hostname:
- salt.utils.warn_until((0, 19),
- 'The argument \'hostname\' argument'
- ' has been deprecated.')
+ salt.utils.warn_until(
+ 'Helium',
+ 'The \'hostname\' argument has been deprecated.'
+ )
retcode = __salt__['docker.retcode']
drun_all = __salt__['docker.run_all']
valid = functools.partial(_valid, name=name)
|
Fix warn_until call
This is pointing at a release using the old versioning scheme.
|
diff --git a/upload/system/library/language.php b/upload/system/library/language.php
index <HASH>..<HASH> 100644
--- a/upload/system/library/language.php
+++ b/upload/system/library/language.php
@@ -15,6 +15,16 @@ class Language {
public function set($key, $value) {
$this->data[$key] = $value;
}
+
+ // Please dont use the below function i'm thinking getting rid of it.
+ public function all() {
+ return $this->data;
+ }
+
+ // Please dont use the below function i'm thinking getting rid of it.
+ public function merge(&$data) {
+ array_merge($this->data, $data);
+ }
public function load($filename, &$data = array()) {
$_ = array();
|
Added back language methods for <I>.x rc version
Although 3.x will be the next release, updated <I>.x rc version to support language all() and merge() methods again. 3.x may not contain these methods so modules should prepare and remove for that release but backwards support added back for this branch.
|
diff --git a/conf.py b/conf.py
index <HASH>..<HASH> 100644
--- a/conf.py
+++ b/conf.py
@@ -34,7 +34,7 @@ extensions = [
'sphinx.ext.coverage',
'sphinx.ext.mathjax',
'sphinx.ext.viewcode',
- 'sphinxcontrib.napoleon'
+ 'sphinx.ext.napoleon'
]
# Add any paths that contain templates here, relative to this directory.
|
Switched to sphinx.ext.napoleon from sphinxcontrib.napoleon
|
diff --git a/ipyrad/assemble/utils.py b/ipyrad/assemble/utils.py
index <HASH>..<HASH> 100644
--- a/ipyrad/assemble/utils.py
+++ b/ipyrad/assemble/utils.py
@@ -13,6 +13,7 @@ except ImportError:
izip = zip
import os
+import sys
import socket
import pandas as pd
import numpy as np
@@ -39,6 +40,7 @@ class IPyradError(Exception):
Exception.__init__(self, *args, **kwargs)
else:
# clean exit for CLI that still exits as an Error (e.g. for HPC)
+ sys.tracebacklimit = 0
SystemExit(1)
|
no traceback in CLI unless debug
|
diff --git a/src/client/js/main.js b/src/client/js/main.js
index <HASH>..<HASH> 100644
--- a/src/client/js/main.js
+++ b/src/client/js/main.js
@@ -256,17 +256,17 @@ require(
var rootNode;
- NodeService.on(context, 'initialize', function(c) {
- NodeService.loadNode(context, '')
+ NodeService.on(context, 'initialize', function(currentContext) {
+ NodeService.loadNode(currentContext, '')
.then(function (node) {
rootNode = node;
console.log(node);
- console.log(context);
+ console.log(currentContext);
//console.log(c);
});
});
- NodeService.on(context, 'destroy', function(c) {
+ NodeService.on(context, 'destroy', function(currentContext) {
rootNode = null;
});
});
|
Fix suggested usage.
Former-commit-id: <I>ed<I>b<I>ebe1d2c4c<I>d<I>b8cffc<I>e<I>
|
diff --git a/plugins/Dashboard/templates/dashboardWidget.js b/plugins/Dashboard/templates/dashboardWidget.js
index <HASH>..<HASH> 100755
--- a/plugins/Dashboard/templates/dashboardWidget.js
+++ b/plugins/Dashboard/templates/dashboardWidget.js
@@ -120,7 +120,7 @@
var currentWidget = this.element;
$('body').on('click.dashboardWidget', function (ev) {
- if (ev.target.className == "ui-widget-overlay") {
+ if (/ui-widget-overlay/.test(ev.target.className)) {
$(currentWidget).dialog("close");
}
});
|
refs #<I> fixed maximised widgets not closing on click outside
|
diff --git a/vendor/document-title/document-title.js b/vendor/document-title/document-title.js
index <HASH>..<HASH> 100644
--- a/vendor/document-title/document-title.js
+++ b/vendor/document-title/document-title.js
@@ -80,13 +80,13 @@ Ember.Router.reopen({
setTitle: function(title) {
var container = getOwner ? getOwner(this) : this.container;
var renderer = container.lookup('renderer:-dom');
+ var domForAppWithGlimmer2 = container.lookup('service:-document');
if (renderer && renderer._dom) {
Ember.set(renderer, '_dom.document.title', title);
- } else if (renderer && renderer._env && renderer._env.getDOM) {
+ } else if (domForAppWithGlimmer2) {
// Glimmer 2 has a different renderer
- var dom = renderer._env.getDOM();
- Ember.set(dom, 'document.title', title);
+ Ember.set(domForAppWithGlimmer2, 'title', title);
} else {
document.title = title;
}
|
Fix setting title in fastboot with glimmer2
|
diff --git a/lib/IDS/Log/Email.php b/lib/IDS/Log/Email.php
index <HASH>..<HASH> 100644
--- a/lib/IDS/Log/Email.php
+++ b/lib/IDS/Log/Email.php
@@ -215,17 +215,15 @@ class IDS_Log_Email implements IDS_Log_Interface
* loop through all files in the tmp directory and
* delete garbage files
*/
- $dir = $this->tmp_path;
+ $dir = $this->tmp_path;
$numPrefixChars = strlen($this->file_prefix);
- $files = scandir($dir);
+ $files = scandir($dir);
foreach ($files as $file) {
- if (is_file($dir . $file)) {
+ if (is_file($dir . DIRECTORY_SEPARATOR . $file)) {
if (substr($file, 0, $numPrefixChars) == $this->file_prefix) {
- $lastModified = filemtime($dir . $file);
-
- if ((
- time() - $lastModified) > 3600) {
- unlink($dir . $file);
+ $lastModified = filemtime($dir . DIRECTORY_SEPARATOR . $file);
+ if ((time() - $lastModified) > 3600) {
+ unlink($dir . DIRECTORY_SEPARATOR . $file);
}
}
}
|
* fixed a problem in the IDS Email Logger spotted and fix-suggested by ampt
|
diff --git a/src/main/java/org/codehaus/mojo/jaxb2/schemageneration/XsdGeneratorHelper.java b/src/main/java/org/codehaus/mojo/jaxb2/schemageneration/XsdGeneratorHelper.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/codehaus/mojo/jaxb2/schemageneration/XsdGeneratorHelper.java
+++ b/src/main/java/org/codehaus/mojo/jaxb2/schemageneration/XsdGeneratorHelper.java
@@ -58,6 +58,7 @@ import java.io.Reader;
import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -544,8 +545,13 @@ public final class XsdGeneratorHelper {
FACTORY = TransformerFactory.newInstance();
// Harmonize XML formatting
- FACTORY.setAttribute("indent-number", 2);
-
+ for(String currentAttributeName : Arrays.asList("indent-number", OutputKeys.INDENT)) {
+ try {
+ FACTORY.setAttribute(currentAttributeName, 2);
+ } catch(IllegalArgumentException ex) {
+ // Ignore this.
+ }
+ }
} catch (Throwable exception) {
// This should really not happen... but it seems to happen in some test cases.
|
Fixes #<I>. Ignored any exceptions from the TransformerFactory when setting the indent level. Also implemented testing out 2 candidates for indentation attribute.
|
diff --git a/skyfield/data/earth_orientation.py b/skyfield/data/earth_orientation.py
index <HASH>..<HASH> 100644
--- a/skyfield/data/earth_orientation.py
+++ b/skyfield/data/earth_orientation.py
@@ -16,7 +16,7 @@ def morrison_and_stephenson_2004_table():
def usno_historic_delta_t():
import pandas as pd
f = load.open('http://maia.usno.navy.mil/ser7/historic_deltat.data')
- df = pd.read_table(f, sep=rb' +', engine='python', skiprows=[1])
+ df = pd.read_table(f, sep=b' +', engine='python', skiprows=[1])
return pd.DataFrame({'year': df[b'Year'], 'delta_t': df[b'TDT-UT1']})
def main():
|
Fix string to be compatible with py<I> (#<I>)
|
diff --git a/discord/mentions.py b/discord/mentions.py
index <HASH>..<HASH> 100644
--- a/discord/mentions.py
+++ b/discord/mentions.py
@@ -68,6 +68,22 @@ class AllowedMentions:
self.users = users
self.roles = roles
+ @classmethod
+ def all(cls):
+ """A factory method that returns a :class:`AllowedMentions` with all fields explicitly set to ``True``
+
+ .. versionadded:: 1.5
+ """
+ return cls(everyone=True, users=True, roles=True)
+
+ @classmethod
+ def none(cls):
+ """A factory method that returns a :class:`AllowedMentions` with all fields set to ``False``
+
+ .. versionadded:: 1.5
+ """
+ return cls(everyone=False, users=False, roles=False)
+
def to_dict(self):
parse = []
data = {}
|
Classmethods all and none for AllowedMentions
|
diff --git a/testrail/helper.py b/testrail/helper.py
index <HASH>..<HASH> 100644
--- a/testrail/helper.py
+++ b/testrail/helper.py
@@ -30,6 +30,8 @@ def class_name(meth):
def singleresult(func):
def func_wrapper(*args, **kw):
items = func(*args)
+ if hasattr(items, '__iter__'):
+ items = list(items)
if len(items) > 1:
raise TestRailError(
'identifier "%s" returned multiple results' % args[1])
|
Update singleresult to correctly handle iterators
- closes #<I>
- Updates singleresult function to detect when an interator has been passed
in, and transform it into a list
|
diff --git a/src/Checks/Production/XDebugIsNotEnabled.php b/src/Checks/Production/XDebugIsNotEnabled.php
index <HASH>..<HASH> 100644
--- a/src/Checks/Production/XDebugIsNotEnabled.php
+++ b/src/Checks/Production/XDebugIsNotEnabled.php
@@ -24,7 +24,7 @@ class XDebugIsNotEnabled implements Check
*/
public function check(): bool
{
- return extension_loaded('xdebug') === true;
+ return extension_loaded('xdebug') === false;
}
/**
@@ -36,4 +36,4 @@ class XDebugIsNotEnabled implements Check
{
return 'You should not have the "xdebug" PHP extension activated in production.';
}
-}
\ No newline at end of file
+}
|
Fix conditional logic in XDebugIsNotEnabled
Check should pass if extension is not loaded
|
diff --git a/lib/fuzz/cache.rb b/lib/fuzz/cache.rb
index <HASH>..<HASH> 100644
--- a/lib/fuzz/cache.rb
+++ b/lib/fuzz/cache.rb
@@ -2,7 +2,7 @@ require "fileutils"
class Fuzz::Cache
def initialize(cache_file)
- @cache_file = cache_file
+ @cache_file = File.expand_path(cache_file)
@entries = cache_entries(@cache_file)
end
diff --git a/lib/fuzz/version.rb b/lib/fuzz/version.rb
index <HASH>..<HASH> 100644
--- a/lib/fuzz/version.rb
+++ b/lib/fuzz/version.rb
@@ -1,3 +1,3 @@
module Fuzz
- VERSION = "0.1.0"
+ VERSION = "0.1.1"
end
|
Expand cache file path
This lets us use `~` and other shortcuts in our cache paths.
|
diff --git a/Neos.Flow/Tests/Functional/I18n/Cldr/Reader/DatesReaderTest.php b/Neos.Flow/Tests/Functional/I18n/Cldr/Reader/DatesReaderTest.php
index <HASH>..<HASH> 100644
--- a/Neos.Flow/Tests/Functional/I18n/Cldr/Reader/DatesReaderTest.php
+++ b/Neos.Flow/Tests/Functional/I18n/Cldr/Reader/DatesReaderTest.php
@@ -53,6 +53,6 @@ class DatesReaderTest extends FunctionalTestCase
self::assertEquals('M/d/yy, h:mm a', $convertFormatToString($enUSFormat));
$deFormat = $this->datesReader->parseFormatFromCldr(new Locale('de'), DatesReader::FORMAT_TYPE_DATETIME, DatesReader::FORMAT_LENGTH_SHORT);
- self::assertEquals('dd.MM.yy HH:mm', $convertFormatToString($deFormat));
+ self::assertEquals('dd.MM.yy, HH:mm', $convertFormatToString($deFormat));
}
}
|
TASK: Update test pattern after CLDR update
|
diff --git a/tests/pyy_html_tests/attributes.py b/tests/pyy_html_tests/attributes.py
index <HASH>..<HASH> 100644
--- a/tests/pyy_html_tests/attributes.py
+++ b/tests/pyy_html_tests/attributes.py
@@ -17,7 +17,9 @@ Public License along with pyy. If not, see
'''
import unittest
-from pyy_html.html import img
+from pyy_html.html import *
+from pyy_html.util import *
+
class AttributeTests(unittest.TestCase):
def testAddViaDict(self):
@@ -31,4 +33,10 @@ class AttributeTests(unittest.TestCase):
def testBooleanAttribute(self):
i = img(test=True)
- self.assertEqual(str(i), '<img test="test" />')
\ No newline at end of file
+ self.assertEqual(str(i), '<img test="test" />')
+
+ def testUtils(self):
+ d = div()
+ d += pipe('echo hi')
+ self.assertEqual(str(d), '<div>\n\thi\n\n</div>')
+
|
added #<I> to test cases
|
diff --git a/lib/puppet/network/formats.rb b/lib/puppet/network/formats.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/network/formats.rb
+++ b/lib/puppet/network/formats.rb
@@ -38,6 +38,10 @@ end
Puppet::Network::FormatHandler.create_serialized_formats(:b64_zlib_yaml) do
require 'base64'
+ def issue_deprecation_warning
+ Puppet.deprecation_warning("The b64_zlib_yaml format is deprecated and will be removed in a future release. See http://links.puppetlabs.com/deprecate_yaml_on_network")
+ end
+
def use_zlib?
Puppet.features.zlib? && Puppet[:zlib]
end
@@ -51,22 +55,30 @@ Puppet::Network::FormatHandler.create_serialized_formats(:b64_zlib_yaml) do
end
def intern(klass, text)
+ issue_deprecation_warning
+
requiring_zlib do
Puppet::Network::FormatHandler.format(:yaml).intern(klass, decode(text))
end
end
def intern_multiple(klass, text)
+ issue_deprecation_warning
+
requiring_zlib do
Puppet::Network::FormatHandler.format(:yaml).intern_multiple(klass, decode(text))
end
end
def render(instance)
+ issue_deprecation_warning
+
encode(instance.to_yaml)
end
def render_multiple(instances)
+ issue_deprecation_warning
+
encode(instances.to_yaml)
end
|
(#<I>) Issue deprecation warning for b<I>_zlib_yaml
|
diff --git a/lib/iord/crud.rb b/lib/iord/crud.rb
index <HASH>..<HASH> 100644
--- a/lib/iord/crud.rb
+++ b/lib/iord/crud.rb
@@ -19,6 +19,9 @@ module Iord
def index
@collection = resource_class.all
+ index!
+ end
+ def index!
respond_to do |format|
format.html { render }
formats(format)
@@ -26,6 +29,9 @@ module Iord
end
def show
+ show!
+ end
+ def show!
respond_to do |format|
format.html { render }
formats(format)
@@ -39,6 +45,9 @@ module Iord
@resource.public_send "build_#{name}".to_sym
end
end
+ new!
+ end
+ def new!
respond_to do |format|
format.html { render }
formats(format)
@@ -46,6 +55,9 @@ module Iord
end
def edit
+ edit!
+ end
+ def edit!
respond_to do |format|
format.html { render }
formats(format)
@@ -54,10 +66,8 @@ module Iord
def create
@resource = resource_class.new resource_params
-
create!
end
-
def create!
respond_to do |format|
if @resource.save
@@ -73,6 +83,9 @@ module Iord
def update
@resource.update_attributes resource_params
+ update!
+ end
+ def update!
respond_to do |format|
if @resource.save
flash[:notice] = t('iord.flash.update.notice', model: resource_name)
|
added a lot more customization in crud
|
diff --git a/api/python/quilt3/packages.py b/api/python/quilt3/packages.py
index <HASH>..<HASH> 100644
--- a/api/python/quilt3/packages.py
+++ b/api/python/quilt3/packages.py
@@ -1,5 +1,4 @@
from collections import deque
-import binascii
import copy
import hashlib
import io
@@ -68,15 +67,16 @@ def _delete_local_physical_key(pk):
def _filesystem_safe_encode(key):
- """Encodes the key as hex. This ensures there are no slashes, uppercase/lowercase conflicts, etc."""
- return binascii.hexlify(key.encode()).decode()
+ """Returns the sha256 of the key. This ensures there are no slashes, uppercase/lowercase conflicts,
+ avoids `OSError: [Errno 36] File name too long:`, etc."""
+ return hashlib.sha256(key.encode()).hexdigest()
class ObjectPathCache(object):
@classmethod
def _cache_path(cls, url):
- prefix = '%08x' % binascii.crc32(url.encode())
- return CACHE_PATH / prefix / _filesystem_safe_encode(url)
+ url_hash = _filesystem_safe_encode(url)
+ return CACHE_PATH / url_hash[0:2] / url_hash[2:]
@classmethod
def get(cls, url):
|
Use sha<I> hashes when caching files (#<I>)
Hex encoding can result in filenames that are too long.
|
diff --git a/idiotic/util/blocks/random.py b/idiotic/util/blocks/random.py
index <HASH>..<HASH> 100644
--- a/idiotic/util/blocks/random.py
+++ b/idiotic/util/blocks/random.py
@@ -1,3 +1,4 @@
+import asyncio
import random
from idiotic import block
from idiotic import resource
|
Added missing import of asyncio
|
diff --git a/gnosis/eth/utils.py b/gnosis/eth/utils.py
index <HASH>..<HASH> 100644
--- a/gnosis/eth/utils.py
+++ b/gnosis/eth/utils.py
@@ -65,11 +65,12 @@ def decode_string_or_bytes32(data: bytes) -> str:
def remove_swarm_metadata(code: bytes) -> bytes:
"""
Remove swarm metadata from Solidity bytecode
+
:param code:
:return: Code without metadata
"""
swarm = b"\xa1\x65bzzr0"
- position = code.find(swarm)
+ position = code.rfind(swarm)
if position == -1:
raise ValueError("Swarm metadata not found in code %s" % code.hex())
return code[:position]
@@ -78,6 +79,7 @@ def remove_swarm_metadata(code: bytes) -> bytes:
def compare_byte_code(code_1: bytes, code_2: bytes) -> bool:
"""
Compare code, removing swarm metadata if necessary
+
:param code_1:
:param code_2:
:return: True if same code, False otherwise
|
Fix proxy validation vulnerability
Other contracts could be injected. Take a look at <URL>
|
diff --git a/addon/components/md-modal.js b/addon/components/md-modal.js
index <HASH>..<HASH> 100644
--- a/addon/components/md-modal.js
+++ b/addon/components/md-modal.js
@@ -21,7 +21,7 @@ export default Ember.Component.extend(UsesSettings, {
isFooterFixed: oneWay('_mdSettings.modalIsFooterFixed'),
modalClassNames: ['modal', 'show'],
- _modalClassString: computed('modalClassNames.@each', 'isFooterFixed', {
+ _modalClassString: computed('modalClassNames.[]', 'isFooterFixed', {
get() {
let names = this.get('modalClassNames');
if (this.get('isFooterFixed')) {
|
Replaced '@each' computed property with '[]' (fixes #<I>)
|
diff --git a/salt/state.py b/salt/state.py
index <HASH>..<HASH> 100644
--- a/salt/state.py
+++ b/salt/state.py
@@ -636,7 +636,7 @@ class State(object):
elif data['fun'] == 'symlink':
if 'bin' in data['name']:
self.module_refresh()
- elif data['state'] == 'pkg':
+ elif data['state'] in ('pkg', 'ports'):
self.module_refresh()
def verify_ret(self, ret):
|
Reload modules when a ports state installs packages
Since ports states modify the package database, the pkg database should
be reloaded when a port is installed.
|
diff --git a/src/CurrencyLoader.php b/src/CurrencyLoader.php
index <HASH>..<HASH> 100644
--- a/src/CurrencyLoader.php
+++ b/src/CurrencyLoader.php
@@ -35,6 +35,12 @@ class CurrencyLoader
}
}
- return static::$currencies[$list];
+ $currencies = array_filter(array_unique(static::$currencies[$list]), function ($item) {
+ return is_string($item);
+ });
+
+ sort($currencies);
+
+ return array_combine($currencies, $currencies);
}
}
|
Filter, sort, and check currencies uniqueness and fix returned array keys
|
diff --git a/reactfx/src/main/java/org/reactfx/EventStream.java b/reactfx/src/main/java/org/reactfx/EventStream.java
index <HASH>..<HASH> 100644
--- a/reactfx/src/main/java/org/reactfx/EventStream.java
+++ b/reactfx/src/main/java/org/reactfx/EventStream.java
@@ -1159,10 +1159,9 @@ public interface EventStream<T> extends Observable<Consumer<? super T>> {
* );
* }
* </pre>
- * Returns B. The first time A emits an event, B emits the result of
- * applying the reduction function: reduction(unit, mostRecent_A_EventEmitted).
- * For every event emitted after that, B emits the result of applying the
- * reduction function on those events.
+ * Returns B. When A emits an event, B emits the result of
+ * applying the reduction function on those events. When A emits its first
+ * event, B supplies Unit as the 'lastStored_A_Event'.
* <pre>
* Time --->
* A :-"Cake"--"Sugar"--"Oil"--"French Toast"---"Cookie"----->
|
Clarified javadoc wording in `accumulate(U unit, BiFunction reduction)`
|
diff --git a/tests/library/IBAN/Generation/IBANGeneratorTest.php b/tests/library/IBAN/Generation/IBANGeneratorTest.php
index <HASH>..<HASH> 100644
--- a/tests/library/IBAN/Generation/IBANGeneratorTest.php
+++ b/tests/library/IBAN/Generation/IBANGeneratorTest.php
@@ -56,6 +56,11 @@ class IBANGeneratorTest extends \PHPUnit_Framework_TestCase
$this->assertIban('MT84MALT011000012345MTLCAST001S', IBANGenerator::MT('MALT' . '01100', '0012345MTLCAST001S'));
}
+ public function testGenerateIbanAT()
+ {
+ $this->asserIban('AT131490022010010999', IBANGenerator::AT('14900', '22010010999'));
+ }
+
/**
* @expectedException Exception
*/
|
added an iban generation rule test for austria
|
diff --git a/tests/TestCase/ORM/QueryTest.php b/tests/TestCase/ORM/QueryTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/ORM/QueryTest.php
+++ b/tests/TestCase/ORM/QueryTest.php
@@ -3477,22 +3477,16 @@ class QueryTest extends TestCase
],
];
$this->assertEquals($expected, $results->toList());
- $table->deleteAll([]);
- $newArticle = $table->newEntity([
- 'title' => 'Fourth Article',
- 'body' => 'Fourth Article Body',
- 'published' => 'N',
- ]);
- $table->save($newArticle);
$results = $table
->find()
->disableHydration()
->contain('Authors')
->leftJoinWith('Authors')
+ ->where(['Articles.author_id is' => null])
->all();
$expected = [
[
- 'id' => 5,
+ 'id' => 4,
'author_id' => null,
'title' => 'Fourth Article',
'body' => 'Fourth Article Body',
|
Change test case removing second insert replacing by a where clause on the second assert
|
diff --git a/src/Api/ReadableInterface.php b/src/Api/ReadableInterface.php
index <HASH>..<HASH> 100644
--- a/src/Api/ReadableInterface.php
+++ b/src/Api/ReadableInterface.php
@@ -26,7 +26,7 @@ interface ReadableInterface {
* @todo Document this parameter.
*
* @return array
- * An array of records.
+ * An associative array representing the desired record.
*/
public function show($id, $depth, $extensions);
diff --git a/src/Api/SearchableInterface.php b/src/Api/SearchableInterface.php
index <HASH>..<HASH> 100644
--- a/src/Api/SearchableInterface.php
+++ b/src/Api/SearchableInterface.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Eloqua\Api\SearchableInterface.php
+ * Contains \Eloqua\Api\SearchableInterface
*/
namespace Eloqua\Api;
|
Minor updates to interface documentation. [ci skip]
|
diff --git a/src/Symfony/Component/Intl/Intl.php b/src/Symfony/Component/Intl/Intl.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Intl/Intl.php
+++ b/src/Symfony/Component/Intl/Intl.php
@@ -245,7 +245,9 @@ class Intl
public static function getIcuVersion()
{
if (false === self::$icuVersion) {
- if (defined('INTL_ICU_VERSION')) {
+ if (!self::isExtensionLoaded()) {
+ self::$icuVersion = self::getIcuStubVersion();
+ } elseif (defined('INTL_ICU_VERSION')) {
self::$icuVersion = INTL_ICU_VERSION;
} else {
try {
|
[Intl] Changed Intl::getIcuVersion() to return the stub version if the intl extension is not loaded
|
diff --git a/python/pyspark/ml/util.py b/python/pyspark/ml/util.py
index <HASH>..<HASH> 100644
--- a/python/pyspark/ml/util.py
+++ b/python/pyspark/ml/util.py
@@ -17,6 +17,7 @@
import sys
import uuid
+import warnings
if sys.version > '3':
basestring = str
|
[SPARK-<I>][ML][PYTHON] Import warnings in pyspark.ml.util
## What changes were proposed in this pull request?
Add missing `warnings` import.
## How was this patch tested?
Manual tests.
|
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index <HASH>..<HASH> 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1678,7 +1678,14 @@ def _replace_zip_directory_cache_data(normalized_path):
# documented anywhere and could in theory change with new Python releases)
# for no significant benefit.
for p in to_update:
- old_entry = cache.pop(p)
+ # N.B. pypy uses a custom zipimport._zip_directory_cache implementation
+ # class that does not support the complete dict interface, e.g. it does
+ # not support the dict.pop() method. For more detailed information see
+ # the following links:
+ # https://bitbucket.org/pypa/setuptools/issue/202/more-robust-zipimporter-cache-invalidation#comment-10495960
+ # https://bitbucket.org/pypy/pypy/src/dd07756a34a41f674c0cacfbc8ae1d4cc9ea2ae4/pypy/module/zipimport/interp_zipimport.py#cl-99
+ old_entry = cache[p]
+ del cache[p]
zipimport.zipimporter(p)
old_entry.clear()
old_entry.update(cache[p])
|
fix clearing zipimport._zip_directory_cache on pypy
pypy uses a custom zipimport._zip_directory_cache implementation class that
does not support the complete dict interface, e.g. it does not support the
dict.pop() method.
For more detailed information see the following links:
<URL>
|
diff --git a/Framework/Request.php b/Framework/Request.php
index <HASH>..<HASH> 100644
--- a/Framework/Request.php
+++ b/Framework/Request.php
@@ -54,6 +54,11 @@ public function __construct($config, $t) {
$seconds = empty($_GET["FakeSlow"])
? 2 : $_GET["FakeSlow"];
+ if($_GET["FakeSlow"] == 0) {
+ unset($_GET["FakeSlow"]);
+ $seconds = 0;
+ }
+
if(isset($_GET["FakeSlow"])) {
$_SESSION["FakeSlow"] = $_GET["FakeSlow"];
}
|
Allow removal of fakeslow with FakeSlow=0
|
diff --git a/src/hdnode.js b/src/hdnode.js
index <HASH>..<HASH> 100644
--- a/src/hdnode.js
+++ b/src/hdnode.js
@@ -31,6 +31,7 @@ function HDNode(K, chainCode, network) {
network = network || networks.bitcoin
assert(Buffer.isBuffer(chainCode), 'Expected Buffer, got ' + chainCode)
+ assert.equal(chainCode.length, 32, 'Expected chainCode length of 32, got ' + chainCode.length)
assert(network.bip32, 'Unknown BIP32 constants for network')
this.chainCode = chainCode
diff --git a/test/hdnode.js b/test/hdnode.js
index <HASH>..<HASH> 100644
--- a/test/hdnode.js
+++ b/test/hdnode.js
@@ -49,7 +49,13 @@ describe('HDNode', function() {
assert.equal(hd.network, networks.testnet)
})
- it('throws an exception when an unknown network is given', function() {
+ it('throws when an invalid length chain code is given', function() {
+ assert.throws(function() {
+ new HDNode(d, chainCode.slice(0, 20), networks.testnet)
+ }, /Expected chainCode length of 32, got 20/)
+ })
+
+ it('throws when an unknown network is given', function() {
assert.throws(function() {
new HDNode(d, chainCode, {})
}, /Unknown BIP32 constants for network/)
|
HDNode: assert chain code length
|
diff --git a/SoftLayer/CLI/modules/metadata.py b/SoftLayer/CLI/modules/metadata.py
index <HASH>..<HASH> 100644
--- a/SoftLayer/CLI/modules/metadata.py
+++ b/SoftLayer/CLI/modules/metadata.py
@@ -193,7 +193,6 @@ usage: sl metadata network (<public> | <private>) [options]
Get details about the public or private network
"""
- """ details about either the public or private network """
action = 'network'
@staticmethod
|
Removes lingering refactor comment
|
diff --git a/fibers.js b/fibers.js
index <HASH>..<HASH> 100644
--- a/fibers.js
+++ b/fibers.js
@@ -86,13 +86,23 @@ function setupAsyncHacks(Fiber) {
}
function logUsingFibers(fibersMethod) {
- const { ENABLE_LOG_USE_FIBERS } = process.env;
+ const logUseFibersLevel = +(process.env.ENABLE_LOG_USE_FIBERS || 0);
- if (!ENABLE_LOG_USE_FIBERS) return;
+ if (!logUseFibersLevel) return;
- console.warn(`[FIBERS_LOG] Using ${fibersMethod}.`);
- if (ENABLE_LOG_USE_FIBERS > 1) {
- console.trace();
+ if (logUseFibersLevel === 1) {
+ console.warn(`[FIBERS_LOG] Using ${fibersMethod}.`);
+ return;
+ }
+
+ const { LOG_USE_FIBERS_INCLUDE_IN_PATH } = process.env;
+ const stackFromError = new Error("[FIBERS_LOG]").stack;
+
+ if (
+ !LOG_USE_FIBERS_INCLUDE_IN_PATH ||
+ stackFromError.includes(LOG_USE_FIBERS_INCLUDE_IN_PATH)
+ ) {
+ console.warn(stackFromError);
}
}
|
Enable log stack when includes string passed by environment variable LOG_USE_FIBERS_INCLUDE_IN_PATH
|
diff --git a/examples/with-semantic-ui/pages/_document.js b/examples/with-semantic-ui/pages/_document.js
index <HASH>..<HASH> 100644
--- a/examples/with-semantic-ui/pages/_document.js
+++ b/examples/with-semantic-ui/pages/_document.js
@@ -4,9 +4,7 @@ export default class MyDocument extends Document {
render () {
return (
<html>
- <Head>
- <link rel='stylesheet' href='/_next/static/style.css' />
- </Head>
+ <Head />
<body>
<Main />
<NextScript />
|
Removing link ref style.css (#<I>)
This link ref is no more necessary to include in the Head Section. It cause error <I> in the console: <URL>
|
diff --git a/tests/functional/test_requests.py b/tests/functional/test_requests.py
index <HASH>..<HASH> 100644
--- a/tests/functional/test_requests.py
+++ b/tests/functional/test_requests.py
@@ -273,6 +273,7 @@ def test_httpretty_ignores_querystrings_from_registered_uri(now):
expect(HTTPretty.last_request.path).to.equal('/?id=123')
+@skip('TODO: fix me')
@httprettified
@within(five=microseconds)
def test_streaming_responses(now):
|
comment failing test temporarily to test github actions
|
diff --git a/seaglass/trunk/seaglass/src/main/java/com/seaglass/component/SeaGlassBorder.java b/seaglass/trunk/seaglass/src/main/java/com/seaglass/component/SeaGlassBorder.java
index <HASH>..<HASH> 100644
--- a/seaglass/trunk/seaglass/src/main/java/com/seaglass/component/SeaGlassBorder.java
+++ b/seaglass/trunk/seaglass/src/main/java/com/seaglass/component/SeaGlassBorder.java
@@ -44,7 +44,7 @@ import sun.swing.plaf.synth.SynthUI;
*
* Based on SynthBorder by Scott Violet.
*
- * @see javax.swing.play.synth.SynthBorder
+ * @see javax.swing.plaf.synth.SynthBorder
*/
public class SeaGlassBorder extends AbstractBorder implements UIResource {
private SynthUI ui;
|
Fixed spelling of package in @see.
|
diff --git a/random_name/random_name.py b/random_name/random_name.py
index <HASH>..<HASH> 100644
--- a/random_name/random_name.py
+++ b/random_name/random_name.py
@@ -53,7 +53,7 @@ class random_name(object):
"""Generate a random name from an arbitary set of files"""
- def __init__(self, namefiles=None, max_frequencies=None, nameformat='{given} {surname}', **kwargs):
+ def __init__(self, nameformat='{given} {surname}', namefiles=None, max_frequencies=None, **kwargs):
self.namefiles = namefiles or NAMEFILES
if self.namefiles == NAMEFILES:
@@ -131,5 +131,5 @@ class random_name(object):
if __name__ == '__main__':
# In the absence of tests, as least make sure specifying arguments doesn't break anything:
- rn = random_name(NAMEFILES, MAX_FREQUENCIES, '{given} {surname}', csv_args={'delimiter': ','})
+ rn = random_name('{given} {surname}', NAMEFILES, MAX_FREQUENCIES, csv_args={'delimiter': ','})
print rn.generate()
|
Make 1st arg name_format
|
diff --git a/build.js b/build.js
index <HASH>..<HASH> 100755
--- a/build.js
+++ b/build.js
@@ -144,6 +144,8 @@ function ghp() {
// temporary - put index.html back to normal
fs.renameSync('./docs/index-temp.html', './docs/index.html');
wrench.copyDirSyncRecursive('./sdk/docs', '../gh-pages/sdk/docs');
+ //delete the /src on gh-pages, we don't need it.
+ wrench.rmdirSyncRecursive('../gh-pages/src');
console.log('COMPLETE');
processOptionQueue();
|
updated build to delete /gh-pages/src after dirSync
|
diff --git a/src/invariant.js b/src/invariant.js
index <HASH>..<HASH> 100644
--- a/src/invariant.js
+++ b/src/invariant.js
@@ -5,22 +5,17 @@
* @param {boolean} condition
* @param {string} message
*/
-const NODE_ENV = process.env.NODE_ENV
-let invariant = function() {}
-
-if (NODE_ENV !== 'production') {
- invariant = function(condition, message) {
- if (message === undefined) {
- throw new Error('invariant requires an error message argument')
- }
+function invariant(condition, message) {
+ if (message === undefined) {
+ throw new Error('invariant requires an error message argument')
+ }
- let error
+ let error
- if (!condition) {
- error = new Error(message)
- error.name = 'Invariant Violation'
- throw error
- }
+ if (!condition) {
+ error = new Error(message)
+ error.name = 'Invariant Violation'
+ throw error
}
}
|
refactor: remove node env branch
|
diff --git a/src/main/java/water/fvec/Vec.java b/src/main/java/water/fvec/Vec.java
index <HASH>..<HASH> 100644
--- a/src/main/java/water/fvec/Vec.java
+++ b/src/main/java/water/fvec/Vec.java
@@ -192,8 +192,14 @@ public class Vec extends Iced {
if( _naCnt >= 0 ) return this;
Vec vthis = DKV.get(_key).get();
if( vthis._naCnt==-2 ) throw new IllegalArgumentException("Cannot ask for roll-up stats while the vector is being actively written.");
- if( vthis._naCnt>= 0 ) return vthis;
-
+ if( vthis._naCnt>= 0 ) { // KV store has a better answer
+ _min = vthis._min; _max = vthis._max;
+ _mean = vthis._mean; _sigma = vthis._sigma;
+ _size = vthis._size; _isInt = vthis._isInt;
+ _naCnt= vthis._naCnt; // Volatile write last to announce all stats ready
+ return this;
+ }
+ // Compute the hard way
final RollupStats rs = new RollupStats().doAll(this);
setRollupStats(rs);
// Now do this remotely also
|
Vec gathers rollups into self
|
diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java
index <HASH>..<HASH> 100644
--- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java
+++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractAntlrParser.java
@@ -99,9 +99,10 @@ public abstract class AbstractAntlrParser extends Parser {
}
private EObject getGrammarElement(String grammarElementID) {
- URI resolved = new ClassloaderClasspathUriResolver().resolve(getClass().getClassLoader(), URI
- .createURI(grammarElementID));
- return grammar.eResource().getResourceSet().getEObject(resolved, true);
+ URI uri = URI
+ .createURI(grammarElementID);
+// URI resolved = new ClassloaderClasspathUriResolver().resolve(getClass().getClassLoader(), uri);
+ return grammar.eResource().getResourceSet().getEObject(uri, true);
}
private Map<Integer, String> antlrTypeToLexerName = null;
|
removed explicite usage of classpathuri resolver. The grammar is loaded via XtextResourceSetImpl, which contains and uses the ClassPathURIResolver.
|
diff --git a/core/src/main/java/org/infinispan/persistence/file/SingleFileStore.java b/core/src/main/java/org/infinispan/persistence/file/SingleFileStore.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/infinispan/persistence/file/SingleFileStore.java
+++ b/core/src/main/java/org/infinispan/persistence/file/SingleFileStore.java
@@ -97,10 +97,10 @@ public class SingleFileStore implements AdvancedLoadWriteStore {
File f = new File(location + File.separator + ctx.getCache().getName() + ".dat");
if (!f.exists()) {
- File dir = f.getParentFile();
- if (!dir.exists() && !dir.mkdirs()) {
- throw log.directoryCannotBeCreated(dir.getAbsolutePath());
- }
+ File dir = f.getParentFile();
+ if (!dir.mkdirs() && !dir.exists()) {
+ throw log.directoryCannotBeCreated(dir.getAbsolutePath());
+ }
}
file = new RandomAccessFile(f, "rw").getChannel();
|
ISPN-<I> SingleFileStore.start() often fails on File.mkdirs() during concurrent cache startup
File.mkdirs() can fail if multiple concurrent threads attempt to create the same directory
|
diff --git a/cumulusci/utils.py b/cumulusci/utils.py
index <HASH>..<HASH> 100644
--- a/cumulusci/utils.py
+++ b/cumulusci/utils.py
@@ -521,7 +521,7 @@ def get_cci_upgrade_command():
def convert_to_snake_case(content):
- s1 = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", content)
+ s1 = re.sub("([^_])([A-Z][a-z]+)", r"\1_\2", content)
return re.sub("([a-z0-9])([A-Z])", r"\1_\2", s1).lower()
|
Don't add underscores where there are some already
|
diff --git a/timeside/server/management/commands/timeside-create-boilerplate.py b/timeside/server/management/commands/timeside-create-boilerplate.py
index <HASH>..<HASH> 100644
--- a/timeside/server/management/commands/timeside-create-boilerplate.py
+++ b/timeside/server/management/commands/timeside-create-boilerplate.py
@@ -132,7 +132,12 @@ class Command(BaseCommand):
providers = timeside.core.provider.providers(timeside.core.api.IProvider)
for prov in providers:
- provider, c = Provider.objects.get_or_create(pid=prov.id())
+ provider, c = Provider.objects.get_or_create(
+ pid=prov.id(),
+ source_access=prov.ressource_access(),
+ description=prov.description(),
+ name=prov.name()
+ )
# ---------- Experience All ----------
experience, c = Experience.objects.get_or_create(title='All')
|
[server] add source_access and description to providers while startin timeside server app in boilerplate #<I>
|
diff --git a/bblfsh/launcher.py b/bblfsh/launcher.py
index <HASH>..<HASH> 100644
--- a/bblfsh/launcher.py
+++ b/bblfsh/launcher.py
@@ -20,13 +20,13 @@ def ensure_bblfsh_is_running():
)
log.warning(
"Launched the Babelfish server (name bblfsh, id %s).\nStop it "
- "with: docker rm -f bblfsh\n", container.id)
+ "with: docker rm -f bblfsh", container.id)
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
result = -1
while result != 0:
time.sleep(0.1)
result = sock.connect_ex(("0.0.0.0", 9432))
- log.warning("Babelfish server is up and running.\n")
+ log.warning("Babelfish server is up and running.")
return False
finally:
client.api.close()
|
Remove redundant \n in logs
|
diff --git a/tests/TestCase/Http/Cookie/CookieCollectionTest.php b/tests/TestCase/Http/Cookie/CookieCollectionTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/Http/Cookie/CookieCollectionTest.php
+++ b/tests/TestCase/Http/Cookie/CookieCollectionTest.php
@@ -408,7 +408,7 @@ class CookieCollectionTest extends TestCase
->add(new Cookie('expired', 'ex', new DateTime('-2 seconds'), '/', 'example.com'));
$request = new ClientRequest('http://example.com/api');
$request = $collection->addToRequest($request, ['b' => 'B']);
- $this->assertSame('api=A; b=B', $request->getHeaderLine('Cookie'));
+ $this->assertSame('b=B; api=A', $request->getHeaderLine('Cookie'));
$request = new ClientRequest('http://example.com/api');
$request = $collection->addToRequest($request, ['api' => 'custom']);
|
Update CookieCollectionTest.php
|
diff --git a/spec/unit/converters/convert_file_spec.rb b/spec/unit/converters/convert_file_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/converters/convert_file_spec.rb
+++ b/spec/unit/converters/convert_file_spec.rb
@@ -7,8 +7,9 @@ RSpec.describe TTY::Prompt::Question, 'convert file' do
prompt.input << "test.txt"
prompt.input.rewind
+ allow(::File).to receive(:dirname).and_return('.')
+ allow(::File).to receive(:join).and_return("test\.txt")
allow(::File).to receive(:open).with(/test\.txt/).and_return(file)
- expect(::File).to receive(:open).with(/test\.txt/)
answer = prompt.ask("Which file to open?", convert: :file)
|
Change to stub all dependent constants
|
diff --git a/src/wyjc/io/ClassFileBuilder.java b/src/wyjc/io/ClassFileBuilder.java
index <HASH>..<HASH> 100755
--- a/src/wyjc/io/ClassFileBuilder.java
+++ b/src/wyjc/io/ClassFileBuilder.java
@@ -554,6 +554,7 @@ public class ClassFileBuilder {
String name = "constant$" + id;
JvmType type = convertType(constant.type());
bytecodes.add(new Bytecode.GetField(owner, name, type, Bytecode.STATIC));
+ addIncRefs(constant.type(),bytecodes);
}
}
|
Bug fix for constants and reference counting.
|
diff --git a/widgets/assets/FxsAssets.php b/widgets/assets/FxsAssets.php
index <HASH>..<HASH> 100755
--- a/widgets/assets/FxsAssets.php
+++ b/widgets/assets/FxsAssets.php
@@ -26,7 +26,7 @@ class FxsAssets extends \yii\web\AssetBundle {
// Define dependent Asset Loaders
public $depends = [
- 'yii\web\JqueryAsset'
+ 'cmsgears\core\common\assets\Jquery'
];
// Protected --------------
@@ -72,3 +72,4 @@ class FxsAssets extends \yii\web\AssetBundle {
// FxsAssets -----------------------------
}
+
|
Updated jquery asset.
|
diff --git a/lib/js-yaml/dumper.js b/lib/js-yaml/dumper.js
index <HASH>..<HASH> 100644
--- a/lib/js-yaml/dumper.js
+++ b/lib/js-yaml/dumper.js
@@ -226,9 +226,12 @@ function writeScalar(state, object, level) {
spaceWrap = (CHAR_SPACE === first ||
CHAR_SPACE === object.charCodeAt(object.length - 1));
- // A string starting with - or ? may be introducing a magic yaml thing.
- // Err on the side of caution and never treat these as simple scalars.
- if (CHAR_MINUS === first || CHAR_QUESTION === first) {
+ // Simplified check for restricted first characters
+ // http://www.yaml.org/spec/1.2/spec.html#ns-plain-first%28c%29
+ if (CHAR_MINUS === first ||
+ CHAR_QUESTION === first ||
+ CHAR_COMMERCIAL_AT === first ||
+ CHAR_GRAVE_ACCENT === first) {
simple = false;
}
@@ -485,9 +488,7 @@ function simpleChar(character) {
CHAR_SINGLE_QUOTE !== character &&
CHAR_DOUBLE_QUOTE !== character &&
CHAR_PERCENT !== character &&
- CHAR_COMMERCIAL_AT !== character &&
CHAR_COLON !== character &&
- CHAR_GRAVE_ACCENT !== character &&
!ESCAPE_SEQUENCES[character] &&
!needsHexEscape(character);
}
|
Dumper: allow use of reserved chars in middle of plain scalars
|
diff --git a/pgmagick/api.py b/pgmagick/api.py
index <HASH>..<HASH> 100644
--- a/pgmagick/api.py
+++ b/pgmagick/api.py
@@ -713,7 +713,7 @@ class Image(object):
if filter_type:
filter_type = getattr(pgmagick.FilterTypes,
"%sFilter" % filter_type.title())
- pgmagick.Image.filterType(self, filter_type)
+ pgmagick.Image.filterType(self.img, filter_type)
geometry = pgmagick.Geometry(size)
self.img.scale(geometry)
|
fixed: unable to filterType in pgmagick.api.Image.scale()
|
diff --git a/src/button.js b/src/button.js
index <HASH>..<HASH> 100644
--- a/src/button.js
+++ b/src/button.js
@@ -55,7 +55,7 @@ $.ButtonState = {
/**
* @class Button
* @classdesc Manages events, hover states for individual buttons, tool-tips, as well
- * as fading the bottons out when the user has not interacted with them
+ * as fading the buttons out when the user has not interacted with them
* for a specified period.
*
* @memberof OpenSeadragon
diff --git a/src/openseadragon.js b/src/openseadragon.js
index <HASH>..<HASH> 100644
--- a/src/openseadragon.js
+++ b/src/openseadragon.js
@@ -148,7 +148,7 @@
* @property {OpenSeadragon.NavImages} [navImages]
* An object with a property for each button or other built-in navigation
* control, eg the current 'zoomIn', 'zoomOut', 'home', and 'fullpage'.
- * Each of those in turn provides an image path for each state of the botton
+ * Each of those in turn provides an image path for each state of the button
* or navigation control, eg 'REST', 'GROUP', 'HOVER', 'PRESS'. Finally the
* image paths, by default assume there is a folder on the servers root path
* called '/images', eg '/images/zoomin_rest.png'. If you need to adjust
|
Updated Doclets
Botton fixes :)
|
diff --git a/spec/authy/onetouch_spec.rb b/spec/authy/onetouch_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/authy/onetouch_spec.rb
+++ b/spec/authy/onetouch_spec.rb
@@ -28,6 +28,33 @@ describe Authy::OneTouch do
expect(response).to be_kind_of(Authy::Response)
expect(response).to be_ok
end
+
+ it 'requires message as mandatory' do
+ response = Authy::OneTouch.send_approval_request(
+ id: @user.id,
+ details: {
+ 'Bank account' => '23527922',
+ 'Amount' => '10 BTC',
+ },
+ hidden_details: {
+ 'IP Address' => '192.168.0.3'
+ }
+ )
+
+ expect(response).to be_kind_of(Authy::Response)
+ expect(response).to_not be_ok
+ expect(response.message).to eq 'message cannot be blank'
+ end
+
+ it 'does not require other fields as mandatory' do
+ response = Authy::OneTouch.send_approval_request(
+ id: @user.id,
+ message: 'Test message'
+ )
+
+ expect(response).to be_kind_of(Authy::Response)
+ expect(response).to be_ok
+ end
end
describe '.approval_request_status' do
|
Added more tests for onetouch.
|
diff --git a/Backend/AMQPBackend.php b/Backend/AMQPBackend.php
index <HASH>..<HASH> 100644
--- a/Backend/AMQPBackend.php
+++ b/Backend/AMQPBackend.php
@@ -37,6 +37,9 @@ class AMQPBackend implements BackendInterface
*/
protected $queue;
+ /**
+ * @deprecated since version 2.4 and will be removed in 3.0.
+ */
protected $connection;
/**
|
connection in AMQPBackend is deprecated
|
diff --git a/digitalocean/Droplet.py b/digitalocean/Droplet.py
index <HASH>..<HASH> 100644
--- a/digitalocean/Droplet.py
+++ b/digitalocean/Droplet.py
@@ -269,9 +269,14 @@ class Droplet(BaseAPI):
elif type(ssh_key) in [str, unicode]:
key = SSHKey()
key.token = self.token
- key.public_key = ssh_key
- key.name = "SSH Key %s" % self.name
- key.create()
+ results = key.load_by_pub_key(ssh_key)
+
+ if results == None:
+ key.public_key = ssh_key
+ key.name = "SSH Key %s" % self.name
+ key.create()
+ else:
+ key = results
ssh_keys_id.append(key.id)
else:
|
Using the method to load the public key. In this way we avoid the error when creating a droplet with a ssh key already saved on DigitalOcean but given in string format.
|
diff --git a/btb/tuning/acquisition/numpyargsort.py b/btb/tuning/acquisition/numpyargsort.py
index <HASH>..<HASH> 100644
--- a/btb/tuning/acquisition/numpyargsort.py
+++ b/btb/tuning/acquisition/numpyargsort.py
@@ -11,5 +11,6 @@ class NumpyArgSortFunction(BaseAcquisitionFunction):
def _acquire(self, candidates, num_candidates=1):
scores = candidates if len(candidates.shape) == 1 else candidates[:, 0]
- sorted_scores = list(reversed(np.argsort(scores)))
+ sorted_scores = np.argsort(scores)
+ sorted_scores = list(reversed(sorted_scores)) if self.maximize else list(sorted_scores)
return sorted_scores[:num_candidates]
|
Update sort depending on maximize or minimze.
|
diff --git a/lib/generators/npush/toheroku_generator.rb b/lib/generators/npush/toheroku_generator.rb
index <HASH>..<HASH> 100644
--- a/lib/generators/npush/toheroku_generator.rb
+++ b/lib/generators/npush/toheroku_generator.rb
@@ -35,7 +35,7 @@ module Npush
end
end
- append_file 'app/assets/javascripts/application.js', '//= require socket.io.min.js'
+ prepend_file 'app/assets/javascripts/application.js', '//= require socket.io.min.js'
end
end
end
|
Prepend requires instead of appending them + add semicolon at the end of client js initializer
|
diff --git a/src/extensions/scratch3_ev3/index.js b/src/extensions/scratch3_ev3/index.js
index <HASH>..<HASH> 100644
--- a/src/extensions/scratch3_ev3/index.js
+++ b/src/extensions/scratch3_ev3/index.js
@@ -231,14 +231,10 @@ class EV3Motor {
}
/**
- * @return {int} - this motor's current position, in the range [0,360].
+ * @return {int} - this motor's current position, in the range [-inf,inf].
*/
get position () {
- let value = this._position;
- value = value % 360;
- value = value < 0 ? value * -1 : value;
-
- return value;
+ return this._position;
}
/**
@@ -1156,8 +1152,12 @@ class Scratch3Ev3Blocks {
}
const motor = this._peripheral.motor(port);
+ let position = 0;
+ if (motor) {
+ position = MathUtil.wrapClamp(motor.position, 0, 360);
+ }
- return motor ? motor.position : 0;
+ return position;
}
whenButtonPressed (args) {
|
Fixing #<I>: EV3 motor position reporter gets inverted.
|
diff --git a/pybooru/api_danbooru.py b/pybooru/api_danbooru.py
index <HASH>..<HASH> 100644
--- a/pybooru/api_danbooru.py
+++ b/pybooru/api_danbooru.py
@@ -359,3 +359,12 @@ class DanbooruApi(object):
'dmail[body]': body
}
return self._get('dmails.json', params, 'POST', auth=True)
+
+ def dmail_delete(self, dmail_id):
+ """Delete a dmail. You can only delete dmails you own (Requires login).
+
+ Parameters:
+ dmail_id: REQUIRED where dmail_id is the dmail id.
+ """
+ return self._get('dmails/{0}.json'.format(dmail_id), method='DELETE',
+ auth=True)
|
Danbooru: implement dmail_delete()
|
diff --git a/src/GrumPHP/Task/Php7cc.php b/src/GrumPHP/Task/Php7cc.php
index <HASH>..<HASH> 100644
--- a/src/GrumPHP/Task/Php7cc.php
+++ b/src/GrumPHP/Task/Php7cc.php
@@ -28,7 +28,7 @@ class Php7cc extends AbstractExternalTask
{
$resolver = new OptionsResolver();
$resolver->setDefaults(array(
- 'exclude' => array('vendor'),
+ 'exclude' => array(),
'level' => null,
'triggered_by' => array('php')
));
|
Remove the vendor directory from the default exclude directories.
|
diff --git a/src/RuntimeServiceProvider.php b/src/RuntimeServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/RuntimeServiceProvider.php
+++ b/src/RuntimeServiceProvider.php
@@ -88,10 +88,15 @@ class RuntimeServiceProvider extends ServiceProvider
Propel::setServiceContainer($serviceContainer);
- $input = new ArgvInput();
+ $command = false;
+
+ if (\App::runningInConsole()) {
+ $input = new ArgvInput();
+ $command = $input->getFirstArgument();
+ }
// skip auth driver adding if running as CLI to avoid auth model not found
- if ('propel:model:build' !== $input->getFirstArgument() && 'propel' === \Config::get('auth.driver')) {
+ if ('propel:model:build' !== $command && 'propel' === \Config::get('auth.driver')) {
$query_name = \Config::get('auth.user_query', false);
|
Fixed #3, hope that finally. Previous commit fixed partially
|
diff --git a/request_logger.go b/request_logger.go
index <HASH>..<HASH> 100644
--- a/request_logger.go
+++ b/request_logger.go
@@ -19,9 +19,15 @@ var RequestLogger = RequestLoggerFunc
// code of the response.
func RequestLoggerFunc(h Handler) Handler {
return func(c Context) error {
+ var irid interface{}
+ if irid = c.Session().Get("requestor_id"); irid == nil {
+ irid = randx.String(10)
+ c.Session().Set("requestor_id", irid)
+ c.Session().Save()
+ }
now := time.Now()
c.LogFields(logrus.Fields{
- "request_id": randx.String(10),
+ "request_id": irid.(string) + "-" + randx.String(10),
"method": c.Request().Method,
"path": c.Request().URL.String(),
})
|
improved the "stickiness" of the request_id in logs
|
diff --git a/pyinfra/api/facts.py b/pyinfra/api/facts.py
index <HASH>..<HASH> 100644
--- a/pyinfra/api/facts.py
+++ b/pyinfra/api/facts.py
@@ -173,7 +173,7 @@ def get_facts(state, name, args=None, ensure_hosts=None, apply_failed_hosts=True
with FACT_LOCK:
# Add any hosts we must have, whether considered in the inventory or not
# (these hosts might be outside the --limit or current op limit_hosts).
- hosts = set(state.inventory)
+ hosts = set(state.inventory.iter_active_hosts())
if ensure_hosts:
hosts.update(ensure_hosts)
|
Only consider active hosts when collecting facts.
|
diff --git a/packages/node-pico-engine-core/src/signalEventInFiber.js b/packages/node-pico-engine-core/src/signalEventInFiber.js
index <HASH>..<HASH> 100644
--- a/packages/node-pico-engine-core/src/signalEventInFiber.js
+++ b/packages/node-pico-engine-core/src/signalEventInFiber.js
@@ -42,6 +42,9 @@ module.exports = function(ctx, pico_id){
if(_.has(r, "directive")){
r.directives = r.directive;
delete r.directive;
+ }else{
+ //we always want to return a directives array even if it's empty
+ r.directives = [];
}
return r;
|
{directives: []}
|
diff --git a/AlphaTwirl/Binning.py b/AlphaTwirl/Binning.py
index <HASH>..<HASH> 100755
--- a/AlphaTwirl/Binning.py
+++ b/AlphaTwirl/Binning.py
@@ -65,6 +65,9 @@ class Round(object):
return [self.__call__(v) for v in val]
except TypeError:
pass
+ return float(self._callImpDecimal(val))
+
+ def _callImpDecimal(self, val):
val = decimal.Decimal(str(val))
ret = (val + self.shift)/self.width
@@ -74,7 +77,7 @@ class Round(object):
ret = ret*self.width - self.shift
if self.lowedge: ret = ret - self.halfWidth
- return float(ret)
+ return ret
##____________________________________________________________________________||
class Echo(object):
|
split Round.__call__() into two methods
|
diff --git a/js/data/RestDataSource.js b/js/data/RestDataSource.js
index <HASH>..<HASH> 100644
--- a/js/data/RestDataSource.js
+++ b/js/data/RestDataSource.js
@@ -725,7 +725,7 @@ define(["js/data/DataSource", "js/data/Model", "underscore", "flow", "JSON", "js
type: method,
queryParameter: params
}, function (err, xhr) {
- if (!err && (xhr.status == 200 || xhr.status == 304)) {
+ if (!err && (xhr.status == 200 || xhr.status == 304 || xhr.status == 202)) {
callback(null, model);
} else {
// TODO: better error handling
|
added status <I> for successful deletion
|
diff --git a/classes/debug_bar.php b/classes/debug_bar.php
index <HASH>..<HASH> 100644
--- a/classes/debug_bar.php
+++ b/classes/debug_bar.php
@@ -49,4 +49,8 @@ class Debug_Bar {
<?php
}
+ public function Debug_Bar() {
+ Debug_Bar::__construct();
+ }
+
}
diff --git a/classes/debug_bar_panel.php b/classes/debug_bar_panel.php
index <HASH>..<HASH> 100644
--- a/classes/debug_bar_panel.php
+++ b/classes/debug_bar_panel.php
@@ -62,4 +62,8 @@ abstract class Debug_Bar_Panel {
return $classes;
}
+ public function Debug_Bar_Panel( $title = '' ) {
+ Debug_Bar_Panel::__construct( $title );
+ }
+
}
|
Add PHP4-style constructors to the Debug Bar classes to avoid fatals with Debug Bar add-ons which are explicitly using them. Fixes #<I>.
|
diff --git a/vendor/plugins/authentication/app/controllers/users_controller.rb b/vendor/plugins/authentication/app/controllers/users_controller.rb
index <HASH>..<HASH> 100644
--- a/vendor/plugins/authentication/app/controllers/users_controller.rb
+++ b/vendor/plugins/authentication/app/controllers/users_controller.rb
@@ -52,8 +52,8 @@ class UsersController < ApplicationController
def forgot
if request.post?
if (user = User.find_by_email(params[:user][:email])).present?
- flash[:notice] = "An email has been sent to #{user.email} with a link to reset your password."
user.deliver_password_reset_instructions!(request)
+ flash[:notice] = "An email has been sent to #{user.email} with a link to reset your password."
redirect_back_or_default forgot_url
else
flash[:notice] = "Sorry, #{params[:user][:email]} isn't associated with any accounts. Are you sure you typed the correct email address?"
|
Flash should only be set after the mailer action succeeds.
|
diff --git a/lib/hubspot/engagement.rb b/lib/hubspot/engagement.rb
index <HASH>..<HASH> 100644
--- a/lib/hubspot/engagement.rb
+++ b/lib/hubspot/engagement.rb
@@ -92,9 +92,10 @@ module Hubspot
# @return [Hubspot::Engagement] self
def update!(params)
data = {
- engagement: engagement,
- associations: associations,
- metadata: metadata
+ engagement: params[:engagement] || engagement,
+ associations: params[:associations] || associations,
+ attachments: params[:attachments] || attachments,
+ metadata: params[:metadata] || metadata
}
Hubspot::Connection.put_json(ENGAGEMENT_PATH, params: { engagement_id: id }, body: data)
|
Params in engagement update! wasn't being used and engagement was always
updated with old values. Fixed to allow params to override.
|
diff --git a/source/rafcon/utils/installation.py b/source/rafcon/utils/installation.py
index <HASH>..<HASH> 100644
--- a/source/rafcon/utils/installation.py
+++ b/source/rafcon/utils/installation.py
@@ -78,7 +78,7 @@ def install_fonts(restart=False):
if font_installed:
logger.info("Running font detection ...")
if not update_font_cache(user_otf_fonts_folder):
- logger.warn("Could not run font detection. RAFCON might not find the correct fonts.")
+ logger.warn("Could not run font detection using 'fc-cache'. RAFCON might not find the correct fonts.")
if restart:
python = sys.executable
environ = dict(**os.environ)
|
docs(installation): update log output when trying to find fonts
|
diff --git a/source/php/Module.php b/source/php/Module.php
index <HASH>..<HASH> 100644
--- a/source/php/Module.php
+++ b/source/php/Module.php
@@ -403,8 +403,12 @@ class Module
}
global $post;
-
$module = $this;
+
+ if (is_null($post)) {
+ return;
+ }
+
$usage = $module->getModuleUsage($post->ID);
add_meta_box('modularity-usage', 'Module usage', function () use ($module, $usage) {
|
Fixes issue when $post was null
|
diff --git a/app/code/local/Edge/Base/Helper/Image.php b/app/code/local/Edge/Base/Helper/Image.php
index <HASH>..<HASH> 100644
--- a/app/code/local/Edge/Base/Helper/Image.php
+++ b/app/code/local/Edge/Base/Helper/Image.php
@@ -17,8 +17,13 @@ class Edge_Base_Helper_Image extends Mage_Core_Helper_Abstract
public function getImage($file)
{
- if (!file_exists(Mage::getBaseDir('media') . DS . $file)) {
+ $imageDirPath = Mage::getBaseDir('media') . DS . $file;
+ if (!file_exists($imageDirPath)) {
Mage::helper('core/file_storage')->processStorageFile($file);
+
+ if (Mage::getIsDeveloperMode() && !file_exists($imageDirPath)) {
+ $this->_scheduleModify = false;
+ }
}
if ($this->_scheduleModify) {
|
Avoid "File does not exists." Errors
|
diff --git a/src/Franzose/ClosureTable/Contracts/EntityInterface.php b/src/Franzose/ClosureTable/Contracts/EntityInterface.php
index <HASH>..<HASH> 100644
--- a/src/Franzose/ClosureTable/Contracts/EntityInterface.php
+++ b/src/Franzose/ClosureTable/Contracts/EntityInterface.php
@@ -10,6 +10,20 @@ interface EntityInterface {
const POSITION = 'position';
/**
+ * Indicates whether the model has children.
+ *
+ * @return bool
+ */
+ public function isParent();
+
+ /**
+ * Indicates whether the model has no ancestors.
+ *
+ * @return bool
+ */
+ public function isRoot();
+
+ /**
* @param EntityInterface $ancestor
* @param int $position
* @return EntityInterface
|
added new methods to EntityInterface
|
diff --git a/server.js b/server.js
index <HASH>..<HASH> 100644
--- a/server.js
+++ b/server.js
@@ -219,7 +219,12 @@ Server.prototype.onUdpRequest = function (msg, rinfo) {
response.connectionId = params.connectionId
var buf = makeUdpPacket(response)
- self.udp.send(buf, 0, buf.length, rinfo.port, rinfo.address)
+
+ try {
+ self.udp.send(buf, 0, buf.length, rinfo.port, rinfo.address)
+ } catch (err) {
+ self.emit('warning', err)
+ }
if (params.action === common.ACTIONS.ANNOUNCE) {
self.emit(common.EVENT_NAMES[params.event], params.addr)
|
handle udp send errors
fixes #<I>
"Port should be > 0 and < <I>"
|
diff --git a/lib/sassc-rails.rb b/lib/sassc-rails.rb
index <HASH>..<HASH> 100644
--- a/lib/sassc-rails.rb
+++ b/lib/sassc-rails.rb
@@ -1,6 +1,6 @@
begin
require "sass-rails"
- Sass::Rails.send(:remove_const, :Railtie)
+ Rails::Railtie.subclasses.delete Sass::Rails::Railtie
rescue LoadError
end
|
Prevent sass-rails railtie from running, fixes #6
|
diff --git a/src/components/player.js b/src/components/player.js
index <HASH>..<HASH> 100644
--- a/src/components/player.js
+++ b/src/components/player.js
@@ -144,6 +144,14 @@ export default class Player extends BaseObject {
}
}
+ /**
+ * Determine if the player is ready.
+ * @return {boolean} true if the player is ready. ie PLAYER_READY event has fired
+ */
+ isReady() {
+ return !!this.ready
+ }
+
addEventListeners() {
if (!this.core.isReady()) {
this.listenToOnce(this.core, Events.CORE_READY, this.onReady)
@@ -168,6 +176,7 @@ export default class Player extends BaseObject {
}
onReady() {
+ this.ready = true
this.trigger(Events.PLAYER_READY)
}
|
Added player.isReady()
So that user can check after creating the player if they missed the
PLAYER_READY event.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -28,8 +28,8 @@ Cal.prototype.query = function (opts, cb) {
var cursors = []
var lt = opts.lt, gt = opts.gt
- if (lt !== undefined && tostr(lt) !== '[object Date]') lt = new Date(lt)
- if (gt !== undefined && tostr(gt) !== '[object Date]') gt = new Date(gt)
+ if (lt !== undefined && tostr(lt) !== '[object Date]') lt = newDate(lt)
+ if (gt !== undefined && tostr(gt) !== '[object Date]') gt = newDate(gt)
var gtstr = gt && strftime('%F', gt)
var ltstr = lt && strftime('%F', lt)
@@ -167,3 +167,8 @@ Cal.prototype.remove = function (id, cb) {
function noop () {}
function tostr (x) { return Object.prototype.toString.call(x) }
+
+function newDate (str) {
+ if (/\b\d+:\d+(:\d+)?\b/.test(str)) return new Date(str)
+ else return new Date(str + ' 00:00:00')
+}
|
fix issue with new Date constructor in ranges
|
diff --git a/test/Event/Events/EventCreatedTest.php b/test/Event/Events/EventCreatedTest.php
index <HASH>..<HASH> 100644
--- a/test/Event/Events/EventCreatedTest.php
+++ b/test/Event/Events/EventCreatedTest.php
@@ -175,7 +175,7 @@ class EventCreatedTest extends \PHPUnit_Framework_TestCase
'label' => 'bar',
'domain' => 'eventtype'
),
- 'publication_date' => '2016-08-01T00:00:00+02:00'
+ 'publication_date' => '2016-08-01T00:00:00+0000'
],
new EventCreated(
'test 456',
@@ -196,7 +196,7 @@ class EventCreatedTest extends \PHPUnit_Framework_TestCase
new DateTime(
new Date(
new Year(2016),
- Month::fromNative('AUGUST'),
+ Month::fromNative('August'),
new MonthDay(1)
),
new Time(
|
III-<I>: Fixed EventCreatedTest.
|
diff --git a/src/umbra/engine.py b/src/umbra/engine.py
index <HASH>..<HASH> 100644
--- a/src/umbra/engine.py
+++ b/src/umbra/engine.py
@@ -295,6 +295,9 @@ class Umbra(foundations.ui.common.QWidgetFactory(uiFile=RuntimeGlobals.uiFile)):
LOGGER.debug("> Initializing '{0}()' class.".format(self.__class__.__name__))
+ # --- Running pre initialisation method. ---
+ hasattr(self, "onPreInitialisation") and self.onPreInitialisation()
+
super(Umbra, self).__init__(parent, *args, **kwargs)
# Engine binding to global variable.
@@ -454,6 +457,9 @@ Exception raised: {1}".format(component, error)), self.__class__.__name__)
self.restoreStartupLayout()
+ # --- Running post initialisation method. ---
+ hasattr(self, "onPostInitialisation") and self.onPostInitialisation()
+
#******************************************************************************************************************
#*** Attributes properties.
#******************************************************************************************************************
|
Add support for pre / post initialisation methods in "umbra.engine" module.
|
diff --git a/lib/random_forest/numerical_predicate.rb b/lib/random_forest/numerical_predicate.rb
index <HASH>..<HASH> 100644
--- a/lib/random_forest/numerical_predicate.rb
+++ b/lib/random_forest/numerical_predicate.rb
@@ -2,17 +2,18 @@ class NumericalPredicate
GREATER_THAN = 'greaterThan'
LESS_OR_EQUAL = 'lessOrEqual'
+ EQUAL = 'equal'
attr_reader :field
def initialize(attributes)
@field = attributes['field'].value.to_sym
- @value = Float(attributes['value'].value)
@operator = attributes['operator'].value
+ @value = @operator == EQUAL ? attributes['value'].value : Float(attributes['value'].value)
end
def true?(features)
- curr_value = Float(features[@field])
+ curr_value = @operator == EQUAL ? features[@field] : Float(features[@field])
return curr_value > @value if @operator == GREATER_THAN
curr_value < @value if @operator == LESS_OR_EQUAL
end
|
allow numerical predicate to check strings for equality
|
diff --git a/railties/lib/rails/generators/testing/assertions.rb b/railties/lib/rails/generators/testing/assertions.rb
index <HASH>..<HASH> 100644
--- a/railties/lib/rails/generators/testing/assertions.rb
+++ b/railties/lib/rails/generators/testing/assertions.rb
@@ -1,5 +1,3 @@
-require 'shellwords'
-
module Rails
module Generators
module Testing
|
remove unused require
`shellwords` is no longer needed from #<I>.
|
diff --git a/Controller/Adminhtml/Post/Save.php b/Controller/Adminhtml/Post/Save.php
index <HASH>..<HASH> 100644
--- a/Controller/Adminhtml/Post/Save.php
+++ b/Controller/Adminhtml/Post/Save.php
@@ -50,6 +50,11 @@ class Save extends Post
return $resultRedirect->setPath('*/*/');
}
$model->addData($data);
+
+ if(!$data['is_short_content']) {
+ $model->setShortContent('');
+ }
+
try {
if ($this->getRequest()->getParam('isAjax')) {
return $this->handlePreviewRequest($model);
|
Fix: issue with short content present after saving post with disabled excerpt
|
diff --git a/push/src/main/java/org/jboss/aerogear/unifiedpush/message/sender/APNsPushNotificationSender.java b/push/src/main/java/org/jboss/aerogear/unifiedpush/message/sender/APNsPushNotificationSender.java
index <HASH>..<HASH> 100644
--- a/push/src/main/java/org/jboss/aerogear/unifiedpush/message/sender/APNsPushNotificationSender.java
+++ b/push/src/main/java/org/jboss/aerogear/unifiedpush/message/sender/APNsPushNotificationSender.java
@@ -159,7 +159,8 @@ public class APNsPushNotificationSender implements PushNotificationSender {
builder.withDelegate(new ApnsDelegateAdapter() {
@Override
public void messageSent(ApnsNotification message, boolean resent) {
- logger.fine("Sending APNs message: " + message.getDeviceToken());
+ // Invoked for EVERY devicetoken:
+ logger.finest("Sending APNs message: " + message.getDeviceToken());
}
@Override
|
using finest for every token sent over to APNs
|
diff --git a/Kwf/Test/SeleniumTestCase.php b/Kwf/Test/SeleniumTestCase.php
index <HASH>..<HASH> 100644
--- a/Kwf/Test/SeleniumTestCase.php
+++ b/Kwf/Test/SeleniumTestCase.php
@@ -41,6 +41,13 @@ class Kwf_Test_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
if (!$cfg = Kwf_Registry::get('testServerConfig')) {
throw new Kwf_Exception("testServerConfig not set");
}
+
+ Kwf_Util_Apc::callClearCacheByCli(array('type'=>'user'));
+ Kwf_Cache::factory('Core', 'Memcached', array(
+ 'lifetime'=>null,
+ 'automatic_cleaning_factor' => false,
+ 'automatic_serialization'=>true))->clean();
+
$d = $this->_domain;
if (!$d) {
$domain = $cfg->server->domain;
|
clear cache before running selenium test
fixes tests
|
diff --git a/src/main/java/net/bootsfaces/component/inputText/InputTextRenderer.java b/src/main/java/net/bootsfaces/component/inputText/InputTextRenderer.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/bootsfaces/component/inputText/InputTextRenderer.java
+++ b/src/main/java/net/bootsfaces/component/inputText/InputTextRenderer.java
@@ -71,11 +71,11 @@ public class InputTextRenderer extends CoreRenderer {
String clientId = inputText.getClientId(context);
String name = inputText.getName();
-// if (realAttributeName != null) {
-// name = realAttributeName;
-// }
-// else
- if (null == name) {
+ if (realEventSourceName == null) {
+ realEventSourceName = "input_" + clientId;
+ }
+
+ if (null == name) {
name = "input_" + clientId;
}
String submittedValue = (String) context.getExternalContext().getRequestParameterMap().get(name);
|
#<I> fixed the AJAX engine (regression caused by #<I>)
|
diff --git a/JSAT/test/jsat/datatransform/kernel/KernelPCATest.java b/JSAT/test/jsat/datatransform/kernel/KernelPCATest.java
index <HASH>..<HASH> 100644
--- a/JSAT/test/jsat/datatransform/kernel/KernelPCATest.java
+++ b/JSAT/test/jsat/datatransform/kernel/KernelPCATest.java
@@ -115,8 +115,8 @@ public class KernelPCATest
DataModelPipeline instance = new DataModelPipeline((Classifier)new DCDs(), new KernelPCA.KernelPCATransformFactory(new RBFKernel(0.5), 20, 100, Nystrom.SamplingMethod.KMEANS));
- ClassificationDataSet t1 = FixedProblems.getInnerOuterCircle(500, new XORWOW());
- ClassificationDataSet t2 = FixedProblems.getInnerOuterCircle(500, new XORWOW(), 2.0, 10.0);
+ ClassificationDataSet t1 = FixedProblems.getCircles(500, 0.0, new XORWOW(), 1.0, 4.0);
+ ClassificationDataSet t2 = FixedProblems.getCircles(500, 0.0, new XORWOW(), 2.0, 10.0);
instance = instance.clone();
|
Made KernelPCA test more stable by removing noise from test set
|
diff --git a/sos/report/plugins/block.py b/sos/report/plugins/block.py
index <HASH>..<HASH> 100644
--- a/sos/report/plugins/block.py
+++ b/sos/report/plugins/block.py
@@ -34,6 +34,7 @@ class Block(Plugin, IndependentPlugin):
"ls -lanR /dev",
"ls -lanR /sys/block",
"lsblk -O -P",
+ "losetup -a",
])
# legacy location for non-/run distributions
@@ -46,6 +47,7 @@ class Block(Plugin, IndependentPlugin):
"/sys/block/sd*/device/timeout",
"/sys/block/hd*/device/timeout",
"/sys/block/sd*/device/state",
+ "/sys/block/loop*/loop/",
])
cmds = [
|
Addd information about loop devices
This patch captures information from loop devices
via 'losetup -a' and the content of
/sys/block/loopN/loop/ directory.
|
diff --git a/spyder/widgets/variableexplorer/collectionseditor.py b/spyder/widgets/variableexplorer/collectionseditor.py
index <HASH>..<HASH> 100644
--- a/spyder/widgets/variableexplorer/collectionseditor.py
+++ b/spyder/widgets/variableexplorer/collectionseditor.py
@@ -143,7 +143,10 @@ class ReadOnlyCollectionsModel(QAbstractTableModel):
if not self.names:
self.header0 = _("Key")
else:
- self.keys = [k for k in dir(data) if not k.startswith('__')]
+ keys = [k for k in dir(data) if not k.startswith('__')]
+ if not keys:
+ keys = dir(data)
+ self.keys = keys
self._data = data = self.showndata = ProxyObject(data)
if not self.names:
self.header0 = _("Attribute")
|
Variable Explorer: Show object attrs if all of them are hidden
|
diff --git a/zengine/lib/cache.py b/zengine/lib/cache.py
index <HASH>..<HASH> 100644
--- a/zengine/lib/cache.py
+++ b/zengine/lib/cache.py
@@ -288,7 +288,7 @@ class Session(object):
def items(self):
return ((k[len(self.key) + 1:], self._j_load(cache.get(k))) for k in self._keys())
- def destroy(self):
+ def delete(self):
"""
Removes all contents attached to this session object.
If sessid is empty, all sessions will be cleaned up.
|
rref #<I> ref GH-<I>
CHANGE Renamed "destroy" method of Session object to "delete"
|
diff --git a/littlechef/runner.py b/littlechef/runner.py
index <HASH>..<HASH> 100644
--- a/littlechef/runner.py
+++ b/littlechef/runner.py
@@ -255,6 +255,7 @@ def _readconfig():
# We expect an ssh_config file here,
# and/or a user, (password/keyfile) pair
+ env.ssh_config = None
try:
ssh_config = config.get('userinfo', 'ssh-config')
except ConfigParser.NoSectionError:
@@ -275,8 +276,6 @@ def _readconfig():
except Exception:
msg = "Couldn't parse the ssh-config file '{0}'".format(ssh_config)
abort(msg)
- else:
- env.ssh_config = None
try:
env.user = config.get('userinfo', 'user')
@@ -311,4 +310,4 @@ if littlechef.COOKING:
_readconfig()
else:
# runner module has been imported
- pass
+ env.ssh_config = None
|
As a library, initialize env.ssh_config = None so that credentials doesn't fail
|
diff --git a/server/php/UploadHandler.php b/server/php/UploadHandler.php
index <HASH>..<HASH> 100755
--- a/server/php/UploadHandler.php
+++ b/server/php/UploadHandler.php
@@ -138,7 +138,8 @@ class UploadHandler
// Automatically rotate images based on EXIF meta data:
'auto_orient' => true
),
- // You can add an array. The key is the name of the version (example: 'medium'), the array contains the options to apply.
+ // You can add an array. The key is the name of the version (example: 'medium').
+ // the array contains the options to apply.
/*
'medium' => array(
'max_width' => 200,
|
Update UploadHandler.php
- example renamed to 'medium', different width/height than thumbnail
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.