diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/test/matcher.js b/test/matcher.js
index <HASH>..<HASH> 100644
--- a/test/matcher.js
+++ b/test/matcher.js
@@ -16,6 +16,10 @@ class EventMatcher {
return this.fixture.watch(...args, (err, events) => {
this.errors.push(err)
this.events.push(...events)
+
+ if (process.env.VERBOSE) {
+ console.log(events)
+ }
})
}
|
When VERBOSE is set, dump the received events
|
diff --git a/aws/resource_aws_rds_cluster.go b/aws/resource_aws_rds_cluster.go
index <HASH>..<HASH> 100644
--- a/aws/resource_aws_rds_cluster.go
+++ b/aws/resource_aws_rds_cluster.go
@@ -353,7 +353,6 @@ func resourceAwsRDSCluster() *schema.Resource {
Type: schema.TypeInt,
Optional: true,
Computed: true,
- ForceNew: true,
},
// apply_immediately is used to determine when the update modifications
@@ -1154,6 +1153,11 @@ func resourceAwsRDSClusterUpdate(d *schema.ResourceData, meta interface{}) error
requestUpdate = true
}
+ if d.HasChange("port") {
+ req.Port = aws.Int64(int64(d.Get("port").(int)))
+ requestUpdate = true
+ }
+
if d.HasChange("preferred_backup_window") {
req.PreferredBackupWindow = aws.String(d.Get("preferred_backup_window").(string))
requestUpdate = true
|
Changes RDS cluster port change to in-place modify.
|
diff --git a/pymacaron/__init__.py b/pymacaron/__init__.py
index <HASH>..<HASH> 100644
--- a/pymacaron/__init__.py
+++ b/pymacaron/__init__.py
@@ -221,7 +221,8 @@ class API(object):
serve.append('ping')
# Add ping hooks if any
- add_ping_hook(self.ping_hook)
+ if self.ping_hook:
+ add_ping_hook(self.ping_hook)
# Let's compress returned data when possible
compress = Compress()
|
Bugfix: ping hook may be None
|
diff --git a/tensorflow_datasets/image/imagenet.py b/tensorflow_datasets/image/imagenet.py
index <HASH>..<HASH> 100644
--- a/tensorflow_datasets/image/imagenet.py
+++ b/tensorflow_datasets/image/imagenet.py
@@ -35,6 +35,9 @@ ImageNet, we aim to provide on average 1000 images to illustrate each synset.
Images of each concept are quality-controlled and human-annotated. In its
completion, we hope ImageNet will offer tens of millions of cleanly sorted
images for most of the concepts in the WordNet hierarchy.
+
+Note that labels were never publicly released for the test set, so we only
+include splits for the training and validation sets here.
'''
# Web-site is asking to cite paper from 2015.
@@ -145,6 +148,8 @@ class Imagenet2012(tfds.core.GeneratorBasedBuilder):
train_path, val_path = dl_manager.download([
'%s/ILSVRC2012_img_train.tar' % _URL_PREFIX,
'%s/ILSVRC2012_img_val.tar' % _URL_PREFIX,
+ # We don't import the original test split, as it doesn't include labels.
+ # These were never publicly released.
])
if not tf.io.gfile.exists(train_path) or not tf.io.gfile.exists(val_path):
msg = 'You must download the dataset files manually and place them in: '
|
Document why the imagenet test set is not available in Imagenet<I>.
PiperOrigin-RevId: <I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,14 @@ setup(
],
keywords='cli',
packages=find_packages(exclude=['docs', 'tests*']),
- install_requires=['docopt'],
+ install_requires=['docopt',
+ 'numpy',
+ 'astropy',
+ 'scipy',
+ 'GetDist',
+ 'pymultinest',
+ 'sklearn',
+ ],
extras_require={
'test': ['coverage', 'pytest', 'pytest-cov'],
},
|
added install_requires to setup
|
diff --git a/src/Ratchet/WebSocket/Version/RFC6455.php b/src/Ratchet/WebSocket/Version/RFC6455.php
index <HASH>..<HASH> 100644
--- a/src/Ratchet/WebSocket/Version/RFC6455.php
+++ b/src/Ratchet/WebSocket/Version/RFC6455.php
@@ -146,6 +146,10 @@ class RFC6455 implements VersionInterface {
$parsed = $from->WebSocket->message->getPayload();
unset($from->WebSocket->message);
+ if (!mb_check_encoding($parsed, 'UTF-8')) {
+ return $from->close(Frame::CLOSE_BAD_PAYLOAD);
+ }
+
$from->WebSocket->coalescedCallback->onMessage($from, $parsed);
}
|
[WebSocket] RFC compliance
Close connection if payload is not UTF-8
Fixed several AB 6.* tests
Refs #<I>
|
diff --git a/lib/timezone/lookup/geonames.rb b/lib/timezone/lookup/geonames.rb
index <HASH>..<HASH> 100644
--- a/lib/timezone/lookup/geonames.rb
+++ b/lib/timezone/lookup/geonames.rb
@@ -40,7 +40,8 @@ module Timezone
query = URI.encode_www_form(
'lat' => lat,
'lng' => long,
- 'username' => config.username)
+ 'username' => config.username
+ )
"/timezoneJSON?#{query}"
end
end
diff --git a/lib/timezone/lookup/google.rb b/lib/timezone/lookup/google.rb
index <HASH>..<HASH> 100644
--- a/lib/timezone/lookup/google.rb
+++ b/lib/timezone/lookup/google.rb
@@ -64,7 +64,8 @@ module Timezone
def url(lat, long)
query = URI.encode_www_form(
'location' => "#{lat},#{long}",
- 'timestamp' => Time.now.to_i)
+ 'timestamp' => Time.now.to_i
+ )
authorize("/maps/api/timezone/json?#{query}")
end
|
Fix RuboCop Exceptions
New version of RuboCop required adjusting two methods calls.
|
diff --git a/src/extensions/scratch3_boost/index.js b/src/extensions/scratch3_boost/index.js
index <HASH>..<HASH> 100644
--- a/src/extensions/scratch3_boost/index.js
+++ b/src/extensions/scratch3_boost/index.js
@@ -1696,7 +1696,7 @@ class Scratch3BoostBlocks {
const motor = this._peripheral.motor(portID);
if (motor) {
// to avoid a hanging block if power is 0, return an immediately resolving promise.
- if (motor.power === 0) return new Promise(resolve => resolve());
+ if (motor.power === 0) return Promise.resolve();
return new Promise(resolve => {
motor.turnOnForDegrees(degrees, sign);
motor.pendingPromiseFunction = resolve;
|
Simplified the return value for when power is 0 in motorOnForRotation()
|
diff --git a/cookies.py b/cookies.py
index <HASH>..<HASH> 100644
--- a/cookies.py
+++ b/cookies.py
@@ -721,20 +721,24 @@ class Cookie(object):
The main difference between this and Cookie(name, value, **kwargs) is
that the values in the argument to this method are parsed.
+
+ If ignore_bad_attributes=True (default), values which did not parse
+ are set to '' in order to avoid passing bad data.
"""
def parse(key):
value = cookie_dict.get(key)
parser = cls.attribute_parsers.get(key)
if parser:
try:
- value = parser(value)
+ parsed_value = parser(value)
except Exception as e:
reason = "did not parse with %s: %s" % (repr(parser), repr(e))
if not ignore_bad_attributes:
raise InvalidCookieAttributeError(
key, value, reason)
_report_invalid_attribute(key, value, reason)
- return value
+ parsed_value = ''
+ return parsed_value
name, value = parse('name'), parse('value')
cookie = Cookie(name, value)
|
fix: don't pass unparsed value strings as-is!
|
diff --git a/consensus/wal.go b/consensus/wal.go
index <HASH>..<HASH> 100644
--- a/consensus/wal.go
+++ b/consensus/wal.go
@@ -20,7 +20,10 @@ import (
const (
// amino overhead + time.Time + max consensus msg size
- // TODO: Can we clarify better where 24 comes from precisely?
+ //
+ // q: where 24 bytes are coming from?
+ // a: cdc.MustMarshalBinaryBare(empty consensus part msg) = 14 bytes. +10
+ // bytes just in case amino will require more space in the future.
maxMsgSizeBytes = maxMsgSize + 24
// how often the WAL should be sync'd during period sync'ing
|
cs: clarify where <I> comes from in maxMsgSizeBytes (wal.go)
|
diff --git a/tests/Laravel7ExceptionHandler.php b/tests/Laravel7ExceptionHandler.php
index <HASH>..<HASH> 100644
--- a/tests/Laravel7ExceptionHandler.php
+++ b/tests/Laravel7ExceptionHandler.php
@@ -19,7 +19,7 @@ class Laravel7ExceptionHandler implements ExceptionHandler
public function renderForConsole($output, Throwable $e)
{
- //
+ throw $e;
}
public function shouldReport(Throwable $e)
diff --git a/tests/PreLaravel7ExceptionHandler.php b/tests/PreLaravel7ExceptionHandler.php
index <HASH>..<HASH> 100644
--- a/tests/PreLaravel7ExceptionHandler.php
+++ b/tests/PreLaravel7ExceptionHandler.php
@@ -19,7 +19,7 @@ class PreLaravel7ExceptionHandler implements ExceptionHandler
public function renderForConsole($output, Exception $e)
{
- //
+ throw $e;
}
public function shouldReport(Exception $e)
|
Surface exceptions when mixing tests and benchmarks (#<I>)
|
diff --git a/tags/constructor.js b/tags/constructor.js
index <HASH>..<HASH> 100644
--- a/tags/constructor.js
+++ b/tags/constructor.js
@@ -4,8 +4,10 @@ steal.then(function() {
* @tag documentation
* @parent DocumentJS.Tags
* Documents javascript constructor classes typically created like: new MyContructor(args).
+ *
* A constructor can be described by putting @constructor as the first declaritive.
- * To describe the construction function, write that after init. Example:
+ *
+ * ###Example:
*
* @codestart
* /* @constructor
|
Cleaned up contructor tag documentation.
|
diff --git a/src/FormHandler.php b/src/FormHandler.php
index <HASH>..<HASH> 100644
--- a/src/FormHandler.php
+++ b/src/FormHandler.php
@@ -766,6 +766,22 @@ class FormHandler
}
/**
+ * Add a custom error to the form
+ *
+ * @param $param
+ * @param $message
+ * @param bool|false $translate
+ * @param array $translationParams
+ */
+ public function addCustomError($param, $message, $translate = false, $translationParams = array())
+ {
+ $this->errors[] = new FormError($param, $message, $translate, $translationParams);
+
+ // Call isValid to update valid status in restore data handlers
+ $this->isValid();
+ }
+
+ /**
* Add custom errors to the form. Must be an array of FormError objects
*
* @param $errors FormError[]
|
Add method to the form handler for quickly adding a single custom error
|
diff --git a/src/model/User/UserData.php b/src/model/User/UserData.php
index <HASH>..<HASH> 100644
--- a/src/model/User/UserData.php
+++ b/src/model/User/UserData.php
@@ -36,12 +36,6 @@ class UserData
}
$this->userDataStorage->multiStore($tokensString, Json::encode($userDataContent));
}
-
- public function refreshUserToken($userId, $token)
- {
- $userDataContent = $this->userDataRegistrator->generate($userId);
- $this->userDataStorage->store($token, Json::encode($userDataContent));
- }
public function getUserToken($token)
{
|
Sales funnel related changes to access_token usage
- Creation of new user within sales funnel does not create
new access token. It was never used as sales funnel never
actually logs user in before the payment is confirmed.
- `ReturnPresenter` now always refreshes all user payment
user tokens to contain fresh info about latest subscriptions.
remp<I>/crm-payments-module#<I>
|
diff --git a/Source/com/drew/metadata/exif/ExifTiffHandler.java b/Source/com/drew/metadata/exif/ExifTiffHandler.java
index <HASH>..<HASH> 100644
--- a/Source/com/drew/metadata/exif/ExifTiffHandler.java
+++ b/Source/com/drew/metadata/exif/ExifTiffHandler.java
@@ -84,6 +84,11 @@ public class ExifTiffHandler extends DirectoryTiffHandler
pushDirectory(ExifThumbnailDirectory.class);
return true;
}
+
+ // The Canon EOS 7D (CR2) has three chained/following thumbnail IFDs
+ if (_currentDirectory instanceof ExifThumbnailDirectory)
+ return true;
+
// This should not happen, as Exif doesn't use follower IFDs apart from that above.
// NOTE have seen the CanonMakernoteDirectory IFD have a follower pointer, but it points to invalid data.
return false;
|
Fix regression in Canon EOS 7D (CR2) where 3 thumbnail IFDs are chained.
|
diff --git a/src/Krystal/Application/View/PluginBag.php b/src/Krystal/Application/View/PluginBag.php
index <HASH>..<HASH> 100644
--- a/src/Krystal/Application/View/PluginBag.php
+++ b/src/Krystal/Application/View/PluginBag.php
@@ -42,7 +42,10 @@ final class PluginBag implements PluginBagInterface
*/
private function normalizeAssetPath($path)
{
- return preg_replace('~@(\w+)~', '/module/$1/Assets', $path);
+ $pattern = '~@(\w+)~';
+ $replacement = sprintf('/%s/$1/%s', ViewManager::TEMPLATE_PARAM_MODULES_DIR, ViewManager::TEMPLATE_PARAM_ASSETS_DIR);
+
+ return preg_replace($pattern, $replacement, $path);
}
/**
|
Replaced hard-coded paths with constants
|
diff --git a/tests/Unit/Suites/KeyValue/KeyValueStoreKeyGeneratorTest.php b/tests/Unit/Suites/KeyValue/KeyValueStoreKeyGeneratorTest.php
index <HASH>..<HASH> 100644
--- a/tests/Unit/Suites/KeyValue/KeyValueStoreKeyGeneratorTest.php
+++ b/tests/Unit/Suites/KeyValue/KeyValueStoreKeyGeneratorTest.php
@@ -79,7 +79,8 @@ class KeyValueStoreKeyGeneratorTest extends \PHPUnit_Framework_TestCase
$url = HttpUrl::fromString('http://example.com/path');
$key = $this->keyGenerator->createPoCProductSeoUrlToIdKey($url);
- $this->assertNotContains(DIRECTORY_SEPARATOR, $key);
+ $this->assertNotContains('/', $key);
+ $this->assertNotContains('\\', $key);
}
/**
|
Issue #<I>: Test key/value keys against both forward and backslashes
|
diff --git a/lib/workflow_kit/version.rb b/lib/workflow_kit/version.rb
index <HASH>..<HASH> 100644
--- a/lib/workflow_kit/version.rb
+++ b/lib/workflow_kit/version.rb
@@ -1,3 +1,3 @@
module WorkflowKit
- VERSION = "0.0.3.alpha"
+ VERSION = "0.0.4.alpha"
end
|
bump to <I>.alpha
|
diff --git a/plugins/TestRunner/Commands/TestsSetupFixture.php b/plugins/TestRunner/Commands/TestsSetupFixture.php
index <HASH>..<HASH> 100644
--- a/plugins/TestRunner/Commands/TestsSetupFixture.php
+++ b/plugins/TestRunner/Commands/TestsSetupFixture.php
@@ -124,7 +124,6 @@ class TestsSetupFixture extends ConsoleCommand
// perform setup and/or teardown
if ($input->getOption('teardown')) {
- exit;
$fixture->getTestEnvironment()->save();
$fixture->performTearDown();
} else {
|
Remove exit; in TestsSetupFixture.php. Wonder how that got there...
|
diff --git a/devices.js b/devices.js
index <HASH>..<HASH> 100755
--- a/devices.js
+++ b/devices.js
@@ -14843,6 +14843,15 @@ const devices = [
},
exposes: [e.power(), e.current(), e.voltage(), e.switch()],
},
+
+ // Prolight
+ {
+ zigbeeModel: ['PROLIGHT E27 WHITE AND COLOUR'],
+ model: '5412748727388',
+ vendor: 'Prolight',
+ description: 'E27 white and colour bulb',
+ extend: preset.light_onoff_brightness_colortemp_colorxy,
+ },
];
module.exports = devices.map((device) => {
|
Added support for Prolight E<I> RGB <I> (#<I>)
* Added support for Prolight E<I> RGB
* Update devices.js
|
diff --git a/packages/react-dnd-html5-backend/src/HTML5Backend.js b/packages/react-dnd-html5-backend/src/HTML5Backend.js
index <HASH>..<HASH> 100644
--- a/packages/react-dnd-html5-backend/src/HTML5Backend.js
+++ b/packages/react-dnd-html5-backend/src/HTML5Backend.js
@@ -19,6 +19,15 @@ export default class HTML5Backend {
this.sourceNodeOptions = {};
this.enterLeaveCounter = new EnterLeaveCounter();
+ this.dragStartSourceIds = [];
+ this.dropTargetIds = [];
+ this.dragEnterTargetIds = [];
+ this.currentNativeSource = null;
+ this.currentNativeHandle = null;
+ this.currentDragSourceNode = null;
+ this.currentDragSourceNodeOffset = null;
+ this.currentDragSourceNodeOffsetChanged = false;
+
this.getSourceClientOffset = this.getSourceClientOffset.bind(this);
this.handleTopDragStart = this.handleTopDragStart.bind(this);
this.handleTopDragStartCapture = this.handleTopDragStartCapture.bind(this);
|
Initializing class state in the Backend Constructor (#<I>)
|
diff --git a/question/behaviour/rendererbase.php b/question/behaviour/rendererbase.php
index <HASH>..<HASH> 100644
--- a/question/behaviour/rendererbase.php
+++ b/question/behaviour/rendererbase.php
@@ -234,7 +234,7 @@ abstract class qbehaviour_renderer extends plugin_renderer_base {
'id' => $qa->get_behaviour_field_name('submit'),
'name' => $qa->get_behaviour_field_name('submit'),
'value' => get_string('check', 'question'),
- 'class' => 'submit btn',
+ 'class' => 'submit btn btn-default',
);
if ($options->readonly) {
$attributes['disabled'] = 'disabled';
|
MDL-<I> qbehaviour: Correct "Check" button styling.
|
diff --git a/salt/output/key.py b/salt/output/key.py
index <HASH>..<HASH> 100644
--- a/salt/output/key.py
+++ b/salt/output/key.py
@@ -13,8 +13,7 @@ def output(data):
Read in the dict structure generated by the salt key api methods and
print the structure.
'''
- color = salt.utils.get_colors(
- not bool(__opts__.get('no_color', False)))
+ color = salt.utils.get_colors(__opts__.get('color'))
cmap = {'minions_pre': color['RED'],
'minions': color['GREEN'],
|
Cleanup getting the colored output logic.
|
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb
index <HASH>..<HASH> 100644
--- a/activerecord/lib/active_record/relation/query_methods.rb
+++ b/activerecord/lib/active_record/relation/query_methods.rb
@@ -280,15 +280,9 @@ module ActiveRecord
end
def reverse_sql_order(order_query)
- order_query.join(', ').split(',').collect { |s|
- if s.match(/\s(asc|ASC)$/)
- s.gsub(/\s(asc|ASC)$/, ' DESC')
- elsif s.match(/\s(desc|DESC)$/)
- s.gsub(/\s(desc|DESC)$/, ' ASC')
- else
- s + ' DESC'
- end
- }
+ order_query.join(', ').split(',').collect do |s|
+ s.gsub!(/\sasc\Z/i, ' DESC') || s.gsub!(/\sdesc\Z/i, ' ASC') || s.concat(' DESC')
+ end
end
def array_of_strings?(o)
|
performance improvement based on discussion at <URL>
|
diff --git a/huey/contrib/mini.py b/huey/contrib/mini.py
index <HASH>..<HASH> 100644
--- a/huey/contrib/mini.py
+++ b/huey/contrib/mini.py
@@ -90,6 +90,7 @@ class MiniHuey(object):
ret = fn(*args, **kwargs)
except Exception as exc:
logger.exception('task %s failed' % fn.__name__)
+ async_result.set_exception(exc)
raise
else:
duration = time.time() - start
|
Add exception call to AsyncResult after task failing
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -102,7 +102,7 @@ pygments_style = 'sphinx'
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
-html_theme = 'default'
+html_theme = 'sphinx_rtd_theme'
# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
|
sphinx theme changed to read the docs
|
diff --git a/storage/storage_image.go b/storage/storage_image.go
index <HASH>..<HASH> 100644
--- a/storage/storage_image.go
+++ b/storage/storage_image.go
@@ -446,6 +446,11 @@ func (s *storageImageDestination) computeNextBlobCacheFile() string {
return filepath.Join(s.directory, fmt.Sprintf("%d", atomic.AddInt32(&s.nextTempFileID, 1)))
}
+// HasThreadSafePutBlob indicates whether PutBlob can be executed concurrently.
+func (s *storageImageDestination) HasThreadSafePutBlob() bool {
+ return true
+}
+
// PutBlobWithOptions writes contents of stream and returns data representing the result.
// inputInfo.Digest can be optionally provided if known; if provided, and stream is read to the end without error, the digest MUST match the stream contents.
// inputInfo.Size is the expected length of stream, if known.
@@ -466,11 +471,6 @@ func (s *storageImageDestination) PutBlobWithOptions(ctx context.Context, stream
return info, s.queueOrCommit(ctx, info, *options.LayerIndex, options.EmptyLayer)
}
-// HasThreadSafePutBlob indicates whether PutBlob can be executed concurrently.
-func (s *storageImageDestination) HasThreadSafePutBlob() bool {
- return true
-}
-
// PutBlob writes contents of stream and returns data representing the result.
// inputInfo.Digest can be optionally provided if known; if provided, and stream is read to the end without error, the digest MUST match the stream contents.
// inputInfo.Size is the expected length of stream, if known.
|
Move storageImageDestination.HasThreadSafePutBlob
... so that it isn't in the middle of the PutBlob implementation.
Should not change behavior.
|
diff --git a/lib/gitter/table.rb b/lib/gitter/table.rb
index <HASH>..<HASH> 100644
--- a/lib/gitter/table.rb
+++ b/lib/gitter/table.rb
@@ -90,12 +90,12 @@ module Gitter
end
end
- def html
+ def html opts = {}
@html ||= begin
h = rows.map do |row|
- Table.tag :tr, (row.map{|cell| cell.html} * "\n")
+ Table.tag :tr, (row.map{|cell| cell.html} * "\n"), (opts[:tr_html]||{})
end * "\n"
- Table.tag :table, h
+ Table.tag :table, h, (opts[:table_html]||{})
end
end
|
added html_opts to table
|
diff --git a/src/Salts/Salts.php b/src/Salts/Salts.php
index <HASH>..<HASH> 100644
--- a/src/Salts/Salts.php
+++ b/src/Salts/Salts.php
@@ -49,7 +49,7 @@ class Salts
// read in each line as an array
$response = file($this->source);
- $parsed = (array) $this->parse_php_to_array($response);
+ $parsed = (array) $this->parse_salts_from_php($response);
if (! array_filter($parsed)) {
throw new Exception('There was a problem fetching salts from the WordPress generator service.');
@@ -65,7 +65,7 @@ class Salts
*
* @return array
*/
- protected function parse_php_to_array(array $php)
+ protected function parse_salts_from_php(array $php)
{
return array_map(function ($line) {
// capture everything between single quotes
|
rename non-public method in Salts
|
diff --git a/lib/jsdav.js b/lib/jsdav.js
index <HASH>..<HASH> 100644
--- a/lib/jsdav.js
+++ b/lib/jsdav.js
@@ -74,7 +74,6 @@ exports.createServer = function(options, port, host) {
return DAV.createServer(options, port, host);
};
-<<<<<<< Updated upstream
/**
* Create a jsDAV Server object that will not fire up listening to HTTP requests,
* but instead will respond to requests that are passed to
@@ -95,13 +94,7 @@ exports.createServer = function(options, port, host) {
exports.mount = function(options) {
var DAV = require("./DAV/server");
DAV.debugMode = exports.debugMode;
- return DAV.mount(options);
-=======
-exports.mount = function(options) {
- var DAV = require("./DAV/server");
- DAV.debugMode = exports.debugMode;
return DAV.mount(options.path, options.mount, options.server, options.standalone);
->>>>>>> Stashed changes
};
//@todo implement CalDAV
|
Typo produced in merge feature/python
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,7 @@ setup(
packages=find_packages(),
install_requires=install_requires,
classifiers=[
- 'Development Status :: 3 - Alpha',
+ 'Development Status :: 4 - Beta',
'Framework :: Twisted',
'Intended Audience :: System Administrators',
'License :: OSI Approved :: MIT License',
|
classifiers: I think we're at least Beta now
|
diff --git a/java/client/test/org/openqa/selenium/net/LinuxEphemeralPortRangeDetectorTest.java b/java/client/test/org/openqa/selenium/net/LinuxEphemeralPortRangeDetectorTest.java
index <HASH>..<HASH> 100644
--- a/java/client/test/org/openqa/selenium/net/LinuxEphemeralPortRangeDetectorTest.java
+++ b/java/client/test/org/openqa/selenium/net/LinuxEphemeralPortRangeDetectorTest.java
@@ -18,22 +18,13 @@
package org.openqa.selenium.net;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.openqa.selenium.Platform.LINUX;
-import org.junit.Assume;
-import org.junit.BeforeClass;
import org.junit.Test;
-import org.openqa.selenium.Platform;
import java.io.StringReader;
public class LinuxEphemeralPortRangeDetectorTest {
- @BeforeClass
- public static void requiresLinux() {
- Assume.assumeTrue(Platform.getCurrent().is(LINUX));
- }
-
@Test
public void decodeEphemeralPorts() {
String range ="1234 65533";
|
[java] Deleting a precondition, unit tests can run on any platform.
|
diff --git a/aws/v4.go b/aws/v4.go
index <HASH>..<HASH> 100644
--- a/aws/v4.go
+++ b/aws/v4.go
@@ -98,8 +98,8 @@ func (v4 *signer) sign() {
}
// add the new ones
- v4.Request.Header.Add("Date", formatted)
- v4.Request.Header.Add("Authorization", v4.authorization)
+ v4.Request.Header.Set("Date", formatted)
+ v4.Request.Header.Set("Authorization", v4.authorization)
}
func (v4 *signer) build() {
|
Set() don't Add() new Auth/Date headers in signer
|
diff --git a/src/dialogs-wrapper.js b/src/dialogs-wrapper.js
index <HASH>..<HASH> 100644
--- a/src/dialogs-wrapper.js
+++ b/src/dialogs-wrapper.js
@@ -98,7 +98,13 @@ export default function modalWrapperFactory (wrapperOptions) {
})))
}
- return h('transition-group', wrapperOptions.transition, renderedDialogs)
+ return h('transition-group', {
+ class: wrapperOptions.wrapper.class,
+ props: {
+ tag: wrapperOptions.wrapper.tag,
+ ...wrapperOptions.wrapper.transition
+ }
+ }, renderedDialogs)
}
})
}
|
fix: renderOptions being watched by vue
|
diff --git a/sos/plugins/manageiq.py b/sos/plugins/manageiq.py
index <HASH>..<HASH> 100644
--- a/sos/plugins/manageiq.py
+++ b/sos/plugins/manageiq.py
@@ -71,7 +71,11 @@ class ManageIQ(Plugin, RedHatPlugin):
self.add_copy_spec([
os.path.join(self.miq_log_dir, x) for x in self.miq_log_files
])
- self.add_copy_spec("/var/log/tower.log")
+
+ self.add_copy_spec([
+ "/var/log/tower.log",
+ "/etc/manageiq/postgresql.conf.d/*.conf"
+ ])
if environ.get("APPLIANCE_PG_DATA"):
pg_dir = environ.get("APPLIANCE_PG_DATA")
|
[manageiq] add postresql configuration path
The most recent version of CloudForms adds postgres configuration
files at:
/etc/managiq/postgresql.conf.d/
Include these in the set of files collected by the plugin.
Resolves: #<I>
|
diff --git a/src/toast/index.js b/src/toast/index.js
index <HASH>..<HASH> 100644
--- a/src/toast/index.js
+++ b/src/toast/index.js
@@ -51,7 +51,12 @@ function createInstance() {
// transform toast options to popup props
function transformOptions(options) {
+ options = { ...options };
options.overlay = options.mask;
+
+ delete options.mask;
+ delete options.duration;
+
return options;
}
diff --git a/src/toast/test/index.spec.js b/src/toast/test/index.spec.js
index <HASH>..<HASH> 100644
--- a/src/toast/test/index.spec.js
+++ b/src/toast/test/index.spec.js
@@ -105,10 +105,11 @@ test('remove toast DOM when cleared in multiple mode', async () => {
});
test('set default options', () => {
- Toast.setDefaultOptions({ duration: 1000 });
- expect(Toast().duration).toEqual(1000);
+ const className = 'my-toast';
+ Toast.setDefaultOptions({ className });
+ expect(Toast().className).toEqual(className);
Toast.resetDefaultOptions();
- expect(Toast().duration).toEqual(3000);
+ expect(Toast().className).toEqual('');
});
test('toast duration 0', () => {
|
[bugfix] Toast: incorrect overlay duration (#<I>)
|
diff --git a/binder.go b/binder.go
index <HASH>..<HASH> 100644
--- a/binder.go
+++ b/binder.go
@@ -122,6 +122,7 @@ func (binder FastBinder) RoundTrip(stdreq *http.Request) (*http.Response, error)
if stdreq.ContentLength >= 0 {
ctx.Request.Header.SetContentLength(int(stdreq.ContentLength))
} else {
+ ctx.Request.Header.SetContentLength(-1)
ctx.Request.Header.Add("Transfer-Encoding", "chunked")
}
@@ -153,6 +154,8 @@ func std2fast(stdreq *http.Request) *fasthttp.Request {
}
}
+ fastreq.Header.SetContentLength(int(stdreq.ContentLength))
+
return fastreq
}
@@ -175,7 +178,10 @@ func fast2std(stdreq *http.Request, fastresp *fasthttp.Response) *http.Response
stdresp.Header.Add(sk, sv)
})
- if fastresp.Header.ContentLength() == -1 {
+ if fastresp.Header.ContentLength() >= 0 {
+ stdresp.ContentLength = int64(fastresp.Header.ContentLength())
+ } else {
+ stdresp.ContentLength = -1
stdresp.TransferEncoding = []string{"chunked"}
}
|
Fix chunked encoding & content length on recent fasthttp
|
diff --git a/hibernate-ogm-mongodb/src/main/java/org/hibernate/ogm/dialect/mongodb/MongoDBAssociationSnapshot.java b/hibernate-ogm-mongodb/src/main/java/org/hibernate/ogm/dialect/mongodb/MongoDBAssociationSnapshot.java
index <HASH>..<HASH> 100644
--- a/hibernate-ogm-mongodb/src/main/java/org/hibernate/ogm/dialect/mongodb/MongoDBAssociationSnapshot.java
+++ b/hibernate-ogm-mongodb/src/main/java/org/hibernate/ogm/dialect/mongodb/MongoDBAssociationSnapshot.java
@@ -132,6 +132,10 @@ public class MongoDBAssociationSnapshot implements AssociationSnapshot {
return map.keySet();
}
+ public DBObject getAssoc() {
+ return this.assoc;
+ }
+
@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
|
OGM-<I> Expose the object sent back by the datastore (used in the UT)
|
diff --git a/itests/steps/marathon_steps.py b/itests/steps/marathon_steps.py
index <HASH>..<HASH> 100644
--- a/itests/steps/marathon_steps.py
+++ b/itests/steps/marathon_steps.py
@@ -158,7 +158,7 @@ def stop_listening_stream(context):
# and 2 deployment_step_success events
filtered_events = [e for e in context.events if e.event_type == "deployment_success"]
- assert len(filtered_events) == 1
+ assert len(filtered_events) == 1, "We had %d filtered_events: %s" % (len(filtered_events), filtered_events)
@then('we should be able to see a deployment')
|
Add some debug logic to the assert
|
diff --git a/multiqc/utils/util_functions.py b/multiqc/utils/util_functions.py
index <HASH>..<HASH> 100644
--- a/multiqc/utils/util_functions.py
+++ b/multiqc/utils/util_functions.py
@@ -9,10 +9,11 @@ import os
import yaml
import time
import shutil
+import sys
from multiqc import config
-def robust_rmtree(path, logger=None, max_retries=5):
+def robust_rmtree(path, logger=None, max_retries=10):
"""Robustly tries to delete paths.
Retries several times (with increasing delays) if an OSError
occurs. If the final attempt fails, the Exception is propagated
@@ -25,9 +26,12 @@ def robust_rmtree(path, logger=None, max_retries=5):
return
except OSError:
if logger:
- logger.info('Unable to remove path: %s' % path)
- logger.info('Retrying after %d seconds' % i)
- time.sleep(i)
+ logger.info('Unable to remove path: {}'.format(path))
+ logger.info('Retrying after {} seconds'.format(i**2))
+ else:
+ print('Unable to remove path: {}'.format(path), file=sys.stderr)
+ print('Retrying after {} seconds'.format(i**2), file=sys.stderr)
+ time.sleep(i**2)
# Final attempt, pass any Exceptions up to caller.
shutil.rmtree(path)
|
Made the robust_rmtree more conservative. See #<I>.
|
diff --git a/lib/generator.js b/lib/generator.js
index <HASH>..<HASH> 100644
--- a/lib/generator.js
+++ b/lib/generator.js
@@ -193,7 +193,7 @@ function generateDoc(source, options) {
'href': url + '#L' + entry.getLineNumber(),
'member': member,
'name': entry.getName(),
- 'separator': getSeparator(entry)
+ 'separator': member ? getSeparator(entry) : ''
})
);
|
Only use a separator if in the entry template if there is a member.
|
diff --git a/app/libraries/Setups/Scripts/CustomizePreview.php b/app/libraries/Setups/Scripts/CustomizePreview.php
index <HASH>..<HASH> 100644
--- a/app/libraries/Setups/Scripts/CustomizePreview.php
+++ b/app/libraries/Setups/Scripts/CustomizePreview.php
@@ -33,7 +33,7 @@ final class CustomizePreview extends AbstractScript
'url',
'/dist/scripts/customize-preview.min.js'
),
- ['jquery', 'customize-preview'],
+ ['customize-preview'],
'',
true
);
diff --git a/tests/unit/libraries/Setups/Scripts/CustomizePreviewTest.php b/tests/unit/libraries/Setups/Scripts/CustomizePreviewTest.php
index <HASH>..<HASH> 100644
--- a/tests/unit/libraries/Setups/Scripts/CustomizePreviewTest.php
+++ b/tests/unit/libraries/Setups/Scripts/CustomizePreviewTest.php
@@ -73,7 +73,7 @@ class CustomizePreviewTest extends AbstractTestCase
$wp_enqueue_script->wasCalledWithOnce([
$script->id,
'http://my.site/dist/scripts/customizer.js',
- ['jquery', 'customize-preview'],
+ ['customize-preview'],
'',
true
]);
|
Remove 'jquery' as dependency of 'jentil-customize-preview' script
Core's customize-preview script already lists jquery as dependency,
so removing it from our jentil-customize-preview script should not
cause any troubles; jquery will still be loaded before our own
script.
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -28,6 +28,6 @@ SimpleCov.start do
add_filter '/spec/'
end if ENV["COVERAGE"]
-$logger = ZTK::Logger.new(Tempfile.new("test").path)
+$logger = ZTK::Logger.new(File.join("/tmp", "test.log"))
################################################################################
diff --git a/spec/ztk/logger_spec.rb b/spec/ztk/logger_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/ztk/logger_spec.rb
+++ b/spec/ztk/logger_spec.rb
@@ -31,7 +31,7 @@ describe ZTK::Logger do
:error => "This is a test error message",
:fatal => "This is a test fatal message"
}
- @logfile = Tempfile.new("logger").path
+ @logfile = File.join("/tmp", "logger.log")
end
before(:each) do
|
use specific filepaths for spec loggers
|
diff --git a/ara/api/serializers.py b/ara/api/serializers.py
index <HASH>..<HASH> 100644
--- a/ara/api/serializers.py
+++ b/ara/api/serializers.py
@@ -20,7 +20,6 @@ import json
import logging
import zlib
-from django.utils import timezone
from rest_framework import serializers
from ara.api import models
@@ -70,7 +69,7 @@ class DurationSerializer(serializers.ModelSerializer):
@staticmethod
def get_duration(obj):
if obj.ended is None:
- return timezone.now() - obj.started
+ return obj.updated - obj.started
return obj.ended - obj.started
|
Use playbook.updated instead of "now" for calculating duration
Using now() to calculate the duration was not accurate.
If a playbook had never ended, it would show that a playbook ran
yesterday for ><I>k seconds and keep growing, for example.
playbook.updated is the next best thing we've got so let's use that.
Change-Id: I<I>c<I>d<I>e0a<I>f3da1dcbf<I>c7e8
|
diff --git a/test/simple_oauth_test.rb b/test/simple_oauth_test.rb
index <HASH>..<HASH> 100644
--- a/test/simple_oauth_test.rb
+++ b/test/simple_oauth_test.rb
@@ -132,4 +132,17 @@ class SimpleOAuthTest < Test::Unit::TestCase
# Each of the three combined values should be URL encoded.
assert_equal 'ME%23HOD&U%23L&NORMAL%23ZED_PARAMS', header.send(:signature_base)
end
+
+ def test_secret
+ header = SimpleOAuth::Header.new(:get, 'https://api.twitter.com/statuses/friendships.json', {})
+ header.stubs(:options).returns(:consumer_secret => 'CONSUMER_SECRET', :token_secret => 'TOKEN_SECRET')
+
+ # Should combine the consumer and token secrets with an ampersand.
+ assert_equal 'CONSUMER_SECRET&TOKEN_SECRET', header.send(:secret)
+
+ header.stubs(:options).returns(:consumer_secret => 'CONSUM#R_SECRET', :token_secret => 'TOKEN_S#CRET')
+
+ # Should URL encode each secret value before combination.
+ assert_equal 'CONSUM%23R_SECRET&TOKEN_S%23CRET', header.send(:secret)
+ end
end
|
Test generation of the secret used for generating the OAuth signature.
|
diff --git a/lib/auth_plugins/sha256_password.js b/lib/auth_plugins/sha256_password.js
index <HASH>..<HASH> 100644
--- a/lib/auth_plugins/sha256_password.js
+++ b/lib/auth_plugins/sha256_password.js
@@ -2,7 +2,7 @@
const PLUGIN_NAME = 'sha256_password';
const crypto = require('crypto');
-const { xor } = require('../auth_41');
+const { xorRotating } = require('../auth_41');
const REQUEST_SERVER_KEY_PACKET = Buffer.from([1]);
@@ -11,7 +11,7 @@ const STATE_WAIT_SERVER_KEY = 1;
const STATE_FINAL = -1;
function encrypt(password, scramble, key) {
- const stage1 = xor(
+ const stage1 = xorRotating(
Buffer.from(`${password}\0`, 'utf8').toString('binary'),
scramble.toString('binary')
);
|
Update sha<I>_password.js
In short, replacing `xor` for `xorRotating` when authenticating passwords that are greater than <I> characters in length. The original issue was first spotted in the auth_plugin `caching_sha2_password` but is also present in the `sha<I>_password` auth_plugin as well.
The link to the original issue (and fix) can be found here: <URL>
|
diff --git a/client.go b/client.go
index <HASH>..<HASH> 100644
--- a/client.go
+++ b/client.go
@@ -435,7 +435,7 @@ func (c *Client) UserAuthServerCert() error {
}
fmt.Printf("Certificate fingerprint: % x\n", c.scertDigest)
- fmt.Printf("ok (y/n)?")
+ fmt.Printf("ok (y/n)? ")
line, err := ReadStdin()
if err != nil {
return err
|
Add a space between y/n prompt for cert validity
|
diff --git a/concrete/blocks/express_form/controller.php b/concrete/blocks/express_form/controller.php
index <HASH>..<HASH> 100644
--- a/concrete/blocks/express_form/controller.php
+++ b/concrete/blocks/express_form/controller.php
@@ -824,6 +824,7 @@ class Controller extends BlockController implements NotificationProviderInterfac
$this->set('expressForm', $form);
}
if ($this->displayCaptcha) {
+ $this->set('captcha', $this->app->make('helper/validation/captcha'));
$this->requireAsset('css', 'core/frontend/captcha');
}
$this->requireAsset('css', 'core/frontend/errors');
|
fixing captcha error in form view
|
diff --git a/ape/installtools/__init__.py b/ape/installtools/__init__.py
index <HASH>..<HASH> 100644
--- a/ape/installtools/__init__.py
+++ b/ape/installtools/__init__.py
@@ -34,11 +34,14 @@ def create_project_venv():
sys.exit()
try:
- call(['virtualenv', venv_dir, '--no-site-packages'])
+ r = call(['virtualenv', venv_dir, '--no-site-packages'])
except OSError:
print 'ERROR: You probably dont have virtualenv installed: sudo apt-get install python-virtualenv'
sys.exit()
+ if r != 0:
+ raise Exception('ERROR: please install virtualenv in your current env.')
+
print '... virtualenv successfully created'
return VirtualEnv(venv_dir)
|
added support for debian virtualenv issue described in issue #5
|
diff --git a/lib/util/index.js b/lib/util/index.js
index <HASH>..<HASH> 100644
--- a/lib/util/index.js
+++ b/lib/util/index.js
@@ -951,15 +951,19 @@ function decodePath(path) {
function getRuleFiles(rule) {
var files = rule.files || [getPath(getUrl(rule))];
var root = rule.root;
- return files.map(function(file) {
- var filename = '';
+ var result = [];
+ files.map(function(file) {
file = decodePath(file);
+ file = fileMgr.convertSlash(root ? join(root, file) : file);
if (END_WIDTH_SEP_RE.test(file)) {
- filename = 'index.html';
+ result.push(file.slice(0, -1));
+ file = root ? join(root, file, 'index.html') : join(file, 'index.html');
+ result.push(fileMgr.convertSlash(file));
+ } else {
+ result.push(file);
}
- file = root ? join(root, file, filename) : join(file, filename);
- return fileMgr.convertSlash(file);
});
+ return result;
}
exports.getRuleFiles = getRuleFiles;
|
refactor: getPath
|
diff --git a/GPy/inference/SCG.py b/GPy/inference/SCG.py
index <HASH>..<HASH> 100644
--- a/GPy/inference/SCG.py
+++ b/GPy/inference/SCG.py
@@ -39,8 +39,10 @@ def SCG(f, gradf, x, optargs=(), maxiters=500, max_f_eval=500, display=True, xto
function_eval number of fn evaluations
status: string describing convergence status
"""
- print " SCG"
- print ' {0:{mi}s} {1:11s} {2:11s} {3:11s}'.format("I", "F", "Scale", "|g|", mi=len(str(maxiters)))
+
+ if display:
+ print " SCG"
+ print ' {0:{mi}s} {1:11s} {2:11s} {3:11s}'.format("I", "F", "Scale", "|g|", mi=len(str(maxiters)))
if xtol is None:
xtol = 1e-6
|
Removed fisrt prints if display is off
|
diff --git a/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java b/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java
index <HASH>..<HASH> 100644
--- a/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java
+++ b/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java
@@ -237,8 +237,8 @@ public abstract class AbstractJdbc2ResultSetMetaData implements PGResultSetMetaD
Statement stmt = connection.createStatement();
ResultSet rs = stmt.executeQuery(sql.toString());
while (rs.next()) {
- int table = rs.getInt(1);
- int column = rs.getInt(2);
+ int table = (int)rs.getLong(1);
+ int column = (int)rs.getLong(2);
String columnName = rs.getString(3);
String tableName = rs.getString(4);
String schemaName = rs.getString(5);
|
Fix ResultSetMetaData retrieval when the oid counter exceeds INT_MAX.
Since Java doesn't have unsigned ints we retrieve the values as long
and then truncate to int, so it may have a negative value.
As reported by Owen Tran.
|
diff --git a/html/query.go b/html/query.go
index <HASH>..<HASH> 100644
--- a/html/query.go
+++ b/html/query.go
@@ -106,9 +106,15 @@ func SelectAttr(n *html.Node, name string) (val string) {
}
// OutputHTML returns the text including tags name.
-func OutputHTML(n *html.Node) string {
+func OutputHTML(n *html.Node, self bool) string {
var buf bytes.Buffer
- html.Render(&buf, n)
+ if self {
+ html.Render(&buf, n)
+ } else {
+ for n := n.FirstChild; n != nil; n = n.NextSibling {
+ html.Render(&buf, n)
+ }
+ }
return buf.String()
}
diff --git a/html/query_test.go b/html/query_test.go
index <HASH>..<HASH> 100644
--- a/html/query_test.go
+++ b/html/query_test.go
@@ -66,7 +66,7 @@ func TestXPath(t *testing.T) {
if strings.Index(InnerText(node), "Logo") > 0 {
t.Fatal("InnerText() have comment node text")
}
- if strings.Index(OutputHTML(node), "Logo") == -1 {
+ if strings.Index(OutputHTML(node, true), "Logo") == -1 {
t.Fatal("OutputHTML() shoud have comment node text")
}
}
|
feature: OutputHTML allow node itself output or not #9
|
diff --git a/eZ/Publish/API/Repository/Values/User/Policy.php b/eZ/Publish/API/Repository/Values/User/Policy.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/API/Repository/Values/User/Policy.php
+++ b/eZ/Publish/API/Repository/Values/User/Policy.php
@@ -19,7 +19,6 @@ use eZ\Publish\API\Repository\Values\ValueObject;
* @property-read mixed $roleId the role id this policy belongs to
* @property-read string $module Name of module, associated with the Policy
* @property-read string $function Name of the module function Or all functions with '*'
- * @property-read mixed $originalId Original policy ID the policy was created from.
* @property-read array $limitations an array of \eZ\Publish\API\Repository\Values\User\Limitation
*/
abstract class Policy extends ValueObject
|
EZP-<I>: Removed unused reference to virtual property
|
diff --git a/libre/apps/data_drivers/exceptions.py b/libre/apps/data_drivers/exceptions.py
index <HASH>..<HASH> 100644
--- a/libre/apps/data_drivers/exceptions.py
+++ b/libre/apps/data_drivers/exceptions.py
@@ -11,3 +11,7 @@ class LIBREError(ParseError):
class LIBREValueError(LIBREError):
pass
+
+
+class LIBREFieldError(LIBREError):
+ pass
|
Add a new exception for field resultion errors
|
diff --git a/lib/virtus/class_methods.rb b/lib/virtus/class_methods.rb
index <HASH>..<HASH> 100644
--- a/lib/virtus/class_methods.rb
+++ b/lib/virtus/class_methods.rb
@@ -44,8 +44,8 @@ module Virtus
# @api public
def attribute(name, type, options = {})
attribute = Attribute.determine_type(type).new(name, options)
- define_attribute_methods(attribute)
- add_attribute(attribute)
+ virtus_define_attribute_methods(attribute)
+ virtus_add_attribute(attribute)
self
end
@@ -98,7 +98,7 @@ module Virtus
# @return [undefined]
#
# @api private
- def define_attribute_methods(attribute)
+ def virtus_define_attribute_methods(attribute)
attribute.define_reader_method(self)
attribute.define_writer_method(self)
include self::AttributeMethods
@@ -111,7 +111,7 @@ module Virtus
# @return [undefined]
#
# @api private
- def add_attribute(attribute)
+ def virtus_add_attribute(attribute)
attributes << attribute
descendants.each { |descendant| descendant.attributes.reset }
end
|
Prefixed private methods to prevent conflicts.
|
diff --git a/src/Events/GetCalendarEventsListener.php b/src/Events/GetCalendarEventsListener.php
index <HASH>..<HASH> 100644
--- a/src/Events/GetCalendarEventsListener.php
+++ b/src/Events/GetCalendarEventsListener.php
@@ -15,7 +15,6 @@ class GetCalendarEventsListener implements EventListenerInterface
{
return [
'Calendars.Model.getCalendarEvents' => 'getCalendarEvents',
- 'Calendars.Model.getCalendarEventInfo' => 'getCalendarEventInfo',
];
}
|
Removing obsolete event listeners (task #<I>)
|
diff --git a/code/controller/CMSMain.php b/code/controller/CMSMain.php
index <HASH>..<HASH> 100755
--- a/code/controller/CMSMain.php
+++ b/code/controller/CMSMain.php
@@ -497,6 +497,19 @@ JS;
return $form;
}
+
+ public function currentPageID() {
+ $id = parent::currentPageID();
+
+ // Fall back to homepage record
+ if(!$id) {
+ $homepageSegment = RootURLController::get_homepage_link();
+ $homepageRecord = DataObject::get_one('SiteTree', sprintf('"URLSegment" = \'%s\'', $homepageSegment));
+ if($homepageRecord) $id = $homepageRecord->ID;
+ }
+
+ return $id;
+ }
//------------------------------------------------------------------------------------------//
// Data saving handlers
|
MINOR Fall back to homepage record for CMSMain->PreviewLink()
|
diff --git a/tests/src/main/java/com/hazelcast/simulator/tests/network/PayloadUtils.java b/tests/src/main/java/com/hazelcast/simulator/tests/network/PayloadUtils.java
index <HASH>..<HASH> 100644
--- a/tests/src/main/java/com/hazelcast/simulator/tests/network/PayloadUtils.java
+++ b/tests/src/main/java/com/hazelcast/simulator/tests/network/PayloadUtils.java
@@ -7,10 +7,10 @@ import static java.lang.String.format;
public final class PayloadUtils {
- private static final ILogger LOGGER = Logger.getLogger(PayloadUtils.class);
-
public static final boolean COMPRESS_HEX_OUTPUT = true;
+ private static final ILogger LOGGER = Logger.getLogger(PayloadUtils.class);
+
private PayloadUtils() {
}
|
Fixed CheckStyle issue in PayloadUtils.
|
diff --git a/services/price/server.py b/services/price/server.py
index <HASH>..<HASH> 100644
--- a/services/price/server.py
+++ b/services/price/server.py
@@ -308,12 +308,12 @@ class PriceServicer(price_pb2_grpc.PriceServicer):
def __init__(self):
self.pymortar_client = pymortar.Client()
- price_path = PRICE_DATA_PATH + "/" + "price_mapping.csv"
- if not os.path.exists(price_path):
+ price_path = PRICE_DATA_PATH + "/" + "price-mapping.csv"
+ if not os.path.exists(str(price_path)):
print("Error: could not find price_mapping.csv file.")
- quit()
+ sys.exit()
- self.price_mapping = pd.read_csv(price_path)
+ self.price_mapping = pd.read_csv(str(price_path))
def GetPrice(self, request, context):
prices,error = get_price(request,self.pymortar_client)
|
updated price_mapping file location and fixed building names
|
diff --git a/scapy.py b/scapy.py
index <HASH>..<HASH> 100755
--- a/scapy.py
+++ b/scapy.py
@@ -6125,7 +6125,7 @@ class STP(Packet):
ShortField("bridgeid", 0),
MACField("bridgemac", ETHER_ANY),
ShortField("portid", 0),
- ShortField("age", 1),
+ BCDFloatField("age", 1),
BCDFloatField("maxage", 20),
BCDFloatField("hellotime", 2),
BCDFloatField("fwddelay", 15) ]
|
Use BCDFloadField for STP age field (ticket #<I>)
|
diff --git a/examples/mpl/subplots.py b/examples/mpl/subplots.py
index <HASH>..<HASH> 100644
--- a/examples/mpl/subplots.py
+++ b/examples/mpl/subplots.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
"""
Edward Tufte uses this example from Anscombe to show 4 datasets of x
and y that have the same mean, standard deviation, and regression
@@ -49,7 +48,7 @@ plt.axis([2, 20, 2, 14])
plt.setp(plt.gca(), yticklabels=[], yticks=(4, 8, 12), xticks=(0, 10, 20))
plt.text(3, 12, 'IV', fontsize=20)
-plt.title("Subplots support in Bokeh")
+# We create the figure in matplotlib and then we "pass it" to Bokeh
pyplot.show_bokeh(plt.gcf(), filename="subplots.html")
|
Fixed some unused imports and comments.
|
diff --git a/src/count-down/test/index.spec.js b/src/count-down/test/index.spec.js
index <HASH>..<HASH> 100644
--- a/src/count-down/test/index.spec.js
+++ b/src/count-down/test/index.spec.js
@@ -1,4 +1,4 @@
-import { nextTick } from 'vue';
+import { KeepAlive, nextTick } from 'vue';
import CountDown from '..';
import { mount, later } from '../../../test';
@@ -178,11 +178,13 @@ test('should format S milliseconds correctly', () => {
test('should pause counting when deactivated', async () => {
const wrapper = mount({
- template: `
- <keep-alive>
- <van-count-down v-if="render" ref="countDown" time="100" />
- </keep-alive>
- `,
+ render() {
+ return (
+ <KeepAlive>
+ {this.render ? <CountDown ref="countDown" time="10000" /> : null}
+ </KeepAlive>
+ );
+ },
data() {
return {
render: true,
|
test(CountDown): fix test warning (#<I>)
|
diff --git a/lib/Record.php b/lib/Record.php
index <HASH>..<HASH> 100644
--- a/lib/Record.php
+++ b/lib/Record.php
@@ -346,6 +346,9 @@ class Record extends Base implements \ArrayAccess, \IteratorAggregate, \Countabl
// Insert
if ($isNew) {
+ if (array_key_exists($this->primaryKey, $this->data) && !$this->data[$this->primaryKey]) {
+ unset($this->data[$this->primaryKey]);
+ }
$result = (bool)$this->db->insert($this->table, $this->data);
if ($result) {
$this->isNew = false;
|
try to fix db test error
|
diff --git a/pysat/tests/test_ftp_instruments.py b/pysat/tests/test_ftp_instruments.py
index <HASH>..<HASH> 100644
--- a/pysat/tests/test_ftp_instruments.py
+++ b/pysat/tests/test_ftp_instruments.py
@@ -1,16 +1,13 @@
"""
tests the pysat meta object and code
"""
-import pysat
+import importlib
+import os
import tempfile
-
+import pysat
import pysat.instruments.pysat_testing
import pysat.tests.test_instruments
-# import pysat.instruments as instruments
-import os
-
-import importlib
include_list = ['sw_dst', 'sw_kp']
# dict, keyed by pysat instrument, with a list of usernames and passwords
|
Update test_ftp_instruments.py
Updated import order to be more PEP8 compliant
|
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index <HASH>..<HASH> 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1246,7 +1246,7 @@ function forum_get_readable_forums($userid, $courseid=0) {
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
- if (has_capability('moodle/course:viewhiddenactivities', $coursecontext)) {
+ if (!has_capability('moodle/course:viewhiddenactivities', $coursecontext)) {
$selecthidden = ' AND cm.visible = 1';
} else {
$selecthidden = '';
|
merged fixing a broken has_capability() call
|
diff --git a/scripts/webpack/webpack.hot.js b/scripts/webpack/webpack.hot.js
index <HASH>..<HASH> 100644
--- a/scripts/webpack/webpack.hot.js
+++ b/scripts/webpack/webpack.hot.js
@@ -26,6 +26,8 @@ module.exports = merge(common, {
extensions: ['.scss', '.ts', '.tsx', '.es6', '.js', '.json', '.svg', '.woff2', '.png'],
},
+ devtool: 'eval-source-map',
+
devServer: {
publicPath: '/public/build/',
hot: true,
|
Fix sourcemaps for webpack hot config
|
diff --git a/lib/rib/more/edit.rb b/lib/rib/more/edit.rb
index <HASH>..<HASH> 100644
--- a/lib/rib/more/edit.rb
+++ b/lib/rib/more/edit.rb
@@ -13,9 +13,10 @@ module Rib::Edit
file.puts(Rib.vars[:edit])
file.close
- system("#{ENV['EDITOR']} #{file.path}")
+ shell = Rib.shell
+ system("#{shell.editor} #{file.path}")
- if (shell = Rib.shell).running?
+ if shell.running?
shell.send(:multiline_buffer).pop
else
shell.before_loop
@@ -29,5 +30,9 @@ module Rib::Edit
end
end
+ def editor
+ ENV['EDITOR'] || 'vim'
+ end
+
Rib.extend(Imp)
end
|
[rib/more/edit] default editor to vim, and you could override it
|
diff --git a/src/test/java/com/google/cloud/tools/managedcloudsdk/ManagedCloudSdkTest.java b/src/test/java/com/google/cloud/tools/managedcloudsdk/ManagedCloudSdkTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/com/google/cloud/tools/managedcloudsdk/ManagedCloudSdkTest.java
+++ b/src/test/java/com/google/cloud/tools/managedcloudsdk/ManagedCloudSdkTest.java
@@ -36,7 +36,7 @@ public class ManagedCloudSdkTest {
@Rule public TemporaryFolder tempDir = new TemporaryFolder();
- private static final String FIXED_VERSION = "169.0.0";
+ private static final String FIXED_VERSION = "174.0.0";
private final MessageCollector testListener = new MessageCollector();
private final SdkComponent testComponent = SdkComponent.APP_ENGINE_JAVA;
|
Fix cloud SDK test, bug in Cloud SDK doesn't allow downgrades to <I> (#<I>)
|
diff --git a/currencies/admin.py b/currencies/admin.py
index <HASH>..<HASH> 100644
--- a/currencies/admin.py
+++ b/currencies/admin.py
@@ -3,7 +3,8 @@ from currencies.models import Currency
class CurrencyAdmin(admin.ModelAdmin):
- list_display = ("name", "is_default", "code", "symbol", "factor")
+ list_display = ("name", "is_active", "is_base", "is_default", "code", "symbol", "factor")
+ list_filter = ("is_active", )
search_fields = ("name", "code")
admin.site.register(Currency, CurrencyAdmin)
|
Add is_active and is_base to the admin
|
diff --git a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
@@ -165,7 +165,7 @@ module ActionDispatch
return response unless value
cookie = { :value => value }
- unless options[:expire_after].nil?
+ if options[:expire_after]
cookie[:expires] = Time.now + options.delete(:expire_after)
end
|
no need to check for nil?
|
diff --git a/intranet/apps/eighth/views/api.py b/intranet/apps/eighth/views/api.py
index <HASH>..<HASH> 100644
--- a/intranet/apps/eighth/views/api.py
+++ b/intranet/apps/eighth/views/api.py
@@ -1,6 +1,7 @@
import logging
from datetime import datetime
+from django.core.exceptions import PermissionDenied
from django.http import Http404
from django.contrib.auth import get_user_model
@@ -126,7 +127,9 @@ class EighthUserSignupListAdd(generics.ListCreateAPIView):
return Response(serialized.data)
def create(self, request, user_id=None):
- if user_id:
+ if user_id and not request.user.is_eighth_admin:
+ raise PermissionDenied
+ elif user_id:
user = get_user_model().objects.get(id=user_id)
else:
user = request.user
|
fix(eighth): deny unauthorized signup API request
|
diff --git a/ntfy/backends/simplepush.py b/ntfy/backends/simplepush.py
index <HASH>..<HASH> 100644
--- a/ntfy/backends/simplepush.py
+++ b/ntfy/backends/simplepush.py
@@ -4,7 +4,8 @@ from ..config import USER_AGENT
def notify(title,
message,
- key):
+ key,
+ retcode=None):
"""
Required paramter:
* ``key`` - The Simplepush identification key, created by
|
retcode argument for simplepush backend (ugh.. that's why i didn't _really_ dig the idea of that arg)
|
diff --git a/lib/framer.js b/lib/framer.js
index <HASH>..<HASH> 100644
--- a/lib/framer.js
+++ b/lib/framer.js
@@ -298,7 +298,7 @@ frame_types[0x1] = 'HEADERS';
frame_flags.HEADERS = ['END_STREAM', 'RESERVED', 'END_HEADERS', 'PRIORITY'];
-type_specific_attributes.HEADERS = ['priority', 'data'];
+type_specific_attributes.HEADERS = ['priority', 'headers', 'data'];
// 0 1 2 3
// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -497,7 +497,7 @@ frame_types[0x5] = 'PUSH_PROMISE';
frame_flags.PUSH_PROMISE = ['END_PUSH_PROMISE'];
-type_specific_attributes.PUSH_PROMISE = ['promised_stream', 'data'];
+type_specific_attributes.PUSH_PROMISE = ['promised_stream', 'headers', 'data'];
// 0 1 2 3
// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
Framer: add 'headers' as frame specific attribute to HEADERS and PUSH_PROMISE.
|
diff --git a/src/Ddeboer/DataImport/Reader/Factory/CsvReaderFactory.php b/src/Ddeboer/DataImport/Reader/Factory/CsvReaderFactory.php
index <HASH>..<HASH> 100644
--- a/src/Ddeboer/DataImport/Reader/Factory/CsvReaderFactory.php
+++ b/src/Ddeboer/DataImport/Reader/Factory/CsvReaderFactory.php
@@ -19,7 +19,7 @@ class CsvReaderFactory
public function __construct(
$headerRowNumber = null,
$strict = true,
- $delimiter = ';',
+ $delimiter = ',',
$enclosure = '"',
$escape = '\\'
) {
|
Use commas for the CSV Reader
Since CSV means comma separated values it seems only logical that its the default. A similar change was made against the CsvReader awhile back and I just noticed the CsvReaderFactory has the same issue.
|
diff --git a/openquake/calculators/classical.py b/openquake/calculators/classical.py
index <HASH>..<HASH> 100644
--- a/openquake/calculators/classical.py
+++ b/openquake/calculators/classical.py
@@ -244,6 +244,8 @@ def build_hcurves_and_stats(pgetter, hstats, monitor):
pmaps = pgetter.get_pmaps(pgetter.sids)
except IndexError: # no data
return {}
+ if sum(len(pmap) for pmap in pmaps) == 0: # no data
+ return {}
pmap_by_kind = {}
for kind, stat in hstats:
with monitor('compute ' + kind):
|
Fixed build_hcurves_and_stats [skip hazardlib] [demos]
Former-commit-id: <I>db<I>fb<I>f<I>e<I>b1babb<I>a<I>eb<I>ac
|
diff --git a/dca/tl_page.php b/dca/tl_page.php
index <HASH>..<HASH> 100644
--- a/dca/tl_page.php
+++ b/dca/tl_page.php
@@ -124,7 +124,7 @@ $GLOBALS['TL_DCA']['tl_page']['fields']['cookiebar_analyticsCheckbox'] = [
'exclude' => true,
'inputType' => 'checkbox',
'eval' => ['tl_class' => 'clr'],
- 'sql' => "char(1) NOT NULL default '1'",
+ 'sql' => "char(1) NOT NULL default ''",
];
$GLOBALS['TL_DCA']['tl_page']['fields']['cookiebar_analyticsLabel'] = [
|
Do not make the analytics checkbox set by default
|
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/hudson/model/Descriptor.java
+++ b/core/src/main/java/hudson/model/Descriptor.java
@@ -944,11 +944,10 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable {
}
/**
- * Finds a descriptor from a collection by its class name.
- * @deprecated Since we introduced {@link Descriptor#getId()}, it is a preferred method of identifying descriptor by a string.
- * @since TODO
+ * Finds a descriptor from a collection by the class name of the {@link Descriptor}.
+ * This is useless as of the introduction of {@link #getId} and so only very old compatibility code needs it.
*/
- public static @CheckForNull <T extends Descriptor> T findByClassName(Collection<? extends T> list, String className) {
+ private static @CheckForNull <T extends Descriptor> T findByClassName(Collection<? extends T> list, String className) {
for (T d : list) {
if(d.getClass().getName().equals(className))
return d;
|
findByClassName should not be advertised to outside code.
(cherry picked from commit 8dd<I>a8f<I>d3b<I>b4e<I>fc<I>ee5a<I>)
|
diff --git a/test/helpers.js b/test/helpers.js
index <HASH>..<HASH> 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -3,7 +3,7 @@ import ParseError from "../src/ParseError";
import parseTree from "../src/parseTree";
import Settings from "../src/Settings";
-import diff from 'jest-diff';
+import {diff} from 'jest-diff';
import {RECEIVED_COLOR, printReceived, printExpected} from 'jest-matcher-utils';
import {formatStackTrace, separateMessageFromStack} from 'jest-message-util';
|
chore(tests): fix use of jest-diff (#<I>)
Jest <I> changed the signature for jest-diff.
This bug only arises from failing tests.
|
diff --git a/schema/jsonschema.js b/schema/jsonschema.js
index <HASH>..<HASH> 100755
--- a/schema/jsonschema.js
+++ b/schema/jsonschema.js
@@ -154,11 +154,11 @@ function traverse(schema, p) {
params[key] = group+'{'+type+size+allowedValues+'} '+field+' '+description;
var subs = {};
- var subgroup = p ? p+'.' : '';
+ //var subgroup = p ? p+'.' : ''; // TODO apidoc - groups cannot have `.` in them
if (param.type === 'array' && param.items.type === 'object') {
- subs = traverse(param.items, subgroup+key+'[]');
+ subs = traverse(param.items, key+'[]'); // subgroup+
} else if (param.type === 'object') {
- subs = traverse(param, subgroup+key);
+ subs = traverse(param, key); // subgroup+
}
for(var subKey in subs) {
if (!subs.hasOwnProperty(subKey)) { continue; }
|
Bug fix. groups don't allow `.` in the name.
|
diff --git a/pypot/dynamixel/motor.py b/pypot/dynamixel/motor.py
index <HASH>..<HASH> 100644
--- a/pypot/dynamixel/motor.py
+++ b/pypot/dynamixel/motor.py
@@ -255,7 +255,7 @@ class DxlMotor(Motor):
elif control == 'dummy':
dp = abs(self.present_position - position)
- speed = (dp / float(duration)) if duration > 0 else numpy.inf
+ speed = (dp / float(duration)) if duration > 0 else 0
self.moving_speed = speed
self.goal_position = position
|
Update motor.py
np.inf is casted in Infinity in Json, which is not valid
|
diff --git a/src/Configuration.php b/src/Configuration.php
index <HASH>..<HASH> 100644
--- a/src/Configuration.php
+++ b/src/Configuration.php
@@ -91,6 +91,10 @@ final class Configuration
*/
public function setRecipientOverride($recipientOverride)
{
+ if (!$recipientOverride) {
+ return $this;
+ }
+
if (!filter_var($recipientOverride, FILTER_VALIDATE_EMAIL)) {
throw new Exception('Recipient override must be a valid email address');
}
diff --git a/tests/ConfigurationTest.php b/tests/ConfigurationTest.php
index <HASH>..<HASH> 100644
--- a/tests/ConfigurationTest.php
+++ b/tests/ConfigurationTest.php
@@ -78,6 +78,17 @@ final class ConfigurationTest extends PHPUnit_Framework_TestCase
/**
* @test
*/
+ public function it_ignores_an_empty_recipient_override()
+ {
+ $config = Configuration::newInstance()
+ ->setRecipientOverride(null);
+
+ $this->assertSame('', $config->getRecipientOverride());
+ }
+
+ /**
+ * @test
+ */
public function it_states_that_Gmail_style_overriding_should_be_done_when_configured_so()
{
$config = Configuration::newInstance()
|
Ignore empty recipient override
|
diff --git a/routing/router.go b/routing/router.go
index <HASH>..<HASH> 100644
--- a/routing/router.go
+++ b/routing/router.go
@@ -727,6 +727,13 @@ func (r *ChannelRouter) pruneZombieChans() error {
}
}
+ // With the channels pruned, we'll also attempt to prune any nodes that
+ // were a part of them.
+ err = r.cfg.Graph.PruneGraphNodes()
+ if err != nil && err != channeldb.ErrGraphNodesNotFound {
+ return fmt.Errorf("unable to prune graph nodes: %v", err)
+ }
+
return nil
}
|
routing: prune graph nodes after pruning zombie channels
We do this to ensure we don't leave any stray nodes in our graph that
were part of the zombie channels that we've pruned.
|
diff --git a/gct.py b/gct.py
index <HASH>..<HASH> 100644
--- a/gct.py
+++ b/gct.py
@@ -17,7 +17,7 @@ __status__ = 'Beta'
GCT Tools
Tools for loading a GCT file and working with its contents as a Pandas DataFrame.
-Compatible with Python 2.7 and Python 3.4
+Compatible with Python 2.7 and Python 3.4+
"""
diff --git a/gp.py b/gp.py
index <HASH>..<HASH> 100644
--- a/gp.py
+++ b/gp.py
@@ -3,9 +3,10 @@ __copyright__ = 'Copyright 2015-2016, Broad Institute'
__version__ = '1.2.0'
__status__ = 'Production'
-""" GenePattern Python Client
+"""
+GenePattern Python Client
- Compatible with Python 2.7 and Python 3.4
+Compatible with Python 2.7 and Python 3.4+
"""
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from distutils.core import setup
setup(
name='genepattern-python',
- py_modules=['gp'],
+ py_modules=['gp', 'gct'],
version='1.2.0',
description='Library for programmatically interacting with GenePattern from Python.',
author='Thorin Tabor',
|
Ship GCT Tools with the genepattern-python package
|
diff --git a/multiqc/templates/default/assets/js/multiqc_generalstats.js b/multiqc/templates/default/assets/js/multiqc_generalstats.js
index <HASH>..<HASH> 100644
--- a/multiqc/templates/default/assets/js/multiqc_generalstats.js
+++ b/multiqc/templates/default/assets/js/multiqc_generalstats.js
@@ -99,7 +99,7 @@ $(function () {
if(colscheme_rev){
scale = chroma.scale(colscheme).domain([maxval, minval]);
}
- table.find('tr td:nth-of-type('+(idx)+')').each(function(){
+ table.find('tr td:nth-of-type('+(idx+1)+')').each(function(){
var val = parseFloat($(this).text());
var col = scale(val).css();
$(this).find('.wrapper .bar').css('background-color', col);
|
Fixed JS index bug in general stats colours.
|
diff --git a/indra/tests/test_preassembler.py b/indra/tests/test_preassembler.py
index <HASH>..<HASH> 100644
--- a/indra/tests/test_preassembler.py
+++ b/indra/tests/test_preassembler.py
@@ -415,7 +415,7 @@ def test_render_stmt_graph():
stmts = [p0, p1, p2, p3, p4, p5, p6]
pa = Preassembler(hierarchies, stmts=stmts)
pa.combine_related()
- graph = render_stmt_graph(pa.related_stmts)
+ graph = render_stmt_graph(pa.related_stmts, reduce=False)
# One node for each statement
assert len(graph.nodes()) == 7
# Edges:
|
Fix failing test for render_stmt_graph
|
diff --git a/nodeserver/src/client/js/cli3nt.js b/nodeserver/src/client/js/cli3nt.js
index <HASH>..<HASH> 100644
--- a/nodeserver/src/client/js/cli3nt.js
+++ b/nodeserver/src/client/js/cli3nt.js
@@ -404,6 +404,39 @@ define(['/common/LogManager.js','/common/EventDispatcher.js', '/socket.io/socket
but only through functions
this way all modifications will be visible
*/
+ ClientNode = function(client,id,storage){
+ var selfdata,
+ ;
+ /*public funcitons*/
+ this.isDeleted = function(){
+ return selfdata === null;
+ };
+ this.getParentId = function(){
+ return selfdata.relations.parentId;
+ };
+ this.getChildrenIds = function(){
+ return selfdata.relations.childrenIds;
+ };
+ this.getBaseId = function(){
+ return selfdata.relations.baseId;
+ };
+ this.getInheritorIds = function(){
+ return selfdata.relations.inheritorIds;
+ };
+ this.getAttribute = function(name){
+
+ };
+ this.getRegistry = function(name){
+
+ };
+
+ /*private functions*/
+
+
+ /*main*/
+ selfdata = storage.get(id);
+
+ };
ClientNode = function(_client,_id,_storage){
/*public interface*/
|
continue 're-implementing' client side
Former-commit-id: 2abfdc5df2f<I>e<I>d<I>a7
|
diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb
index <HASH>..<HASH> 100644
--- a/activesupport/lib/active_support/test_case.rb
+++ b/activesupport/lib/active_support/test_case.rb
@@ -149,5 +149,9 @@ module ActiveSupport
alias :assert_not_same :refute_same
ActiveSupport.run_load_hooks(:active_support_test_case, self)
+
+ def inspect # :nodoc:
+ "#<#{self.class.name}:#{'%#016x' % object_id}>"
+ end
end
end
|
Stop gap solution for long output on test cases
This patch just changes the inspect method on test case instances.
Seeing test instance internals probably isn't helpful when an exception
is raised (for example a `NoMethodError`).
This isn't as good as #<I>, but should fix #<I>
|
diff --git a/shutit_srv.py b/shutit_srv.py
index <HASH>..<HASH> 100644
--- a/shutit_srv.py
+++ b/shutit_srv.py
@@ -66,7 +66,6 @@ def update_modules(to_build, cfg):
orig_mod_cfg[sec][key] = val
for mid in orig_mod_cfg:
shutit.cfg[mid].update(orig_mod_cfg[mid])
- shutit.cfg['repository'].update(orig_mod_cfg['repository'])
shutit_main.config_collection_for_built(shutit)
selected = set(to_build)
|
I'm <I>% sure this is redundant
|
diff --git a/src/sap.ui.layout/src/sap/ui/layout/ResponsiveSplitter.js b/src/sap.ui.layout/src/sap/ui/layout/ResponsiveSplitter.js
index <HASH>..<HASH> 100644
--- a/src/sap.ui.layout/src/sap/ui/layout/ResponsiveSplitter.js
+++ b/src/sap.ui.layout/src/sap/ui/layout/ResponsiveSplitter.js
@@ -564,7 +564,7 @@ sap.ui.define([
*/
ResponsiveSplitter.prototype._clearContent = function () {
this._aPaneContainers.forEach(function(oPaneContainer) {
- oPaneContainer._oSplitter.removeAllAssociatedContentArea();
+ oPaneContainer._oSplitter.removeAllAssociatedContentAreas();
});
this._aPaneContainers = [];
|
[INTERNAL] sap.ui.layout.ResponsiveSplitter: Replaced deprecated method
Replaced depracated removeAllAssociatedContentArea (singular) with
removeAllAssociatedContentAreas (plural) usage to prevent warnings
in the console.
Change-Id: I<I>b<I>d<I>d8afb<I>e<I>c<I>b<I>d<I>f
|
diff --git a/src/CacheKey.php b/src/CacheKey.php
index <HASH>..<HASH> 100644
--- a/src/CacheKey.php
+++ b/src/CacheKey.php
@@ -177,7 +177,11 @@ class CacheKey
$value = $this->getTypeClause($where);
$value .= $this->getValuesClause($where);
- return "-{$where["column"]}_{$value}";
+ $column = "";
+ $column .= isset($where["column"]) ? $where["column"] : "";
+ $column .= isset($where["columns"]) ? implode("-", $where["columns"]) : "";
+
+ return "-{$column}_{$value}";
}
protected function getQueryColumns(array $columns) : string
@@ -231,7 +235,7 @@ class CacheKey
protected function getTypeClause($where) : string
{
- $type = in_array($where["type"], ["InRaw", "In", "NotIn", "Null", "NotNull", "between", "NotInSub", "InSub", "JsonContains"])
+ $type = in_array($where["type"], ["InRaw", "In", "NotIn", "Null", "NotNull", "between", "NotInSub", "InSub", "JsonContains", "Fulltext"])
? strtolower($where["type"])
: strtolower($where["operator"]);
|
Support for full text search
Recently Laravel added support for full-text search where clauses in the query builder.
<URL>
|
diff --git a/src/Common/Service/Database.php b/src/Common/Service/Database.php
index <HASH>..<HASH> 100644
--- a/src/Common/Service/Database.php
+++ b/src/Common/Service/Database.php
@@ -60,7 +60,7 @@ use Nails\Testing;
* @method \CI_DB_query_builder offset($offset)
* @method \CI_DB_query_builder set($key, $value = '', $escape = null)
* @method string get_compiled_select($table = '', $reset = true)
- * @method \CI_DB_query_builder get($table = '', $limit = null, $offset = null)
+ * @method \CI_DB_result get($table = '', $limit = null, $offset = null)
* @method int count_all_results($table = '', $reset = true)
* @method \CI_DB_result get_where($table = '', $where = null, $limit = null, $offset = null)
* @method int insert_batch($table, $set = null, $escape = null, $batch_size = 100)
|
Correct typehint in docblock
|
diff --git a/templates/js/atk4_univ.js b/templates/js/atk4_univ.js
index <HASH>..<HASH> 100644
--- a/templates/js/atk4_univ.js
+++ b/templates/js/atk4_univ.js
@@ -447,6 +447,9 @@ ajaxec: function(url,data,fn){
newWindow: function(url,name,options){
window.open(url,name,options);
},
+expr: function(str){
+ return eval("(" + str + ")");
+},
loadingInProgress: function(){
this.successMessage('Loading is in progress. Please wait');
},
|
Added option to pass expression through jQuery chain
Example: $this->js(true)->css("height", $this->js()->expr($this->js()->_selector("body")->innerHeight() . " - <I>"));
|
diff --git a/shell/src/main/java/tachyon/shell/TfsShell.java b/shell/src/main/java/tachyon/shell/TfsShell.java
index <HASH>..<HASH> 100644
--- a/shell/src/main/java/tachyon/shell/TfsShell.java
+++ b/shell/src/main/java/tachyon/shell/TfsShell.java
@@ -116,7 +116,6 @@ public class TfsShell implements Closeable {
System.out.println(" [mv <src> <dst>]");
System.out.println(" [pin <path>]");
System.out.println(" [report <path>]");
- System.out.println(" [request <tachyonaddress> <dependencyId>]");
System.out.println(" [rm <path>]");
System.out.println(" [rmr <path>]");
System.out.println(" [setTTL <path> <time to live(in milliseconds)>]");
|
Remove unused request command from shell help.
|
diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusteredServiceContainer.java b/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusteredServiceContainer.java
index <HASH>..<HASH> 100644
--- a/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusteredServiceContainer.java
+++ b/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusteredServiceContainer.java
@@ -151,7 +151,7 @@ public final class ClusteredServiceContainer implements AutoCloseable
/**
* Stream id within a channel for timer scheduling messages to the cluster. Default to stream id of 4.
*/
- public static final int TIMER_STREAM_ID_DEFAULT = 4;
+ public static final int TIMER_STREAM_ID_DEFAULT = 5;
/**
* Whether to start without any previous log or use any existing log.
|
[Java]: avoid replay stream Id conflicting with timer stream id
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
import os
-from setuptools import setup
+from setuptools import setup, find_packages
LONG_DESCRIPTION = """Django-Prometheus
@@ -12,7 +12,7 @@ instructions.
setup(
name="django-prometheus",
- version="0.1.1",
+ version="0.2.0",
author="Uriel Corfa",
author_email="uriel@corfa.fr",
description=(
@@ -20,7 +20,7 @@ setup(
license="Apache",
keywords="django monitoring prometheus",
url="http://github.com/korfuri/django-prometheus",
- packages=["django_prometheus"],
+ packages=find_packages(),
test_suite="tests",
long_description=LONG_DESCRIPTION,
install_requires=[
|
Release <I>
Previous releases did not package the database backends.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ setup(
packages=['table'],
include_package_data=True,
license='BSD License', # example license
- description='A simple Django app to conduct Web-based polls.',
+ description='A simple Django app to origanize data in tabular form.',
long_description=README,
url='http://www.example.com/',
author='guoqs',
|
update app desc in setup.py
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -23,7 +23,7 @@ import os
from functools import partial
from pip.req import parse_requirements
-from setuptools import setup
+from setuptools import setup, find_packages
# parse_requirements() interface has changed in Pip 6.0
if pip.__version__ >= '6.0':
@@ -50,6 +50,6 @@ setup(
url = 'https://github.com/NiklasRosenstein/py-nr',
author = 'Niklas Rosenstein',
author_email = 'rosensteinniklas@gmail.com',
- packages = ['nr'],
+ packages = find_packages(),
install_requires = [str(x.req) for x in parse_requirements('requirements.txt')],
)
|
fix packages listed in setup.py
|
diff --git a/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go
index <HASH>..<HASH> 100644
--- a/pkg/api/v1/conversion.go
+++ b/pkg/api/v1/conversion.go
@@ -44,7 +44,7 @@ func addConversionFuncs() {
"status.phase",
"spec.nodeName":
return label, value, nil
- // This is for backwards compatability with old v1 clients which send spec.host
+ // This is for backwards compatability with old v1 clients which send spec.host
case "spec.host":
return "spec.nodeName", value, nil
default:
|
Fix gofmt from #<I>
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -61,6 +61,9 @@ Mode.prototype.valueOf = function () {
/**
* Returns a String representation of the `mode`.
+ * The output resembles something similiar to what `ls -l` would output.
+ *
+ * http://en.wikipedia.org/wiki/Unix_file_types
*
* @return {String}
* @api public
|
index: add link to the wikipedia "unix file types"
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.