diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/pkg/index/corpus.go b/pkg/index/corpus.go
index <HASH>..<HASH> 100644
--- a/pkg/index/corpus.go
+++ b/pkg/index/corpus.go
@@ -540,9 +540,14 @@ type pnAndTime struct {
type byPermanodeModtime []pnAndTime
-func (s byPermanodeModtime) Len() int { return len(s) }
-func (s byPermanodeModtime) Less(i, j int) bool { return s[i].t.Before(s[j].t) }
-func (s byPermanodeModtime) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s byPermanodeModtime) Len() int { return len(s) }
+func (s byPermanodeModtime) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s byPermanodeModtime) Less(i, j int) bool {
+ if s[i].t.Equal(s[j].t) {
+ return s[i].pn.Less(s[j].pn)
+ }
+ return s[i].t.Before(s[j].t)
+}
// EnumeratePermanodesLastModified sends all permanodes, sorted by most recently modified first, to ch,
// or until ctx is done.
|
Sort recent permanodes first by time, then by blobref.
Just in case two permanodes were modified in the same nanosecond (or
more likely: the client's clock resolution sucks when they created the
mutation).
Fixes <URL>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,6 @@ DOCS_REQS = [SPHINX_REQ]
TEST_REQS = [
'hypothesis < 4',
- 'hypothesis-pytest < 1',
'py < 2',
'pytest < 5',
'pytest-benchmark >= 3.2.0, < 4',
|
Remove hypothesis-pytest dependency
According to <URL>
|
diff --git a/upload/catalog/language/en-gb/checkout/checkout.php b/upload/catalog/language/en-gb/checkout/checkout.php
index <HASH>..<HASH> 100644
--- a/upload/catalog/language/en-gb/checkout/checkout.php
+++ b/upload/catalog/language/en-gb/checkout/checkout.php
@@ -3,6 +3,7 @@
$_['heading_title'] = 'Checkout';
// Text
+$_['text_cart'] = 'Shopping Cart';
$_['text_checkout_option'] = 'Step %s: Checkout Options';
$_['text_checkout_account'] = 'Step %s: Account & Billing Details';
$_['text_checkout_payment_address'] = 'Step %s: Billing Details';
@@ -100,4 +101,4 @@ $_['error_no_shipping'] = 'Warning: No Shipping options are availab
$_['error_payment'] = 'Warning: Payment method required!';
$_['error_no_payment'] = 'Warning: No Payment options are available. Please <a href="%s">contact us</a> for assistance!';
$_['error_custom_field'] = '%s required!';
-$_['error_regex'] = '%s not a valid input!';
\ No newline at end of file
+$_['error_regex'] = '%s not a valid input!';
|
added missing word translation
The same text translation may be available in other language files as well, but it is missing here.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,7 @@ setup(
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
project_urls={
"Bug Tracker": "https://github.com/stripe/stripe-python/issues",
+ "Changes": "https://github.com/stripe/stripe-python/blob/master/CHANGELOG.md",
"Documentation": "https://stripe.com/docs/api/?lang=python",
"Source Code": "https://github.com/stripe/stripe-python",
},
|
PyPI / project URLs: Link to CHANGES.md (#<I>)
|
diff --git a/src/main/date-functions.js b/src/main/date-functions.js
index <HASH>..<HASH> 100644
--- a/src/main/date-functions.js
+++ b/src/main/date-functions.js
@@ -460,6 +460,10 @@ Date.formatCodeToRegex = function(character, currentGroup) {
return {g:0,
c:null,
s:"[+-]\\d{1,5}"}
+ case ".":
+ return {g:0,
+ c:null,
+ s:"\\."}
default:
return {g:0,
c:null,
|
Handle dot as escaped in regexp formatter
|
diff --git a/firebase_token_generator.py b/firebase_token_generator.py
index <HASH>..<HASH> 100644
--- a/firebase_token_generator.py
+++ b/firebase_token_generator.py
@@ -84,12 +84,16 @@ def _create_options_claims(opts):
raise ValueError('Unrecognized Option: %s' % k)
return claims
-def _encode(bytes):
- if sys.version_info < (2, 7):
+if sys.version_info < (2, 7):
+ def _encode(bytes_data):
# Python 2.6 has problems with bytearrays in b64
- bytes = str(bytes)
- encoded = urlsafe_b64encode(bytes)
- return encoded.decode('utf-8').replace('=', '')
+ encoded = urlsafe_b64encode(bytes(bytes_data))
+ return encoded.decode('utf-8').replace('=', '')
+else:
+ def _encode(bytes):
+ encoded = urlsafe_b64encode(bytes)
+ return encoded.decode('utf-8').replace('=', '')
+
def _encode_json(obj):
return _encode(bytearray(json.dumps(obj), 'utf-8'))
|
Improve the previous <I> fix: use bytes rather, than string.
Also, optimize for better speed.
|
diff --git a/py8583.py b/py8583.py
index <HASH>..<HASH> 100644
--- a/py8583.py
+++ b/py8583.py
@@ -193,6 +193,9 @@ class Iso8583:
if(Len > MaxLength):
raise ParseError("F{0} is larger than maximum length ({1}>{2})".format(field, Len, MaxLength))
+ # In case of zero length, don't try to parse the field itself, just continue
+ if(Len == 0):
+ return p
try:
if(DataType == DT.ASCII):
|
if length is zero don't try to parse the field because it might fail
|
diff --git a/src/Flex.php b/src/Flex.php
index <HASH>..<HASH> 100644
--- a/src/Flex.php
+++ b/src/Flex.php
@@ -95,10 +95,10 @@ class Flex implements PluginInterface, EventSubscriberInterface
}
// to avoid issues when Flex is upgraded, we load all PHP classes now
- // that way, we are sure to use all files from the same version
+ // that way, we are sure to use all classes from the same version
foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(__DIR__, \FilesystemIterator::SKIP_DOTS)) as $file) {
if ('.php' === substr($file, -4)) {
- require_once $file;
+ class_exists(__NAMESPACE__.str_replace('/', '\\', substr($file, \strlen(__DIR__), -4)));
}
}
|
Fix "Cannot declare class because the name is already in use" errors
|
diff --git a/lib/javaReflection.js b/lib/javaReflection.js
index <HASH>..<HASH> 100644
--- a/lib/javaReflection.js
+++ b/lib/javaReflection.js
@@ -3,14 +3,35 @@ var java = require('java'),
function getMethod(obj, methodName, paramsClass, callback) {
var javaParamsClass = newClassArray(paramsClass);
- var method = obj.getClassSync().getMethodSync(methodName, javaParamsClass);
- method.setAccessibleSync(true);
- callback(method);
+ obj.getClass(function(err, javaClass) {
+ if (err) {
+ console.error(err);
+ return;
+ }
+ javaClass.getMethod(methodName, javaParamsClass, function(err, method) {
+ if (err) {
+ console.error(err);
+ return;
+ }
+ method.setAccessible(true, function(err) {
+ if (err) {
+ console.error(err);
+ return;
+ }
+ callback(method);
+ });
+ });
+ });
}
function invoke(obj, method, params, callback) {
- var data = method.invokeSync(obj, params);
- callback(data);
+ var data = method.invoke(obj, params, function(err, result) {
+ if (err) {
+ console.error(err);
+ return;
+ }
+ callback(result);
+ });
}
function invokeMethod(obj, methodName, paramsClass, params, callback) {
|
javaReflection library made Async
|
diff --git a/pyrtl/rtllib/muxes.py b/pyrtl/rtllib/muxes.py
index <HASH>..<HASH> 100644
--- a/pyrtl/rtllib/muxes.py
+++ b/pyrtl/rtllib/muxes.py
@@ -189,9 +189,10 @@ def demux(select):
return _demux_2(select)
wires = demux(select[:-1])
- not_select = ~select
+ sel = select[-1]
+ not_select = ~sel
zero_wires = tuple(not_select & w for w in wires)
- one_wires = tuple(select & w for w in wires)
+ one_wires = tuple(sel & w for w in wires)
return zero_wires + one_wires
|
Demultiplexor was making result wires with too many bits each
|
diff --git a/framework/core/src/Extend/Formatter.php b/framework/core/src/Extend/Formatter.php
index <HASH>..<HASH> 100644
--- a/framework/core/src/Extend/Formatter.php
+++ b/framework/core/src/Extend/Formatter.php
@@ -21,7 +21,7 @@ class Formatter implements ExtenderInterface, LifecycleInterface
{
protected $callback;
- public function configure(callable $callback)
+ public function configure($callback)
{
$this->callback = $callback;
@@ -34,8 +34,14 @@ class Formatter implements ExtenderInterface, LifecycleInterface
$events->listen(
Configuring::class,
- function (Configuring $event) {
- call_user_func($this->callback, $event->configurator);
+ function (Configuring $event) use ($container) {
+ if (is_string($this->callback)) {
+ $callback = $container->make($this->callback);
+ } else {
+ $callback = $this->callback;
+ }
+
+ $callback($event->configurator);
}
);
}
|
Allow passing strings (names of invokable classes) to Formatter extender
In preparation for fixing #<I>.
|
diff --git a/packages/cli/lib/lib/babel-config.js b/packages/cli/lib/lib/babel-config.js
index <HASH>..<HASH> 100644
--- a/packages/cli/lib/lib/babel-config.js
+++ b/packages/cli/lib/lib/babel-config.js
@@ -36,7 +36,7 @@ module.exports = function (env, options = {}) {
overrides: [
// Transforms to apply only to first-party code:
{
- exclude: /node_modules/,
+ exclude: '**/node_modules/**',
presets: [
[require.resolve('@babel/preset-typescript'), { jsxPragma: 'h' }],
],
|
Update packages/cli/lib/lib/babel-config.js
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,10 @@
from setuptools import setup,find_packages
+import os
+
NAME = 'liveandletdie'
+HERE = os.path.dirname(__file__)
+
setup(
name=NAME,
@@ -11,7 +15,7 @@ setup(
author_email='peterhudec@peterhudec.com',
description='Simplifies launching and terminating of web development '
'servers from BDD and functional tests.',
- long_description=open('README.rst').read(),
+ long_description=open(os.path.join(HERE, 'README.rst')).read(),
keywords='Flask, Pyramid, Django, Google App Engine, GAE, BDD, TDD, '
'functional testing, live server',
url='http://github.com/peterhudec/{0}'.format(NAME),
|
The readme path is now relative to setup.py location.
|
diff --git a/components/tree/node.js b/components/tree/node.js
index <HASH>..<HASH> 100644
--- a/components/tree/node.js
+++ b/components/tree/node.js
@@ -1,8 +1,9 @@
let uniqueId = 0;
+const prefix = '__$_';
export default class Node {
static createNode = function(data, parent, tree, needRecheckNodes) {
- const key = data.key == null ? uniqueId++ : data.key;
+ const key = data.key == null ? `${prefix}${uniqueId++}` : data.key;
// if the node has been set to checked
// we should set its children to checked
// and recheck the parent to set to checked or indeterminate
@@ -64,7 +65,7 @@ export default class Node {
this.indeterminate = false;
this.tree._updateCheckedKeys(this);
-
+
if (this.tree.get('uncorrelated')) return;
const children = this.children;
@@ -85,7 +86,7 @@ export default class Node {
if (!parent || parent === this.tree.root) return;
let checkedCount = 0;
- let count = 0;
+ let count = 0;
let indeterminate;
const children = parent.children;
for (let i = 0; i < children.length; i++) {
|
fix(Tree): avoid conflicting with custom number key, close #<I>
|
diff --git a/oled/emulator.py b/oled/emulator.py
index <HASH>..<HASH> 100644
--- a/oled/emulator.py
+++ b/oled/emulator.py
@@ -130,7 +130,8 @@ class gifanim(emulator):
with open(self._filename, "w+b") as fp:
self._images[0].save(fp, save_all=True, loop=self._loop,
duration=int(self._duration * 1000),
- append_images=self._images[1:])
+ append_images=self._images[1:],
+ format="GIF")
print("Wrote {0} frames to file: {1} ({2} bytes)".format(
len(self._images), self._filename, os.stat(self._filename).st_size))
|
Set format=GIF when writing image sequences (affects Python <I>)
|
diff --git a/tools/c7n_org/c7n_org/cli.py b/tools/c7n_org/c7n_org/cli.py
index <HASH>..<HASH> 100644
--- a/tools/c7n_org/c7n_org/cli.py
+++ b/tools/c7n_org/c7n_org/cli.py
@@ -47,7 +47,7 @@ from c7n.utils import UnicodeWriter
log = logging.getLogger('c7n_org')
-WORKER_COUNT = os.environ.get('C7N_ORG_PARALLEL', multiprocessing.cpu_count() * 4)
+WORKER_COUNT = int(os.environ.get('C7N_ORG_PARALLEL', multiprocessing.cpu_count() * 4))
CONFIG_SCHEMA = {
|
tools/c7n_org - fix worker count type when set via env var (#<I>)
|
diff --git a/src/TournamentsServiceProvider.php b/src/TournamentsServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/TournamentsServiceProvider.php
+++ b/src/TournamentsServiceProvider.php
@@ -29,7 +29,6 @@ class TournamentsServiceProvider extends ServiceProvider
$router->post('/championships/{championship}/trees', 'Xoco70\LaravelTournaments\TreeController@store')->name('tree.store');
$router->put('/championships/{championship}/trees', 'Xoco70\LaravelTournaments\TreeController@update')->name('tree.update');
});
-
}
/**
|
Apply fixes from StyleCI (#<I>)
|
diff --git a/androguard/core/bytecodes/apk.py b/androguard/core/bytecodes/apk.py
index <HASH>..<HASH> 100644
--- a/androguard/core/bytecodes/apk.py
+++ b/androguard/core/bytecodes/apk.py
@@ -1767,17 +1767,14 @@ class ARSCParser(object):
if header.type == RES_TABLE_TYPE_TYPE:
a_res_type = self.packages[package_name][nb + 1]
- if a_res_type.config.get_language(
- ) not in self.values[package_name]:
- self.values[package_name][
- a_res_type.config.get_language()
- ] = {}
- self.values[package_name][a_res_type.config.get_language(
- )]["public"] = []
-
- c_value = self.values[package_name][
- a_res_type.config.get_language()
- ]
+ language = a_res_type.config.get_language()
+ region = a_res_type.config.get_country()
+ if region == "\x00\x00":
+ locale = language
+ else:
+ locale = "{}-r{}".format(anguage, region)
+
+ c_value = self.values[package_name].setdefault(locale, {"public":[]})
entries = self.packages[package_name][nb + 2]
nb_i = 0
|
apk: build locale code properly
|
diff --git a/lib/coffeecup.js b/lib/coffeecup.js
index <HASH>..<HASH> 100644
--- a/lib/coffeecup.js
+++ b/lib/coffeecup.js
@@ -40,7 +40,7 @@ elements = {
html i iframe ins kbd label legend li map mark menu meter nav noscript object\
ol optgroup option output p pre progress q rp rt ruby s samp script section\
select small span strong style sub summary sup table tbody td textarea tfoot\
- th thead time title tr u ul video',
+ th thead time title tr u ul video urlset url loc lastmod changefreq prioriy',
svg: 'a altGlyph altGlyphDef altGlyphItem animate animateColor animateMotion\
animateTransform circle clipPath color-profile cursor defs desc ellipse\
feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix\
|
Added XML elements for sitemaps
|
diff --git a/src/GameEngine.js b/src/GameEngine.js
index <HASH>..<HASH> 100644
--- a/src/GameEngine.js
+++ b/src/GameEngine.js
@@ -338,6 +338,8 @@ class GameEngine {
*/
removeObjectFromWorld(id) {
let ob = this.world.objects[id];
+ if (!ob)
+ throw new Error(`Game attempted to remove a game object which doesn't (or never did) exist, id=${id}`);
this.trace.info(`========== destroying object ${ob.toString()} ==========`);
this.emit('objectDestroyed', ob);
ob.destroy();
|
friendly error on double-remove
|
diff --git a/revproxy/utils.py b/revproxy/utils.py
index <HASH>..<HASH> 100644
--- a/revproxy/utils.py
+++ b/revproxy/utils.py
@@ -19,7 +19,7 @@ HTML_CONTENT_TYPES = (
'application/xhtml+xml'
)
-MIN_STREAMING_LENGTH = 128 * 1024 # 128KB
+MIN_STREAMING_LENGTH = 4 * 1024 # 4KB
_get_charset_re = re.compile(r';\s*charset=(?P<charset>[^\s;]+)', re.I)
@@ -39,7 +39,11 @@ def should_stream(proxy_response):
if is_html_content_type(content_type):
return False
- content_length = proxy_response.headers.get('Content-Length')
+ try:
+ content_length = int(proxy_response.headers.get('Content-Length', 0))
+ except ValueError:
+ content_length = 0
+
if not content_length or content_length > MIN_STREAMING_LENGTH:
return True
|
Only stream if content-length > MIN_STREAMING_LENGTH
|
diff --git a/nanocomp/NanoComp.py b/nanocomp/NanoComp.py
index <HASH>..<HASH> 100644
--- a/nanocomp/NanoComp.py
+++ b/nanocomp/NanoComp.py
@@ -153,7 +153,7 @@ def make_plots(df, settings):
if "start_time" in df:
plots.extend(
compplots.compare_cumulative_yields(
- df=sub_df,
+ df=df,
path=settings["path"],
title=settings["title"],
palette=settings["colors"])
@@ -161,7 +161,7 @@ def make_plots(df, settings):
if "channelIDs" in df:
plots.append(
compplots.active_pores_over_time(
- df=sub_df,
+ df=df,
path=settings["path"],
palette=settings["colors"],
title=settings["title"]
|
don't use subdf for cumulative yield and pores over time
|
diff --git a/package.php b/package.php
index <HASH>..<HASH> 100644
--- a/package.php
+++ b/package.php
@@ -4,7 +4,7 @@
require_once 'PEAR/PackageFileManager2.php';
-$version = '1.4.132';
+$version = '1.4.133';
$notes = <<<EOT
No release notes for you!
EOT;
|
prepare for release of <I>
svn commit r<I>
|
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
@@ -772,7 +772,8 @@ class Starmap(object):
self.sent = AccumDict(accum=AccumDict()) # fname -> argname -> nbytes
self.monitor.inject = (self.argnames[-1].startswith('mon') or
self.argnames[-1].endswith('mon'))
- self.receiver = 'tcp://0.0.0.0:%s' % config.dbserver.receiver_ports
+ self.receiver = 'tcp://%s:%s' % (
+ socket.gethostname(), config.dbserver.receiver_ports)
self.monitor.backurl = None # overridden later
self.tasks = [] # populated by .submit
self.task_no = 0
|
Using gethostname in the receiver URL
|
diff --git a/test/adapters/influxdb_test.rb b/test/adapters/influxdb_test.rb
index <HASH>..<HASH> 100644
--- a/test/adapters/influxdb_test.rb
+++ b/test/adapters/influxdb_test.rb
@@ -1,9 +1,5 @@
require_relative "../test_helper"
-# USE blazer_test
-# DROP SERIES FROM items
-# INSERT items,hello=world value=1
-
class InfluxdbTest < ActionDispatch::IntegrationTest
include AdapterTest
@@ -11,6 +7,15 @@ class InfluxdbTest < ActionDispatch::IntegrationTest
"influxdb"
end
+ def setup
+ @@once ||= begin
+ client = InfluxDB::Client.new(url: "http://localhost:8086/blazer_test")
+ client.delete_series("items")
+ client.write_point("items", {values: {value: 1}, tags: {hello: "world"}, timestamp: 0})
+ true
+ end
+ end
+
def test_run
expected = [{"time" => "1970-01-01 00:00:00 UTC", "count_value" => "1"}]
assert_result expected, "SELECT COUNT(*) FROM items WHERE hello = 'world'"
|
Improved InfluxDB test [skip ci]
|
diff --git a/revive.js b/revive.js
index <HASH>..<HASH> 100644
--- a/revive.js
+++ b/revive.js
@@ -2,30 +2,41 @@ var createKey = require('./createKey'),
keyKey = createKey(-1);
function revive(input){
- objects = {};
+ var objects = {},
scannedObjects = [];
function scan(input){
+ var output = input;
+
+ if(typeof output !== 'object'){
+ return output;
+ }
+
+ output = input instanceof Array ? [] : {};
+
if(input[keyKey]){
- objects[input[keyKey]] = input;
- delete input[keyKey];
+ objects[input[keyKey]] = output;
}
for(var key in input){
var value = input[key];
+ if(key === keyKey){
+ continue;
+ }
+
if(value != null && typeof value === 'object'){
if(scannedObjects.indexOf(value)<0){
scannedObjects.push(value);
- scan(value);
+ output[key] = scan(value);
}
- }
-
- if(typeof value === 'string' && value.length === 1 && value.charCodeAt(0) > keyKey.charCodeAt(0)){
- input[key] = objects[value];
+ }else if(typeof value === 'string' && value.length === 1 && value.charCodeAt(0) > keyKey.charCodeAt(0)){
+ output[key] = objects[value];
+ }else{
+ output[key] = input[key];
}
}
- return input;
+ return output;
}
return scan(input);
|
reviver is non-destuctive
|
diff --git a/nntp/nntp.py b/nntp/nntp.py
index <HASH>..<HASH> 100644
--- a/nntp/nntp.py
+++ b/nntp/nntp.py
@@ -59,7 +59,7 @@ class NNTPReplyError(NNTPError):
return self.args[1]
def __str__(self):
- return "%d: %s" % self.args
+ return "%d %s" % self.args
class NNTPTemporaryError(NNTPReplyError):
"""NNTP temporary errors.
|
Changed __str__ for NNTPReplyError
It now matches the format of the original response i.e. theres no colon
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@ setuptools.setup(
url="https://github.com/ecmwf/cfgrib",
packages=setuptools.find_packages(),
include_package_data=True,
- install_requires=["attrs>=19.2", "cffi", "click", "eccodes", "numpy"],
+ install_requires=["attrs>=19.2", "click", "eccodes", "numpy"],
python_requires=">=3.5",
extras_require={
"xarray": ["xarray>=0.12.0"],
|
Drop cffi from setup dependencies
|
diff --git a/examples/bookstore/bookstore.js b/examples/bookstore/bookstore.js
index <HASH>..<HASH> 100644
--- a/examples/bookstore/bookstore.js
+++ b/examples/bookstore/bookstore.js
@@ -113,7 +113,7 @@ function createTabFolder() {
createBooksList(books).appendTo(relatedTab);
var commentsTab = tabris.create("Tab", {title: "Comments"}).appendTo(tabFolder);
tabris.create("TextView", {
- layoutData: {left: PAGE_MARGIN, top: PAGE_MARGIN, right: PAGE_MARGIN, bottom: PAGE_MARGIN},
+ layoutData: {left: PAGE_MARGIN, top: PAGE_MARGIN, right: PAGE_MARGIN},
text: "Great Book."
}).appendTo(commentsTab);
return tabFolder;
|
Fix broken layout of bookstore demo
The new TextView behaves different on iOS and Android. On iOS the text
will be displayed vertically centered. Thus the bottom property of the
TextView in the bookstore demo needs to be removed.
Change-Id: Iba1d5a0c1dd<I>c<I>fb2bfb<I>e7f3ac3c<I>f3
|
diff --git a/lib/dbf/column/base.rb b/lib/dbf/column/base.rb
index <HASH>..<HASH> 100644
--- a/lib/dbf/column/base.rb
+++ b/lib/dbf/column/base.rb
@@ -39,19 +39,6 @@ module DBF
meth ? send(meth, value) : encode_string(value, true)
end
- def type_cast_methods
- {
- 'N' => :unpack_number,
- 'I' => :unpack_unsigned_long,
- 'F' => :unpack_float,
- 'Y' => :unpack_currency,
- 'D' => :decode_date,
- 'T' => :decode_datetime,
- 'L' => :boolean,
- 'M' => :decode_memo
- }
- end
-
# Returns true if the column is a memo
#
# @return [Boolean]
@@ -86,6 +73,19 @@ module DBF
private
+ def type_cast_methods # nodoc
+ {
+ 'N' => :unpack_number,
+ 'I' => :unpack_unsigned_long,
+ 'F' => :unpack_float,
+ 'Y' => :unpack_currency,
+ 'D' => :decode_date,
+ 'T' => :decode_datetime,
+ 'L' => :boolean,
+ 'M' => :decode_memo
+ }
+ end
+
def decode_date(value) # nodoc
value.gsub!(' ', '0')
value !~ /\S/ ? nil : Date.parse(value)
|
make type_cast_methods private
|
diff --git a/lib/celerity/elements/table_row.rb b/lib/celerity/elements/table_row.rb
index <HASH>..<HASH> 100644
--- a/lib/celerity/elements/table_row.rb
+++ b/lib/celerity/elements/table_row.rb
@@ -9,6 +9,7 @@ module Celerity
def locate
super
@cells = @object.getCells if @object
+ @object
end
#
@@ -45,4 +46,4 @@ module Celerity
end
end # TableRow
-end # Celerity
\ No newline at end of file
+end # Celerity
|
Make TableRow.locate conform with Element.locate.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,8 @@
'use strict';
var childProcess = require('child_process');
-var execFileSync = childProcess.execFileSync;
var lcid = require('lcid');
+
+var execFileSync = childProcess.execFileSync;
var defaultOpts = {spawn: true};
var cache;
|
fix XO lint issue
|
diff --git a/response.go b/response.go
index <HASH>..<HASH> 100644
--- a/response.go
+++ b/response.go
@@ -41,7 +41,6 @@ type GetInstanceResponse struct {
type UpdateResponse struct {
DashboardURL string `json:"dashboard_url,omitempty"`
OperationData string `json:"operation,omitempty"`
- DashboardURL string `json:"dashboard_url,omitempty"`
}
type DeprovisionResponse struct {
diff --git a/service_broker.go b/service_broker.go
index <HASH>..<HASH> 100644
--- a/service_broker.go
+++ b/service_broker.go
@@ -119,7 +119,6 @@ type UpdateServiceSpec struct {
IsAsync bool
DashboardURL string
OperationData string
- DashboardURL string
}
type DeprovisionServiceSpec struct {
|
Remove duplicated DashboardURL from struct definition
[#<I>]
|
diff --git a/version/version.go b/version/version.go
index <HASH>..<HASH> 100644
--- a/version/version.go
+++ b/version/version.go
@@ -25,7 +25,7 @@ import (
)
var (
- Version = "2.0.4+git"
+ Version = "2.1.0-alpha.0"
)
// WalVersion is an enum for versions of etcd logs.
|
*: bump to <I>-alpha<I>
|
diff --git a/viewer.js b/viewer.js
index <HASH>..<HASH> 100644
--- a/viewer.js
+++ b/viewer.js
@@ -127,7 +127,7 @@
// draw target
if(this.target !== null){
- this._drawTarget();
+ this._drawTarget(this.context);
}
};
@@ -145,9 +145,8 @@
this.dirty = true;
};
- ImageViewer.prototype._drawTarget = function(){
- var ctx = this.context;
-
+ ImageViewer.prototype._drawTarget = function(ctx){
+ // preserve context
ctx.save();
var shapeScale = 1.5
@@ -178,6 +177,7 @@
ctx.arc(0, 0, 10, 0, 2 * Math.PI, false);
ctx.stroke();
+ // restore context
ctx.restore();
};
|
changed context from local variable to parameter like in the other draw functions
|
diff --git a/resource/resourceadapters/opener.go b/resource/resourceadapters/opener.go
index <HASH>..<HASH> 100644
--- a/resource/resourceadapters/opener.go
+++ b/resource/resourceadapters/opener.go
@@ -15,6 +15,9 @@ import (
// NewResourceOpener returns a new resource.Opener for the given unit.
//
+// The caller owns the State provided. It is the caller's
+// responsibility to close it.
+//
// TODO(mjs): This is the entry point for a whole lot of untested shim
// code in this package. At some point this should be sorted out.
func NewResourceOpener(st *corestate.State, unitName string) (opener resource.Opener, err error) {
|
resource/resourceadapters: Clarify State ownership
|
diff --git a/src/python/atomistica/io.py b/src/python/atomistica/io.py
index <HASH>..<HASH> 100644
--- a/src/python/atomistica/io.py
+++ b/src/python/atomistica/io.py
@@ -80,7 +80,9 @@ def write(fn, a, **kwargs):
if ext[0] == '.out' or ext[0] == '.dat':
return write_atoms(fn, a)
elif ext[0] == '.lammps':
- return write_lammps_data(fn, a, **kwargs)
+ return write_lammps_data(fn, a, velocities=True, **kwargs)
+ elif ext[0] == '.nc':
+ return NetCDFTrajectory(fn, 'w').write(a)
else:
return ase.io.write(fn, a, **kwargs)
|
Added NetCDF support to write function of atomistica.io.
|
diff --git a/lxd/storage/drivers/driver_dir.go b/lxd/storage/drivers/driver_dir.go
index <HASH>..<HASH> 100644
--- a/lxd/storage/drivers/driver_dir.go
+++ b/lxd/storage/drivers/driver_dir.go
@@ -28,14 +28,15 @@ type dir struct {
// Info returns info about the driver and its environment.
func (d *dir) Info() Info {
return Info{
- Name: "dir",
- Version: "1",
- OptimizedImages: false,
- PreservesInodes: false,
- Remote: false,
- VolumeTypes: []VolumeType{VolumeTypeCustom, VolumeTypeImage, VolumeTypeContainer, VolumeTypeVM},
- BlockBacking: false,
- RunningQuotaResize: true,
+ Name: "dir",
+ Version: "1",
+ OptimizedImages: false,
+ PreservesInodes: false,
+ Remote: false,
+ VolumeTypes: []VolumeType{VolumeTypeCustom, VolumeTypeImage, VolumeTypeContainer, VolumeTypeVM},
+ BlockBacking: false,
+ RunningQuotaResize: true,
+ RunningSnapshotFreeze: true,
}
}
|
lxd/storage/drivers/driver/dir: Defines dir driver needs freeze during snapshot
|
diff --git a/leveldb/db/batch.go b/leveldb/db/batch.go
index <HASH>..<HASH> 100644
--- a/leveldb/db/batch.go
+++ b/leveldb/db/batch.go
@@ -18,6 +18,7 @@ import (
"encoding/binary"
"io"
"leveldb"
+ "leveldb/memdb"
)
var (
@@ -53,6 +54,14 @@ func (b *Batch) Delete(key []byte) {
b.kvSize += len(key)
}
+func (b *Batch) Reset() {
+ b.rec = b.rec[:0]
+ b.sequence = 0
+ b.kvSize = 0
+ b.ch = nil
+ b.sync = false
+}
+
func (b *Batch) init(sync bool) chan error {
ch := make(chan error)
b.ch = nil
@@ -173,6 +182,13 @@ func (b *Batch) replay(to batchReplay) {
}
}
+func (b *Batch) memReplay(to *memdb.DB) {
+ for i, rec := range b.rec {
+ ikey := newIKey(rec.key, b.sequence+uint64(i), rec.t)
+ to.Put(ikey, rec.value)
+ }
+}
+
func decodeBatchHeader(b []byte, seq *uint64, n *uint32) (err error) {
if len(b) < 12 {
return errBatchTooShort
|
fb: batch: introduce *Batch.Reset() and *Batch.memReplay() methods
|
diff --git a/test/feedforward_test.py b/test/feedforward_test.py
index <HASH>..<HASH> 100644
--- a/test/feedforward_test.py
+++ b/test/feedforward_test.py
@@ -82,9 +82,8 @@ class TestWeightedClassifier(TestClassifier):
def test_score_onelayer(self):
net = self._build(13)
- z = net.score(self.images,
- self.labels,
- np.random.randint(0, 2, size=self.labels.shape))
+ z = net.score(
+ self.images, self.labels, 0.5 * np.ones(self.labels.shape, 'f'))
assert 0 < z < 1
|
Make weights for test deterministic.
|
diff --git a/src/Query/Builder.php b/src/Query/Builder.php
index <HASH>..<HASH> 100644
--- a/src/Query/Builder.php
+++ b/src/Query/Builder.php
@@ -171,7 +171,7 @@ class Builder extends \Illuminate\Database\Query\Builder
{
$name = $this->connection->getName();
- return md5($name.$this->toSql().serialize($this->getBindings()));
+ return hash('sha256', $name.$this->toSql().serialize($this->getBindings()));
}
/**
|
Switch to sha<I> for the cache key
|
diff --git a/luigi/interface.py b/luigi/interface.py
index <HASH>..<HASH> 100644
--- a/luigi/interface.py
+++ b/luigi/interface.py
@@ -27,6 +27,7 @@ import re
import argparse
import sys
import os
+import tempfile
from task import Register
@@ -79,7 +80,7 @@ class EnvironmentParamsContainer(task.Task):
is_global=True, default=False,
description='Ignore if similar process is already running')
lock_pid_dir = parameter.Parameter(
- is_global=True, default='/var/tmp/luigi',
+ is_global=True, default=os.path.join(tempfile.gettempdir(), 'luigi'),
description='Directory to store the pid file')
workers = parameter.IntParameter(
is_global=True, default=1,
|
Set default temp directory in a Windows friendly way.
Using tempfile.gettempdir() makes sure that a proper temporary
directory will be picked up with respect to os and even env
variables like TMPDIR, TEMP, TMP etc.
Fix #<I>
|
diff --git a/salt/pillar/nodegroups.py b/salt/pillar/nodegroups.py
index <HASH>..<HASH> 100644
--- a/salt/pillar/nodegroups.py
+++ b/salt/pillar/nodegroups.py
@@ -1,8 +1,5 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
-
'''
-=================
Nodegroups Pillar
=================
|
Remove overline from section title
This causes a warning on newer Sphinx releases
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -45,7 +45,10 @@ module.exports = function (grunt) {
}
},
files: {
- 'dist/fuelux.js': ['src/*.js', '!src/all.js']
+ // manually concatenate JS files (due to dependency management)
+ 'dist/fuelux.js': ['src/util.js', 'src/checkbox.js', 'src/combobox.js', 'src/datagrid.js', 'src/datepicker.js', 'src/pillbox.js',
+ 'src/radio.js', 'src/search.js', 'src/select.js', 'src/spinner.js', 'src/tree.js', 'src/wizard.js',
+ 'src/intelligent-dropdown.js', 'src/scheduler.js', '!src/all.js']
}
}
},
|
Manually ordered concatenated JS files in build process due to dependencies
|
diff --git a/src/TwigBridge/TwigServiceProvider.php b/src/TwigBridge/TwigServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/TwigBridge/TwigServiceProvider.php
+++ b/src/TwigBridge/TwigServiceProvider.php
@@ -10,7 +10,7 @@ use Twig_Lexer;
class TwigServiceProvider extends ViewServiceProvider
{
- const VERSION = '0.0.1';
+ const VERSION = '0.0.2';
/**
* Register the service provider.
|
Bumped TwigBridge version number
|
diff --git a/aws/auth.go b/aws/auth.go
index <HASH>..<HASH> 100644
--- a/aws/auth.go
+++ b/aws/auth.go
@@ -191,7 +191,9 @@ type iamProvider struct {
var metadataCredentialsEndpoint = "http://169.254.169.254/latest/meta-data/iam/security-credentials/"
-var client = http.Client{
+// IAMClient is the HTTP client used to query the metadata endpoint for IAM
+// credentials.
+var IAMClient = http.Client{
Timeout: 1 * time.Second,
}
@@ -210,7 +212,7 @@ func (p *iamProvider) Credentials() (*Credentials, error) {
Token string
}
- resp, err := client.Get(metadataCredentialsEndpoint)
+ resp, err := IAMClient.Get(metadataCredentialsEndpoint)
if err != nil {
return nil, errors.Annotate(err, "listing IAM credentials")
}
@@ -226,7 +228,7 @@ func (p *iamProvider) Credentials() (*Credentials, error) {
return nil, errors.Annotate(s.Err(), "listing IAM credentials")
}
- resp, err = client.Get(metadataCredentialsEndpoint + s.Text())
+ resp, err = IAMClient.Get(metadataCredentialsEndpoint + s.Text())
if err != nil {
return nil, errors.Annotatef(err, "getting %s IAM credentials", s.Text())
}
|
Expose IAM cred client.
Closes #<I>.
|
diff --git a/ooxml/importer.py b/ooxml/importer.py
index <HASH>..<HASH> 100644
--- a/ooxml/importer.py
+++ b/ooxml/importer.py
@@ -193,7 +193,11 @@ def get_chapters(doc):
export_chapters.append(_serialize_chapter(doc.elements[:chapters[0]['index']-1]))
for n in range(len(chapters)-1):
- _html = _serialize_chapter(doc.elements[chapters[n]['index']:chapters[n+1]['index']-1])
+ if chapters[n]['index'] == chapters[n+1]['index']-1:
+ _html = _serialize_chapter([doc.elements[chapters[n]['index']]])
+ else:
+ _html = _serialize_chapter(doc.elements[chapters[n]['index']:chapters[n+1]['index']-1])
+
export_chapters.append(_html)
export_chapters.append(_serialize_chapter(doc.elements[chapters[-1]['index']:]))
|
BK-<I> Slicing elements according to header position fails
|
diff --git a/rsapi/auth.go b/rsapi/auth.go
index <HASH>..<HASH> 100644
--- a/rsapi/auth.go
+++ b/rsapi/auth.go
@@ -362,7 +362,7 @@ func (a *ssAuthenticator) SetHost(host string) {
a.host = host
return
}
- elems[len(elems)-2] = strings.Replace(elems[len(elems)-2], "us", "selfservice", 1)
+ elems[len(elems)-2] = "selfservice"
ssLoginHostPrefix := strings.Join(elems, "-")
a.host = strings.Join(append([]string{ssLoginHostPrefix}, urlElems[1:]...), ".")
}
|
Fix SS host substitution for SS minimoo hosts
Not all endpoints use the 'us-3.rightscale.com' style host -- some
minimoos in particular use ss2-moo-<I>.test.rightscale.com. This commit
removes the assumption that there will be a 'us' substring in the login
host. Fixes #<I>.
|
diff --git a/pandas/core/base.py b/pandas/core/base.py
index <HASH>..<HASH> 100644
--- a/pandas/core/base.py
+++ b/pandas/core/base.py
@@ -753,7 +753,7 @@ class IndexOpsMixin:
dtype : str or numpy.dtype, optional
The dtype to pass to :meth:`numpy.asarray`.
copy : bool, default False
- Whether to ensure that the returned value is a not a view on
+ Whether to ensure that the returned value is not a view on
another array. Note that ``copy=False`` does not *ensure* that
``to_numpy()`` is no-copy. Rather, ``copy=True`` ensure that
a copy is made, even if not strictly necessary.
diff --git a/pandas/core/frame.py b/pandas/core/frame.py
index <HASH>..<HASH> 100644
--- a/pandas/core/frame.py
+++ b/pandas/core/frame.py
@@ -1301,7 +1301,7 @@ class DataFrame(NDFrame):
dtype : str or numpy.dtype, optional
The dtype to pass to :meth:`numpy.asarray`.
copy : bool, default False
- Whether to ensure that the returned value is a not a view on
+ Whether to ensure that the returned value is not a view on
another array. Note that ``copy=False`` does not *ensure* that
``to_numpy()`` is no-copy. Rather, ``copy=True`` ensure that
a copy is made, even if not strictly necessary.
|
DOC/CLN: Fix to_numpy docstrings (#<I>)
|
diff --git a/pyjfuzz/core/pjf_mutators.py b/pyjfuzz/core/pjf_mutators.py
index <HASH>..<HASH> 100644
--- a/pyjfuzz/core/pjf_mutators.py
+++ b/pyjfuzz/core/pjf_mutators.py
@@ -96,6 +96,7 @@ class PJFMutators(object):
bool: self.boolean_mutator,
int: self.int_mutator,
float: self.float_mutator,
+ long: self.int_mutator,
type(None): self.null_mutator,
}
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -57,6 +57,7 @@ requires=['bottle', 'GitPython']
if sys.version_info < (2, 7):
# support for python 2.6
requires.append('argparse')
+ requires.append('unittest2')
setup(
name="PyJFuzz",
|
fixed python <I> type and import issues
|
diff --git a/peyotl/phylesystem/git_workflows.py b/peyotl/phylesystem/git_workflows.py
index <HASH>..<HASH> 100644
--- a/peyotl/phylesystem/git_workflows.py
+++ b/peyotl/phylesystem/git_workflows.py
@@ -40,7 +40,7 @@ def acquire_lock_raise(git_action, fail_msg=''):
_LOG.debug(msg)
raise GitWorkflowError(msg)
-def validate_and_convert_nexson(nexson, output_version, allow_invalid):
+def validate_and_convert_nexson(nexson, output_version, allow_invalid, **kwargs):
'''Runs the nexson validator and returns a converted 4 object:
nexson, annotation, validation_log, nexson_adaptor
@@ -52,7 +52,7 @@ def validate_and_convert_nexson(nexson, output_version, allow_invalid):
try:
if TRACE_FILES:
_write_to_next_free('input', nexson)
- annotation, validation_log, nexson_adaptor = ot_validate(nexson)
+ annotation, validation_log, nexson_adaptor = ot_validate(nexson, **kwargs)
if TRACE_FILES:
_write_to_next_free('annotation', annotation)
except:
|
adding kwargs for max_num_tree arg
|
diff --git a/tests/test_analytics.py b/tests/test_analytics.py
index <HASH>..<HASH> 100644
--- a/tests/test_analytics.py
+++ b/tests/test_analytics.py
@@ -77,7 +77,7 @@ class CookiePolicyTestCase(SimpleTestCase):
@modify_settings(
MIDDLEWARE={
- 'append': 'tests.utils.AcceptCookiePolicyMiddleware',
+ 'append': 'tests.utils.TestAcceptingCookiePolicyMiddleware',
},
)
def test_setting_cookie_policy(self):
diff --git a/tests/utils.py b/tests/utils.py
index <HASH>..<HASH> 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -16,7 +16,11 @@ class SimpleTestCase(DjangoSimpleTestCase):
return self.client.get(reverse('dummy'), **extra)
-class AcceptCookiePolicyMiddleware(MiddlewareMixin):
+class TestAcceptingCookiePolicyMiddleware(MiddlewareMixin):
+ """
+ Used in tests that mimic a user clicking accept on a cookie prompt
+ """
+
def process_response(self, request, response):
AnalyticsPolicy(request).set_cookie_policy(response, True)
return response
|
Rename a middleware class to make it clear that it's only for testing purposes
|
diff --git a/client/js/shout.js b/client/js/shout.js
index <HASH>..<HASH> 100644
--- a/client/js/shout.js
+++ b/client/js/shout.js
@@ -374,7 +374,7 @@ $(function() {
});
chan.css({
transition: "none",
- opacity: .4
+ opacity: 0.4
});
return false;
});
|
Don't use bare fractions
|
diff --git a/opentrons/instruments/pipette.py b/opentrons/instruments/pipette.py
index <HASH>..<HASH> 100644
--- a/opentrons/instruments/pipette.py
+++ b/opentrons/instruments/pipette.py
@@ -297,15 +297,11 @@ class Pipette(Instrument):
self.current_tip_home_well = location
- # TODO: actual plunge depth for picking up a tip
- # varies based on the tip
- # right now it's accounted for via plunge depth
- tip_plunge = 6
+ tip_plunge = 10
- # Dip into tip and pull it up
for _ in range(3):
- self.robot.move_head(z=-tip_plunge, mode='relative')
self.robot.move_head(z=tip_plunge, mode='relative')
+ self.robot.move_head(z=-tip_plunge, mode='relative')
description = "Picking up tip from {0}".format(
(humanize_location(location) if location else '<In Place>')
|
modified pick_up_tip to assume .bottom() is the point of contact
|
diff --git a/lib/coverage.js b/lib/coverage.js
index <HASH>..<HASH> 100644
--- a/lib/coverage.js
+++ b/lib/coverage.js
@@ -37,7 +37,7 @@ function jscoverageFromIstanbulCoverage(coverage) {
jscov[filename]['source'] = fs.readFileSync(file).toString().split('\n');
for (var line = 0; line < jscov[filename]['source'].length; ++line) {
- jscov[filename][line] = 0;
+ jscov[filename][line] = null;
}
for (var sid in coverage[file].s) {
|
Clean up coverage display for HTML reporter
Pro:
- HTML view of code coverage shows only lines that Istanbul actually
instruments.
Con:
- This change alters the figures reported. A <I>-line file with many
comments, for example, may appear as though it only has <I> lines.
|
diff --git a/examples/test_ffi_struct.rb b/examples/test_ffi_struct.rb
index <HASH>..<HASH> 100644
--- a/examples/test_ffi_struct.rb
+++ b/examples/test_ffi_struct.rb
@@ -2,28 +2,18 @@ require 'ffi'
require 'forwardable'
module Blub
- class Struct < FFI::Struct
- class << self
- def find_type(type, mod = nil)
- if type.respond_to?(:ffi_structure)
- super type.ffi_structure, mod
- else
- super type, mod
- end
- end
- end
- end
-
class Foo
extend Forwardable
def_delegators :@struct, :[], :to_ptr
- class Struct < Blub::Struct
+ class Struct < FFI::Struct
layout :a, :int, :b, :int
end
def initialize(ptr=nil)
- @struct = self.ffi_structure.new(ptr)
+ @struct = ptr.nil? ?
+ self.ffi_structure.new :
+ self.ffi_structure.new(ptr)
end
def ffi_structure
@@ -38,8 +28,8 @@ module Blub
end
class Bar < Foo
- class Struct < Blub::Struct
- layout :p, Foo, :c, :int
+ class Struct < FFI::Struct
+ layout :p, Foo.ffi_structure, :c, :int
end
end
end
|
Stop overriding find_type.
This is not compatible with ffi's master, nor with jruby's ffi. Probably
also not with rubinius' ffi, once that works with nested structs again.
|
diff --git a/src/Symfony/Component/Workflow/Workflow.php b/src/Symfony/Component/Workflow/Workflow.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/Workflow/Workflow.php
+++ b/src/Symfony/Component/Workflow/Workflow.php
@@ -22,7 +22,7 @@ use Symfony\Component\Workflow\Exception\LogicException;
use Symfony\Component\Workflow\Exception\NotEnabledTransitionException;
use Symfony\Component\Workflow\Exception\UndefinedTransitionException;
use Symfony\Component\Workflow\MarkingStore\MarkingStoreInterface;
-use Symfony\Component\Workflow\MarkingStore\MultipleStateMarkingStore;
+use Symfony\Component\Workflow\MarkingStore\MethodMarkingStore;
use Symfony\Component\Workflow\Metadata\MetadataStoreInterface;
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
@@ -41,7 +41,7 @@ class Workflow implements WorkflowInterface
public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed')
{
$this->definition = $definition;
- $this->markingStore = $markingStore ?: new MultipleStateMarkingStore();
+ $this->markingStore = $markingStore ?: new MethodMarkingStore();
$this->dispatcher = $dispatcher;
$this->name = $name;
}
|
[Workflow] Fixed default marking store value of Workflow
|
diff --git a/src/Pool.php b/src/Pool.php
index <HASH>..<HASH> 100644
--- a/src/Pool.php
+++ b/src/Pool.php
@@ -471,7 +471,12 @@ class Pool implements PoolInterface, ProducerInterface, ContainerAccessInterface
$return_by_value = $type;
}
- return $this->connection->advancedExecute($sql, $arguments, ConnectionInterface::LOAD_ALL_ROWS, $return_by, $return_by_value, [&$this->connection, &$this, &$this->log]);
+ if ($this->hasContainer()) {
+ return $this->connection->advancedExecute($sql, $arguments, ConnectionInterface::LOAD_ALL_ROWS, $return_by, $return_by_value, [&$this->connection, &$this, &$this->log], $this->getContainer());
+ } else {
+ return $this->connection->advancedExecute($sql, $arguments, ConnectionInterface::LOAD_ALL_ROWS, $return_by, $return_by_value, [&$this->connection, &$this, &$this->log]);
+ }
+
} else {
throw new InvalidArgumentException("Type '$type' is not registered");
}
|
Set container to result instance when doing advanced execute
|
diff --git a/polyaxon_client/client.py b/polyaxon_client/client.py
index <HASH>..<HASH> 100644
--- a/polyaxon_client/client.py
+++ b/polyaxon_client/client.py
@@ -29,7 +29,7 @@ class PolyaxonClient(object):
port=None,
http_port=None,
ws_port=None,
- use_https=False,
+ use_https=None,
verify_ssl=None,
is_managed=None,
authentication_type=None,
|
Fix issue detecting correct https config
|
diff --git a/core/server/proxy/src/main/java/alluxio/proxy/s3/S3RestServiceHandler.java b/core/server/proxy/src/main/java/alluxio/proxy/s3/S3RestServiceHandler.java
index <HASH>..<HASH> 100644
--- a/core/server/proxy/src/main/java/alluxio/proxy/s3/S3RestServiceHandler.java
+++ b/core/server/proxy/src/main/java/alluxio/proxy/s3/S3RestServiceHandler.java
@@ -359,7 +359,7 @@ public final class S3RestServiceHandler {
if (objectPath.endsWith(AlluxioURI.SEPARATOR)) {
// Need to create a folder
try {
- mFileSystem.createDirectory(new AlluxioURI(objectPath));
+ fs.createDirectory(new AlluxioURI(objectPath));
} catch (IOException | AlluxioException e) {
throw toObjectS3Exception(e, objectPath);
}
|
Fix wrong owner when creating directory object in S3 API
pr-link: Alluxio/alluxio#<I>
change-id: cid-e<I>ba7db<I>c<I>c<I>e<I>
|
diff --git a/shell/expand.go b/shell/expand.go
index <HASH>..<HASH> 100644
--- a/shell/expand.go
+++ b/shell/expand.go
@@ -15,6 +15,8 @@ import (
// ${#var}, but also to arithmetic expansions like $((var + 3)), and
// command substitutions like $(echo foo).
//
+// If env is nil, the current environment variables are used.
+//
// Any side effects or modifications to the system are forbidden when
// interpreting the program. This is enforced via whitelists when
// executing programs and opening paths.
|
shell: clarify that Expand(s, nil) is a valid use
|
diff --git a/examples/example_run_manager/example_run_manager.py b/examples/example_run_manager/example_run_manager.py
index <HASH>..<HASH> 100644
--- a/examples/example_run_manager/example_run_manager.py
+++ b/examples/example_run_manager/example_run_manager.py
@@ -52,9 +52,9 @@ if __name__ == "__main__":
for delay in range(14, 50, 16):
join = runmngr.run_run(ExtTriggerScan, run_conf={"trigger_delay": delay, "no_data_timeout": 60}, use_thread=True) # use thread
print 'Status:', join(timeout=5) # join has a timeout, return None if run has not yet finished
- runmngr.abort_current_run() # stopping/aborting run from outside (same effect has Ctrl-C)
+ runmngr.abort_current_run("Calling abort_current_run(). This scan was aborted by intention") # stopping/aborting run from outside (same effect has Ctrl-C)
if join() != run_status.finished: # status OK?
- print 'ERROR!'
+ print 'ERROR! This error was made by intention!'
break # jump out
#
# The configuration.yaml can be extended to change the default run parameters for each scan:
|
MAINT: adding some comment to avoid confusion
|
diff --git a/angular-file-upload.js b/angular-file-upload.js
index <HASH>..<HASH> 100644
--- a/angular-file-upload.js
+++ b/angular-file-upload.js
@@ -1,7 +1,7 @@
/**!
* AngularJS file upload directive and http post
* @author Danial <danial.farid@gmail.com>
- * @version 0.1.3
+ * @version 0.1.4
*/
var angularFileUpload = angular.module('angularFileUpload', []);
|
Update angular-file-upload.js
Updated the version number
|
diff --git a/src/components/tabs/js/tabDirective.js b/src/components/tabs/js/tabDirective.js
index <HASH>..<HASH> 100644
--- a/src/components/tabs/js/tabDirective.js
+++ b/src/components/tabs/js/tabDirective.js
@@ -67,12 +67,11 @@ function MdTab () {
label = angular.element('<md-tab-label></md-tab-label>');
if (attr.label) label.text(attr.label);
else label.append(element.contents());
- }
-
- if (body.length == 0) {
- var contents = element.contents().detach();
- body = angular.element('<md-tab-body></md-tab-body>');
- body.append(contents);
+ if (body.length == 0) {
+ var contents = element.contents().detach();
+ body = angular.element('<md-tab-body></md-tab-body>');
+ body.append(contents);
+ }
}
element.append(label);
|
fix(tabs): adds proper detection for bodyless tabs
Closes #<I>
|
diff --git a/src/Panda/Contracts/Bootstrap/BootLoader.php b/src/Panda/Contracts/Bootstrap/BootLoader.php
index <HASH>..<HASH> 100644
--- a/src/Panda/Contracts/Bootstrap/BootLoader.php
+++ b/src/Panda/Contracts/Bootstrap/BootLoader.php
@@ -24,5 +24,5 @@ interface BootLoader
*
* @param Request $request
*/
- public function boot($request);
+ public function boot($request = null);
}
|
[Contracts] Set request to be nullable in BootLoader::boot()
This setting allows mocking and testing without mocking a request
|
diff --git a/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java b/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
index <HASH>..<HASH> 100644
--- a/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
+++ b/unsafe/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
@@ -429,7 +429,6 @@ public final class BytesToBytesMap {
long valueBaseOffset,
int valueLengthBytes) {
assert (!isDefined) : "Can only set value once for a key";
- isDefined = true;
assert (keyLengthBytes % 8 == 0);
assert (valueLengthBytes % 8 == 0);
if (size == MAX_CAPACITY) {
|
[SPARK-<I>] isDefined should not marked too early in putNewKey
JIRA: <URL>
|
diff --git a/src/css.js b/src/css.js
index <HASH>..<HASH> 100644
--- a/src/css.js
+++ b/src/css.js
@@ -15,7 +15,7 @@ var ralpha = /alpha\([^)]*\)/i,
// order is important!
cssExpand = jQuery.cssExpand,
- cssPrefixes = [ "O", "Webkit", "Moz", "ms" ],
+ cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
curCSS;
|
Opera announced they will start supporting the -webkit- prefix for a selected set of css properties. Let's put the inspection of -webkit- prefix properties as the last one in case this propagates to the style object and/or other browsers (the cssPrefixes array is inspected from right to left).
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -31,6 +31,6 @@ if len(argv) > 1 and argv[1] != "sdist":
# PyPI doesn't like raw html
with open("README.rst", encoding="UTF-8") as f:
readme = re.sub(r"\.\. \|.+\| raw:: html(?:\s{4}.+)+\n\n", "", f.read())
- readme = re.sub(r"\|header\|", "|logo|\n######\n\n|description|\n\n|scheme| |mtproto|", readme)
+ readme = re.sub(r"\|header\|", "|logo|\n\n|description|\n\n|scheme| |mtproto|", readme)
setup(long_description=readme)
|
Fix logo not showing up on PyPI website
|
diff --git a/lib/core/manager.rb b/lib/core/manager.rb
index <HASH>..<HASH> 100644
--- a/lib/core/manager.rb
+++ b/lib/core/manager.rb
@@ -138,6 +138,8 @@ class Manager
:event => :regex, # Utility
:template => :json, # Utility
:translator => :json # Utility
+
+ yield(myself) if block_given?
load_plugins(true)
logger.info("Finished initializing Nucleon plugin system at #{Time.now}")
|
Allowing for dynamic definition of namsapaces and types after core in the plugin manager reload method.
|
diff --git a/contribs/gmf/src/directives/search.js b/contribs/gmf/src/directives/search.js
index <HASH>..<HASH> 100644
--- a/contribs/gmf/src/directives/search.js
+++ b/contribs/gmf/src/directives/search.js
@@ -566,6 +566,7 @@ gmf.SearchController.prototype.createAndInitBloodhound_ = function(config,
gmf.SearchController.prototype.getBloodhoudRemoteOptions_ = function() {
var gettextCatalog = this.gettextCatalog_;
return {
+ rateLimitWait: 50,
prepare: function(query, settings) {
var url = settings.url;
var lang = gettextCatalog.currentLanguage;
diff --git a/src/services/creategeojsonbloodhound.js b/src/services/creategeojsonbloodhound.js
index <HASH>..<HASH> 100644
--- a/src/services/creategeojsonbloodhound.js
+++ b/src/services/creategeojsonbloodhound.js
@@ -63,7 +63,6 @@ ngeo.createGeoJSONBloodhound = function(url, opt_filter, opt_featureProjection,
var bloodhoundOptions = /** @type {BloodhoundOptions} */ ({
remote: {
url: url,
- rateLimitWait: 50,
prepare: function(query, settings) {
settings.url = settings.url.replace('%QUERY', query);
return settings;
|
Move the rateLimitWait option from ngeo to gmf
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ with open('requirements.txt') as f:
setup(
name='rip',
- version='0.0.92',
+ version='0.0.93',
description='A python framework for writing restful APIs.',
long_description=readme + '\n\n' + history,
author='Aplopio developers',
|
Bump up version to <I>
|
diff --git a/command/agent/consul/syncer.go b/command/agent/consul/syncer.go
index <HASH>..<HASH> 100644
--- a/command/agent/consul/syncer.go
+++ b/command/agent/consul/syncer.go
@@ -319,9 +319,14 @@ func (c *Syncer) Shutdown() error {
cr.Stop()
}
- // De-register all the services from consul
- for _, service := range c.trackedServices {
+ // De-register all the services from Consul
+ services, err := c.queryAgentServices()
+ if err != nil {
+ mErr.Errors = append(mErr.Errors, err)
+ }
+ for _, service := range services {
if err := c.client.Agent().ServiceDeregister(service.ID); err != nil {
+ c.logger.Printf("[WARN] consul.syncer: failed to deregister service ID %q: %v", service.ID, err)
mErr.Errors = append(mErr.Errors, err)
}
}
@@ -807,7 +812,7 @@ func (c *Syncer) filterConsulChecks(consulChecks map[string]*consul.AgentCheck)
return localChecks
}
-// consulPresent indicates whether the consul agent is responding
+// consulPresent indicates whether the Consul Agent is responding
func (c *Syncer) consulPresent() bool {
_, err := c.client.Agent().Self()
return err == nil
|
On Syncer Shutdown, remove all services that match a Syncer's prefix.
|
diff --git a/builtin/providers/google/image.go b/builtin/providers/google/image.go
index <HASH>..<HASH> 100644
--- a/builtin/providers/google/image.go
+++ b/builtin/providers/google/image.go
@@ -49,7 +49,7 @@ func resolveImageFamilyExists(c *Config, project, name string) (bool, error) {
func sanityTestRegexMatches(expected int, got []string, regexType, name string) error {
if len(got)-1 != expected { // subtract one, index zero is the entire matched expression
- return fmt.Errorf("Expected %d %s regex matches, got %d for %s", 2, regexType, len(got)-1, name)
+ return fmt.Errorf("Expected %d %s regex matches, got %d for %s", expected, regexType, len(got)-1, name)
}
return nil
}
|
Update typo.
We never updated the error to use the expectation, not hardcode it to 2.
|
diff --git a/test/index.js b/test/index.js
index <HASH>..<HASH> 100644
--- a/test/index.js
+++ b/test/index.js
@@ -6,6 +6,7 @@ var format = require('../lib');
var testDate = new Date(Date.UTC(2012, 11, 14, 13, 6, 43, 152));
var testArray = [ 'abc', 1, true, null, testDate ];
+var testIdentArray = [ 'abc', 'AbC', 1, true, testDate ];
var testObject = { a: 1, b: 2 };
describe('format(fmt, ...)', function() {
@@ -80,6 +81,7 @@ describe('format.ident(val)', function() {
format.ident(-15).should.equal('"-15"');
format.ident(45.13).should.equal('"45.13"');
format.ident(-45.13).should.equal('"-45.13"');
+ format.ident(testIdentArray).should.equal('abc,"AbC","1","t","2012-12-14 13:06:43.152+00"');
format.ident(testDate).should.equal('"2012-12-14 13:06:43.152+00"');
});
@@ -101,15 +103,6 @@ describe('format.ident(val)', function() {
}
});
- it('should throw when array', function (done) {
- try {
- format.ident([]);
- } catch (err) {
- assert(err.message === 'SQL identifier cannot be an array');
- done();
- }
- });
-
it('should throw when object', function (done) {
try {
format.ident({});
|
Update tests to match support for identifier arrays.
|
diff --git a/boards.js b/boards.js
index <HASH>..<HASH> 100644
--- a/boards.js
+++ b/boards.js
@@ -5,7 +5,7 @@ var boards = {
pageSize: 128,
numPages: 256,
timeout: 400,
- productId: ['0x0043', '0x7523'],
+ productId: ['0x0043', '0x7523','0x0001'],
protocol: 'stk500v1'
},
'micro': {
|
Added new ProductID in "uno" for Freduino UNO compatibility
|
diff --git a/cors.go b/cors.go
index <HASH>..<HASH> 100644
--- a/cors.go
+++ b/cors.go
@@ -13,6 +13,7 @@ type Config struct {
AllowAllOrigins bool
// AllowedOrigins is a list of origins a cross-domain request can be executed from.
+ // If the special "*" value is present in the list, all origins will be allowed.
// Default value is []
AllowOrigins []string
|
undo comments, cross support for wildcard origin
|
diff --git a/src/wtf/db/eventiterator.js b/src/wtf/db/eventiterator.js
index <HASH>..<HASH> 100644
--- a/src/wtf/db/eventiterator.js
+++ b/src/wtf/db/eventiterator.js
@@ -13,6 +13,7 @@
goog.provide('wtf.db.EventIterator');
+goog.require('goog.asserts');
goog.require('wtf.data.EventFlag');
goog.require('wtf.db.EventStruct');
goog.require('wtf.db.Unit');
@@ -563,6 +564,11 @@ wtf.db.EventIterator.prototype.buildArgumentString_ = function(
var first = true;
var argVars = type.getArguments();
var argData = this.getArguments();
+ // TODO(benvanik): sometimes arguments may not exist. Issue #410.
+ goog.asserts.assert(argData);
+ if (!argData) {
+ return;
+ }
for (var n = 0; n < argVars.length; n++) {
var argVar = argVars[n];
appendArgument(first, argVar.name, argData[argVar.name]);
|
Asserting and handling better a broken case of event data.
Issue #<I> filed to track it.
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -99,7 +99,7 @@ master_doc = 'index'
# General information about the project.
project = 'MetPy'
# noinspection PyShadowingBuiltins
-copyright = (f'{cur_date:%Y}-2020, MetPy Developers. '
+copyright = (f'2008\u2013{cur_date:%Y}, MetPy Developers. '
'Development supported by National Science Foundation grants '
'AGS-1344155, OAC-1740315, and AGS-1901712')
|
DOC: Fix copyright range (Fixes #<I>)
Somehow we replace the origination year instead of the final year in
2e3f<I>. Also use the right Unicode character for the range.
|
diff --git a/test/e2e/dns.go b/test/e2e/dns.go
index <HASH>..<HASH> 100644
--- a/test/e2e/dns.go
+++ b/test/e2e/dns.go
@@ -321,10 +321,10 @@ var _ = framework.KubeDescribe("DNS", func() {
"kubernetes.default",
"kubernetes.default.svc",
"kubernetes.default.svc.cluster.local",
- "google.com",
}
// Added due to #8512. This is critical for GCE and GKE deployments.
if framework.ProviderIs("gce", "gke") {
+ namesToResolve = append(namesToResolve, "google.com")
namesToResolve = append(namesToResolve, "metadata")
}
hostFQDN := fmt.Sprintf("%s.%s.%s.svc.cluster.local", dnsTestPodHostName, dnsTestServiceName, f.Namespace.Name)
|
Add google.com to e2e test only under gce/gke
We should limit the lookup/resolve for google.com when
provider is gce or gke. We should be able to run the
test in environments where this is not allowed or not
available.
|
diff --git a/tests/Support/SupportClassLoaderTest.php b/tests/Support/SupportClassLoaderTest.php
index <HASH>..<HASH> 100644
--- a/tests/Support/SupportClassLoaderTest.php
+++ b/tests/Support/SupportClassLoaderTest.php
@@ -27,12 +27,11 @@ class SupportClassLoaderTest extends PHPUnit_Framework_TestCase {
$php53Class = 'Foo\Bar\Php53';
$php52Class = 'Foo_Bar_Php52';
+ // We're not actually registering an autoloader now
+ // but rather testing our methods work as expected.
ClassLoader::addDirectories(__DIR__.'/stubs/psr');
- ClassLoader::load($php53Class);
- ClassLoader::load($php52Class);
-
- $this->assertTrue(class_exists($php53Class));
- $this->assertTrue(class_exists($php52Class));
+ $this->assertTrue(ClassLoader::load($php53Class));
+ $this->assertTrue(ClassLoader::load($php52Class));
}
}
|
Tweaking the autoloader test to not actually autoload but test the load() method works as expected.
|
diff --git a/imagemounter/__init__.py b/imagemounter/__init__.py
index <HASH>..<HASH> 100644
--- a/imagemounter/__init__.py
+++ b/imagemounter/__init__.py
@@ -6,7 +6,7 @@ __version__ = '1.5.1'
BLOCK_SIZE = 512
VOLUME_SYSTEM_TYPES = ('detect', 'dos', 'bsd', 'sun', 'mac', 'gpt', 'dbfiller')
-FILE_SYSTEM_TYPES = ('ext', 'ufs', 'ntfs', 'luks', 'lvm', 'unknown')
+FILE_SYSTEM_TYPES = ('ext', 'ufs', 'ntfs', 'luks', 'lvm', 'xfs', 'unknown')
import sys
import os
|
Update __init__.py
Adder xfs to known file systems
|
diff --git a/hs_restclient/__init__.py b/hs_restclient/__init__.py
index <HASH>..<HASH> 100644
--- a/hs_restclient/__init__.py
+++ b/hs_restclient/__init__.py
@@ -122,6 +122,8 @@ class HydroShare(object):
self.url_base = self._URL_PROTO_WITHOUT_PORT.format(scheme=self.scheme,
hostname=self.hostname)
+ self.resource_types = self.getResourceTypes()
+
def getResourceList(self, creator=None, owner=None, user=None, group=None, from_date=None, to_date=None,
types=None):
"""
@@ -331,7 +333,7 @@ class HydroShare(object):
def getResourceTypes(self):
""" Get the list of resource types supported by the HydroShare server
- :return: A list of strings representing the HydroShare resource types
+ :return: A set of strings representing the HydroShare resource types
:raise HydroShareHTTPException to signal an HTTP error
"""
@@ -342,7 +344,7 @@ class HydroShare(object):
raise HydroShareHTTPException((url, r.status_code))
resource_types = r.json()
- return [t['resource_type'] for t in resource_types['results']]
+ return set([t['resource_type'] for t in resource_types['results']])
# def createResource(self, title, resource_file=None,):
|
getResourceTypes() now returns a set rather than a list
getResourceTypes() is now called by the HydroShare constructor
|
diff --git a/lib/charlotte.js b/lib/charlotte.js
index <HASH>..<HASH> 100755
--- a/lib/charlotte.js
+++ b/lib/charlotte.js
@@ -2200,7 +2200,7 @@
_.each([browser.onBack, tab.onBack, onBack], function(onBack) {
if (onBack && onBack.callback) {
onBackCallbackSeries.push(function(next) {
- onBack.callback(options, next);
+ onBack.callback.call(lastPage, options, next);
});
}
});
|
set page as `this` when calling onBack callbacks
|
diff --git a/jspdf.js b/jspdf.js
index <HASH>..<HASH> 100644
--- a/jspdf.js
+++ b/jspdf.js
@@ -1688,18 +1688,6 @@ function jsPDF(/** String */ orientation, /** String */ unit, /** String */ form
return buildDocument();
case 'save':
- // If Safari - fallback to Data URL, sorry there's no way to feature detect this
- // @TODO: Refactor this
- $.browser.chrome = $.browser.webkit && !!window.chrome;
- $.browser.safari = $.browser.webkit && !window.chrome;
-
- // Open in new window if webkit, until the BlobBuilder is fixed
- // Seems to have been removed in Chrome 24
- if ($.browser.webkit) {
- return API.output('dataurlnewwindow');
- }
-
- var bb = new BlobBuilder;
var data = buildDocument();
// Need to add the file to BlobBuilder as a Uint8Array
@@ -1710,9 +1698,8 @@ function jsPDF(/** String */ orientation, /** String */ unit, /** String */ form
array[i] = data.charCodeAt(i);
}
- bb.append(array);
+ var blob = new Blob(array, {type: "application/pdf"});
- var blob = bb.getBlob('application/pdf');
saveAs(blob, options);
break;
case 'datauristring':
|
Replaced call to BlobBuilder with call to Blob [File API]
|
diff --git a/lib/parser.js b/lib/parser.js
index <HASH>..<HASH> 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -135,6 +135,9 @@ Parser.prototype = {
this.context(parser);
var ast = parser.parse();
this.context();
+ // hoist mixins
+ for (var name in this.mixins)
+ ast.unshift(this.mixins[name]);
return ast;
}
|
Make mixins available if defined in the same file as `extends`
|
diff --git a/network.go b/network.go
index <HASH>..<HASH> 100644
--- a/network.go
+++ b/network.go
@@ -1181,7 +1181,8 @@ func (n *network) createEndpoint(name string, options ...EndpointOption) (Endpoi
ep.locator = n.getController().clusterHostID()
ep.network, err = ep.getNetworkFromStore()
if err != nil {
- return nil, fmt.Errorf("failed to get network during CreateEndpoint: %v", err)
+ logrus.Errorf("failed to get network during CreateEndpoint: %v", err)
+ return nil, err
}
n = ep.network
diff --git a/store.go b/store.go
index <HASH>..<HASH> 100644
--- a/store.go
+++ b/store.go
@@ -85,7 +85,7 @@ func (c *controller) getNetworkFromStore(nid string) (*network, error) {
return n, nil
}
}
- return nil, fmt.Errorf("network %s not found", nid)
+ return nil, ErrNoSuchNetwork(nid)
}
func (c *controller) getNetworksForScope(scope string) ([]*network, error) {
|
Fix 'failed to get network during CreateEndpoint'
Fix 'failed to get network during CreateEndpoint' during container starting.
Change the error type to `libnetwork.ErrNoSuchNetwork`, so `Start()` in `daemon/cluster/executor/container/controller.go` will recreate the network.
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -155,6 +155,7 @@ icescrum.getAllStories = function(params, callback) {
};
var req = http.request(options, function(result) {
+ var responseParts = [];
result.setEncoding('utf8');
result.on('data', function (chunk) {
if (chunk.substr(2,5) == "error") {
@@ -162,10 +163,14 @@ icescrum.getAllStories = function(params, callback) {
return(this);
}
else {
- callback(false, chunk);
- return(this);
+ responseParts.push(chunk);
}
});
+
+ result.on("end", function(){
+ callback(false, responseParts.join(""));
+ return(this);
+ });
});
req.end();
|
The get all stories API returns the result in multiple chunks, the
wrapper returns it (now) as a whole.
|
diff --git a/setup-jottacloudclient.py b/setup-jottacloudclient.py
index <HASH>..<HASH> 100644
--- a/setup-jottacloudclient.py
+++ b/setup-jottacloudclient.py
@@ -53,7 +53,8 @@ setup(name='jottacloudclient',
],
# see https://pythonhosted.org/setuptools/setuptools.html#declaring-extras-optional-features-with-their-own-dependencies
extras_require = {
- 'FUSE': ['fusepy',],
+ 'FUSE': ['fusepy', 'fastcache',],
'monitor': ['watchdog',],
+ 'scanner': ['xattr',],
},
)
|
Adding dependencies to fast cache and xattr
.. for faster and smarter code
|
diff --git a/tests/unit/src/RunnerTest.php b/tests/unit/src/RunnerTest.php
index <HASH>..<HASH> 100644
--- a/tests/unit/src/RunnerTest.php
+++ b/tests/unit/src/RunnerTest.php
@@ -150,8 +150,9 @@ class RunnerTest extends PHPUnit_Framework_TestCase {
}
public function testErrorsSilencedWhenErrorReportingOff() {
- echo phpversion();
- $this->markTestSkipped();
+ if(strpos(phpversion(), 'hhvm')) {
+ $this->markTestSkipped();
+ }
$er = ini_get('display_errors');
ini_set('display_errors', 0);
|
Skipping a test for HHVM.
|
diff --git a/Model/TaskServer.php b/Model/TaskServer.php
index <HASH>..<HASH> 100644
--- a/Model/TaskServer.php
+++ b/Model/TaskServer.php
@@ -159,6 +159,9 @@ class TaskServer extends TaskModel {
return;
}
$statistics = array_values(array_filter(preg_split('/\s+/', `ps -o '%mem,%cpu,stat' --ppid {$task['process_id']} --no-headers`)));
+ if (!$statistics) {
+ $statistics = array_values(array_filter(preg_split('/\s+/', `ps -o '%mem,%cpu,stat' --pid {$task['process_id']} --no-headers`)));
+ }
$this->Statistics->create();
return (bool)$this->Statistics->save(array(
'task_id' => $task['id'],
|
Fix getting statistics caused different execution handler on different OS #<I>
|
diff --git a/lib/grunt/tasks/release.js b/lib/grunt/tasks/release.js
index <HASH>..<HASH> 100644
--- a/lib/grunt/tasks/release.js
+++ b/lib/grunt/tasks/release.js
@@ -23,7 +23,7 @@ var path = require("path"),
// remove redundancies in css filenames
fs.renameSync(path.join(paths.dist, "lib/fine-uploader.css"), path.join(paths.dist, "lib/legacy.css"))
fs.renameSync(path.join(paths.dist, "lib/fine-uploader-gallery.css"), path.join(paths.dist, "lib/gallery.css"))
- fs.renameSync(path.join(paths.dist, "lib/fine-uploader-new.css"), path.join(paths.dist, "lib/new.css"))
+ fs.renameSync(path.join(paths.dist, "lib/fine-uploader-new.css"), path.join(paths.dist, "lib/rows.css"))
// copy over the CommonJS index files
fsSync.copy(path.join(paths.commonJs), path.join(paths.dist, "lib"));
|
feat(build): better name for modern row-layout stylesheet
Only used in new lib directory.
#<I>
|
diff --git a/remodel/connection.py b/remodel/connection.py
index <HASH>..<HASH> 100644
--- a/remodel/connection.py
+++ b/remodel/connection.py
@@ -10,16 +10,26 @@ from .utils import Counter
class Connection(object):
- def __init__(self, db='test', host='localhost', port=28015, auth_key=''):
+ def __init__(self, db='test', host='localhost', port=28015, auth_key='',
+ user='admin', password=''):
self.db = db
self.host = host
self.port = port
self.auth_key = auth_key
+ self.user = user
+ self.password = password
self._conn = None
def connect(self):
- self._conn = r.connect(host=self.host, port=self.port,
- auth_key=self.auth_key, db=self.db)
+ if rethinkdb.__version__ >= '2.3.0':
+ password = self.password if self.password != '' else self.auth_key
+ self._conn = rethinkdb.connect(host=self.host, port=self.port,
+ user=self.user, password=password,
+ db=self.db)
+ else:
+ auth_key = self.auth_key if self.auth_key != '' else self.password
+ self._conn = rethinkdb.connect(host=self.host, port=self.port,
+ auth_key=auth_key, db=self.db)
def close(self):
if self._conn:
|
Support for RethinkDB <I>'s new user model
|
diff --git a/lib/frontend/rest-adaptor.js b/lib/frontend/rest-adaptor.js
index <HASH>..<HASH> 100644
--- a/lib/frontend/rest-adaptor.js
+++ b/lib/frontend/rest-adaptor.js
@@ -1,3 +1,5 @@
+var debug = require('../debug');
+
var model = require('../model');
var defaultCommands = require('./default-commands/rest');
@@ -11,6 +13,8 @@ function createHandler(params) {
throw new Error('no filter for the backend: ' + commandName);
return (function(request, response) {
+ debug('rest-adapter.createHandler.handle');
+
var result = definition.toBackend(commandName, request);
var messageType = result[0];
var body = result[1];
@@ -20,10 +24,13 @@ function createHandler(params) {
messageType,
body,
function(error, envelope) {
+ debug('rest-adapter.createHandler.handle.response');
if (error) {
+ debug('rest-adapter.createHandler.handle.response.error:', error);
var body = envelope && envelope.body || null;
response.jsonp(body, error);
} else {
+ debug('rest-adapter.createHandler.handle.response.success');
var body = envelope.body;
if (definition.toClient) {
var result = definition.toClient(commandName, body);
|
rest-adaptor: add debug logs
|
diff --git a/ghost/admin/controllers/modals/leave-editor.js b/ghost/admin/controllers/modals/leave-editor.js
index <HASH>..<HASH> 100644
--- a/ghost/admin/controllers/modals/leave-editor.js
+++ b/ghost/admin/controllers/modals/leave-editor.js
@@ -50,7 +50,7 @@ var LeaveEditorController = Ember.Controller.extend({
buttonClass: 'button-delete'
},
reject: {
- text: 'Cancel',
+ text: 'Stay',
buttonClass: 'button'
}
}
|
Change text on leave modal cancel button
issue #<I>
|
diff --git a/src/api/center.js b/src/api/center.js
index <HASH>..<HASH> 100644
--- a/src/api/center.js
+++ b/src/api/center.js
@@ -1,8 +1,8 @@
const toArray = require('../core/utils/toArray')
-/**
+/** NOTE: this is not functional YET !!
* centers the given object(s) on the given axis
- * @param {[Object]} object(s) the shapes to center
+ * @param {Object|Array} object(s) the shapes to center
* @param {Object} options
*/
const center = (objects, options) => {
diff --git a/src/core/utils/canonicalize.js b/src/core/utils/canonicalize.js
index <HASH>..<HASH> 100644
--- a/src/core/utils/canonicalize.js
+++ b/src/core/utils/canonicalize.js
@@ -7,7 +7,7 @@ const {fromSides} = require('../CAGFactories')
/**
* Returns a cannoicalized version of the input csg/cag : ie every very close
* points get deduplicated
- * @returns {CSG CAG}
+ * @returns {CSG|CAG}
* @example
* let rawInput = someCSGORCAGMakingFunction()
* let canonicalized= canonicalize(rawInput)
|
fix(docstring): fixed a few bad docstrings which prevented docs from being generated (#<I>)
|
diff --git a/filer/server/urls.py b/filer/server/urls.py
index <HASH>..<HASH> 100644
--- a/filer/server/urls.py
+++ b/filer/server/urls.py
@@ -1,5 +1,5 @@
#-*- coding: utf-8 -*-
-from django.conf.urls import patterns, url, include
+from django.conf.urls.defaults import patterns, url, include
from filer import settings as filer_settings
urlpatterns = patterns('filer.server.views',
|
fix url import to work in django<<I>
|
diff --git a/src/values/PrimitiveValue.js b/src/values/PrimitiveValue.js
index <HASH>..<HASH> 100644
--- a/src/values/PrimitiveValue.js
+++ b/src/values/PrimitiveValue.js
@@ -27,11 +27,11 @@ class PrimitiveValue extends Value {
return out;
}
- *get(what, realm) {
- return yield * this.derivePrototype(realm).get(what, realm);
+ *get(name, realm) {
+ return yield * this.derivePrototype(realm).get(name, realm, this);
}
- *set(what, to, realm) {
+ *set(name, to, realm) {
//Can't set primative properties.
}
@@ -89,13 +89,6 @@ class PrimitiveValue extends Value {
*unaryMinus() { return this.fromNative(-this.native); }
*not() { return this.fromNative(!this.native); }
-
-
- *get(name, realm) {
- let pt = this.derivePrototype(realm);
- return yield * pt.get(name, realm, this);
- }
-
*observableProperties(realm) {
yield * this.derivePrototype(realm).observableProperties(realm);
}
@@ -132,5 +125,3 @@ class PrimitiveValue extends Value {
module.exports = PrimitiveValue;
StringValue = require('./StringValue');
-
-
|
PrimitiveValue: remove duplicated `get` method
|
diff --git a/lib/chef/provider/package/aix.rb b/lib/chef/provider/package/aix.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/provider/package/aix.rb
+++ b/lib/chef/provider/package/aix.rb
@@ -60,6 +60,7 @@ class Chef
@new_resource.version(fields[2])
end
end
+ raise Chef::Exceptions::Package, "package source #{@new_resource.source} does not provide package #{@new_resource.package_name}" unless @new_resource.version
end
end
|
Raise exception if a package provided by 'source' doesn't actually provide
that package
|
diff --git a/tests/HtmlHeadingNormalizerTest.php b/tests/HtmlHeadingNormalizerTest.php
index <HASH>..<HASH> 100644
--- a/tests/HtmlHeadingNormalizerTest.php
+++ b/tests/HtmlHeadingNormalizerTest.php
@@ -128,6 +128,7 @@ class HtmlHeadingNormalizerTest extends \PHPUnit_Framework_TestCase
public function minSimpleHtmlStringsDataProvider()
{
return array(
+ array('<p>foo</p>', 1, '<p>foo</p>'),
array('<h1>foo</h1>', 1, '<h1>foo</h1>'),
array('<h2>foo</h2>', 1, '<h1>foo</h1>'),
array('<h3>foo</h3>', 1, '<h1>foo</h1>'),
|
Added test case where no headings exists in HTML.
|
diff --git a/src/algoliasearch.helper.js b/src/algoliasearch.helper.js
index <HASH>..<HASH> 100644
--- a/src/algoliasearch.helper.js
+++ b/src/algoliasearch.helper.js
@@ -1268,7 +1268,7 @@ AlgoliaSearchHelper.prototype.getClient = function() {
* is `SearchParameters -> SearchParameters`.
*
* This method returns a new DerivedHelper which is an EventEmitter
- * that fires the same `search`, `results` and `error` events. Those
+ * that fires the same `search`, `result` and `error` events. Those
* events, however, will receive data specific to this DerivedHelper
* and the SearchParameters that is returned by the call of the
* parameter function.
|
doc(derivation): Fix typo (fix #<I>)
DerivedHelper fires `result` event, not `results`.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.