diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/Labrador/Service/DefaultServicesRegister.php b/src/Labrador/Service/DefaultServicesRegister.php
index <HASH>..<HASH> 100644
--- a/src/Labrador/Service/DefaultServicesRegister.php
+++ b/src/Labrador/Service/DefaultServicesRegister.php
@@ -74,8 +74,6 @@ class DefaultServicesRegister implements Register {
'dataGenerator' => GcbDataGenerator::class
]
);
-
-
}
private function registerSymfonyServices(Injector $injector) {
|
removing erroneous white space
|
diff --git a/src/Service/DataExport.php b/src/Service/DataExport.php
index <HASH>..<HASH> 100644
--- a/src/Service/DataExport.php
+++ b/src/Service/DataExport.php
@@ -23,8 +23,8 @@ use Nails\Admin\DataExport\SourceResponse;
*/
class DataExport
{
- protected $aSources = [];
- protected $aFormats = [];
+ protected $aSources = [];
+ protected $aFormats = [];
protected $aCacheFiles = [];
// --------------------------------------------------------------------------
@@ -36,18 +36,8 @@ class DataExport
{
$this->aSources = [];
$this->aFormats = [];
- $aComponents = array_merge(
- [
- (object) [
- 'slug' => 'app',
- 'namespace' => 'App\\',
- 'path' => NAILS_APP_PATH,
- ],
- ],
- Components::available()
- );
-
- foreach ($aComponents as $oComponent) {
+
+ foreach (Components::available() as $oComponent) {
$sPath = $oComponent->path;
$sNamespace = $oComponent->namespace;
|
fix: Components::available() includes the application
|
diff --git a/models/classes/search/index/DocumentBuilder/IndexDocumentBuilder.php b/models/classes/search/index/DocumentBuilder/IndexDocumentBuilder.php
index <HASH>..<HASH> 100644
--- a/models/classes/search/index/DocumentBuilder/IndexDocumentBuilder.php
+++ b/models/classes/search/index/DocumentBuilder/IndexDocumentBuilder.php
@@ -250,17 +250,6 @@ class IndexDocumentBuilder extends InjectionAwareService implements IndexDocumen
}
$fieldName = $propertyTypeId . '_' . \tao_helpers_Slug::create($customPropertyLabel);
- $propertyValue = $resource->getOnePropertyValue($property);
-
- if (null === $propertyValue) {
- continue;
- }
-
- if ($propertyValue instanceof Literal) {
- $customProperties[$fieldName][] = (string)$propertyValue;
- $customProperties[$fieldName] = array_unique($customProperties[$fieldName]);
- continue;
- }
$customPropertiesValues = $resource->getPropertyValues($property);
$customProperties[$fieldName] = array_map(
|
fix: collections of Literals should be searchable
|
diff --git a/shinken/modules/livestatus_broker/livestatus.py b/shinken/modules/livestatus_broker/livestatus.py
index <HASH>..<HASH> 100644
--- a/shinken/modules/livestatus_broker/livestatus.py
+++ b/shinken/modules/livestatus_broker/livestatus.py
@@ -5802,7 +5802,9 @@ class LiveStatusRequest(LiveStatus):
attribute, operator = operator, attribute
reference = ''
attribute = self.strip_table_from_column(attribute)
- if operator in ['=', '!=', '>', '>=']:
+ if operator in ['=', '>', '>=', '<', '<=', '=~', '~', '~~', '!=', '!>', '!>=', '!<', '!<=']:
+ if operator in ['!>', '!>=', '!<', '!<=']:
+ operator = { '!>' : '<=', '!>=' : '<', '!<' : '>=', '!<=' : '>' }[operator]
self.filtercolumns.append(attribute)
self.stats_columns.append(attribute)
self.stats_filter_stack.put(self.make_filter(operator, attribute, reference))
|
*Add them for Stats: too
|
diff --git a/lib/Rule.js b/lib/Rule.js
index <HASH>..<HASH> 100644
--- a/lib/Rule.js
+++ b/lib/Rule.js
@@ -64,9 +64,10 @@ Rule.prototype.wrapPath = function (rule) {
if (rule.charAt(rule.length - 1) === symbol.file) {
rule = rule.slice(0, rule.length - 1);
} else {
- rule = rule.replace(/\/$/, '') + '/**/*'
+ rule = rule.replace(/\/$/, '') + '/';
}
- return this.wrapMatch('-' + rule);
+ const length = rule.length;
+ return path => path.length > length && path.indexOf(rule) === 0;
};
Rule.prototype.setNegation = function (negation) {
|
refactor(rule): update rule.wrapPath to str match.
|
diff --git a/gulpfile.js b/gulpfile.js
index <HASH>..<HASH> 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -181,6 +181,7 @@ if( a['AMIGO_API_PORT'] && a['AMIGO_API_PORT'].value ){
var otu_mrg_imp_p = _to_boolean(a['OWLTOOLS_USE_MERGE_IMPORT'].value);
var otu_rm_dis_p = _to_boolean(a['OWLTOOLS_USE_REMOVE_DISJOINTS'].value);
var all_owltools_ops_flags_list = [
+ '--log-info',
'--merge-support-ontologies',
// Make load less sensitive and more collapsed.
//(otu_mrg_imp_p ? '--merge-import http://purl.obolibrary.org/obo/go/extensions/go-plus.owl' : '' ),
|
re-add explicit INFO logging during amigo loads
|
diff --git a/test/tools/javac/InterfaceAssert.java b/test/tools/javac/InterfaceAssert.java
index <HASH>..<HASH> 100644
--- a/test/tools/javac/InterfaceAssert.java
+++ b/test/tools/javac/InterfaceAssert.java
@@ -23,9 +23,11 @@
/*
* @test
- * @bug 4399129
+ * @bug 4399129 6980724
* @summary Check that assertions compile properly when nested in an interface
* @author gafter
+ * @compile InterfaceAssert.java
+ * @run main InterfaceAssert
*/
/*
|
<I>: test/tools/javac/InterfaceAssert.java sometimes fails
(This is the same as OpenJDK changeset 3a9f<I>be<I>a.)
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ except:
from distutils.core import setup
setup(name='sprinter',
- version='0.4.0',
+ version='0.4.1',
description='a utility library to help environment bootstrapping scripts',
author='Yusuke Tsutsumi',
author_email='yusuke@yusuketsutsumi.com',
|
Revving to <I>
* feature: standalone sprinter install
* feature: sandboxed brew
* feature: sandboxed virtualenv
* bugfix: ssh uses keyname instead of host as host name
* bugfix: brew install was not working
* bugfix: issue with standard recipe being called over other recipe
* bugfix: fixing phases implementation
|
diff --git a/test/TestAsset/ExceptionWithStringAsCode.php b/test/TestAsset/ExceptionWithStringAsCode.php
index <HASH>..<HASH> 100644
--- a/test/TestAsset/ExceptionWithStringAsCode.php
+++ b/test/TestAsset/ExceptionWithStringAsCode.php
@@ -13,5 +13,6 @@ use Exception;
class ExceptionWithStringAsCode extends Exception
{
+ /** @var string */
protected $code = 'ExceptionString';
}
diff --git a/test/TestAsset/FailingExceptionWithStringAsCodeFactory.php b/test/TestAsset/FailingExceptionWithStringAsCodeFactory.php
index <HASH>..<HASH> 100644
--- a/test/TestAsset/FailingExceptionWithStringAsCodeFactory.php
+++ b/test/TestAsset/FailingExceptionWithStringAsCodeFactory.php
@@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
|
set <I> in @copyright
|
diff --git a/lib/Pico.php b/lib/Pico.php
index <HASH>..<HASH> 100644
--- a/lib/Pico.php
+++ b/lib/Pico.php
@@ -465,7 +465,7 @@ class Pico
'rewrite_url' => null,
'theme' => 'default',
'date_format' => '%D %T',
- 'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false),
+ 'twig_config' => null,
'pages_order_by' => 'alpha',
'pages_order' => 'asc',
'content_dir' => null,
@@ -486,6 +486,13 @@ class Pico
$this->config['rewrite_url'] = $this->isUrlRewritingEnabled();
}
+ $defaultTwigConfig = array('cache' => false, 'autoescape' => false, 'debug' => false);
+ if (!is_array($this->config['twig_config'])) {
+ $this->config['twig_config'] = $defaultTwigConfig;
+ } else {
+ $this->config['twig_config'] += $defaultTwigConfig;
+ }
+
if (empty($this->config['content_dir'])) {
// try to guess the content directory
if (is_dir($this->getRootDir() . 'content')) {
|
Pico::loadConfig(): Improve Twig config parsing
Thanks @refeaime for reporting this
|
diff --git a/libdokan/folderlist.go b/libdokan/folderlist.go
index <HASH>..<HASH> 100644
--- a/libdokan/folderlist.go
+++ b/libdokan/folderlist.go
@@ -150,7 +150,7 @@ func (fl *FolderList) FindFiles(fi *dokan.FileInfo, callback func(*dokan.NamedSt
var favs []*libkbfs.Favorite
if isLoggedIn {
- favs, err := fl.fs.config.KBFSOps().GetFavorites(ctx)
+ favs, err = fl.fs.config.KBFSOps().GetFavorites(ctx)
fl.fs.log.CDebugf(ctx, "FL ReadDirAll -> %v,%v", favs, err)
if err != nil {
return err
|
libdokan: fix folderlist readdir
|
diff --git a/code/GridFieldOrderableRows.php b/code/GridFieldOrderableRows.php
index <HASH>..<HASH> 100755
--- a/code/GridFieldOrderableRows.php
+++ b/code/GridFieldOrderableRows.php
@@ -238,7 +238,25 @@ class GridFieldOrderableRows extends RequestHandler implements
$this->populateSortValues($items);
// Generate the current sort values.
- $current = $items->map('ID', $field)->toArray();
+ if ($items instanceof ManyManyList)
+ {
+ $current = array();
+ foreach ($items->toArray() as $record)
+ {
+ // NOTE: _SortColumn0 is the first ->sort() field
+ // used by SS when functions are detected in a SELECT
+ // or CASE WHEN.
+ if (isset($record->_SortColumn0)) {
+ $current[$record->ID] = $record->_SortColumn0;
+ } else {
+ $current[$record->ID] = $record->$field;
+ }
+ }
+ }
+ else
+ {
+ $current = $items->map('ID', $field)->toArray();
+ }
// Perform the actual re-ordering.
$this->reorderItems($list, $current, $ids);
|
Fix bug where the current sort value is pulled from the base table if the sortField has the same name when using ManyManyList
|
diff --git a/inquirer/themes.py b/inquirer/themes.py
index <HASH>..<HASH> 100644
--- a/inquirer/themes.py
+++ b/inquirer/themes.py
@@ -25,7 +25,7 @@ def load_theme_from_json(json_theme):
}
}
- Color values should be strings representing valid blessings.Terminal colors.
+ Color values should be string representing valid blessings.Terminal colors.
"""
return load_theme_from_dict(json.loads(json_theme))
@@ -46,7 +46,7 @@ def load_theme_from_dict(dict_theme):
}
}
- Color values should be strings representing valid blessings.Terminal colors.
+ Color values should be string representing valid blessings.Terminal colors.
"""
t = Default()
for question_type, settings in dict_theme.items():
|
lines too long. damn <I> chars lines
|
diff --git a/src/FlashNotifier.php b/src/FlashNotifier.php
index <HASH>..<HASH> 100644
--- a/src/FlashNotifier.php
+++ b/src/FlashNotifier.php
@@ -79,4 +79,20 @@ class FlashNotifier
$this->session->flash('flash_notifications', $notifications);
}
}
+
+ /**
+ * Extend the aged flash data one `\Request` further
+ * Equivalent to Laravel's `\Session::reflash()` but scoped to only `\Flash` data
+ */
+ public function renew()
+ {
+ if($this->session->has('flash_notifications')) {
+ $notifications = [];
+ foreach ($this->session->get('flash_notifications') as $notification) {
+ $notifications[$notification['level']] = $notification['message'];
+ };
+
+ $this->manyMessages($notifications);
+ }
+ }
}
|
Add support for extending the flash messages for an extra request via `\Flash::renew()`
|
diff --git a/lib/clickhouse/connection/client.rb b/lib/clickhouse/connection/client.rb
index <HASH>..<HASH> 100644
--- a/lib/clickhouse/connection/client.rb
+++ b/lib/clickhouse/connection/client.rb
@@ -1,12 +1,22 @@
+require "forwardable"
+
module Clickhouse
class Connection
module Client
+ def self.included(base)
+ base.extend Forwardable
+ base.def_delegators :@client, :get
+ base.def_delegators :@client, :post
+ end
+
def connect!
return if connected?
+
response = client.get "/"
raise ConnectionError, "Unexpected response status: #{response.status}" unless response.status == 200
true
+
rescue Faraday::ConnectionFailed => e
raise ConnectionError, e.message
end
diff --git a/test/unit/connection/test_client.rb b/test/unit/connection/test_client.rb
index <HASH>..<HASH> 100644
--- a/test/unit/connection/test_client.rb
+++ b/test/unit/connection/test_client.rb
@@ -56,6 +56,22 @@ module Unit
assert_equal false, @connection.connected?
end
end
+
+ describe "#get" do
+ it "gets delegated to the client" do
+ @connection.instance_variable_set :@client, (client = mock)
+ client.expects(:get).with(:foo)
+ @connection.get(:foo)
+ end
+ end
+
+ describe "#post" do
+ it "gets delegated to the client" do
+ @connection.instance_variable_set :@client, (client = mock)
+ client.expects(:post).with(:foo)
+ @connection.post(:foo)
+ end
+ end
end
end
|
Delegating #get and #post to the (Faraday) client
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -235,7 +235,8 @@ class JavaLib(object):
self.java_files = []
self.dependencies = []
self.properties = []
- if hadoop_vinfo.main >= (2, 0, 0) and hadoop_vinfo.is_yarn():
+ if hadoop_vinfo.main >= (2, 0, 0) and \
+ (not hadoop_vinfo.is_cloudera() or hadoop_vinfo.is_yarn()):
# This version of Hadoop has the v2 pipes API
# FIXME: kinda hardwired to avro for now
self.properties.append((os.path.join(
|
Also build with v2 API when using Hadoop2 without Yarn
|
diff --git a/demos/bartlett1932/__init__.py b/demos/bartlett1932/__init__.py
index <HASH>..<HASH> 100644
--- a/demos/bartlett1932/__init__.py
+++ b/demos/bartlett1932/__init__.py
@@ -0,0 +1,7 @@
+from dallinger import db
+from experiment import Bartlett1932
+
+
+def build():
+ """Potentially move PsiturkConfig stuff in here"""
+ return Bartlett1932(db.init_db())
|
Placeholder for wrapper/factory function to return an experiment
|
diff --git a/lib/client.js b/lib/client.js
index <HASH>..<HASH> 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -349,12 +349,12 @@ function _uploadDeviceKeys(client) {
device_id: deviceId,
keys: client._deviceKeys,
user_id: userId,
- signatures: {},
};
+ var sig = client._olmDevice.sign(anotherjson.stringify(deviceKeys));
+ deviceKeys.signatures = {};
deviceKeys.signatures[userId] = {};
- deviceKeys.signatures[userId]["ed25519:" + deviceId] =
- client._olmDevice.sign(anotherjson.stringify(deviceKeys));
+ deviceKeys.signatures[userId]["ed25519:" + deviceId] = sig;
return client.uploadKeysRequest({
device_keys: deviceKeys,
|
Fix device key signing
Calculate the signature *before* we add the `signatures` key.
|
diff --git a/report/log/index.php b/report/log/index.php
index <HASH>..<HASH> 100644
--- a/report/log/index.php
+++ b/report/log/index.php
@@ -90,7 +90,9 @@ if ($logreader !== '') {
if (($edulevel != -1)) {
$params['edulevel'] = $edulevel;
}
-
+if ($origin !== '') {
+ $params['origin'] = $origin;
+}
// Legacy store hack, as edulevel is not supported.
if ($logreader == 'logstore_legacy') {
$params['edulevel'] = -1;
|
MDL-<I> reports: origin parameter looked at in log reports
|
diff --git a/girc/capabilities.py b/girc/capabilities.py
index <HASH>..<HASH> 100644
--- a/girc/capabilities.py
+++ b/girc/capabilities.py
@@ -24,6 +24,8 @@ class Capabilities:
if '=' in cap:
cap, value = cap.rsplit('=', 1)
+ if value = '':
+ value = None
else:
value = True
|
[caps] Mark CAPA= as None instead of True
|
diff --git a/src/ai/backend/common/types.py b/src/ai/backend/common/types.py
index <HASH>..<HASH> 100644
--- a/src/ai/backend/common/types.py
+++ b/src/ai/backend/common/types.py
@@ -550,7 +550,7 @@ class ResourceSlot(UserDict):
def as_numeric(self, slot_types, *,
unknown: HandlerForUnknownSlotType = 'error',
- fill_missing: bool = True):
+ fill_missing: bool = False):
data = {}
unknown_handler = HandlerForUnknownSlotType(unknown)
for k, v in self.data.items():
@@ -608,7 +608,7 @@ class ResourceSlot(UserDict):
def as_json_numeric(self, slot_types, *,
unknown: HandlerForUnknownSlotType = 'error',
- fill_missing: bool = True):
+ fill_missing: bool = False):
data = {}
unknown_handler = HandlerForUnknownSlotType(unknown)
for k, v in self.data.items():
|
ResourceSlot: as_numeric's fill_missing should default to False
...not to break the existing master branch of the manager
|
diff --git a/src/main/java/net/spy/memcached/MemcachedConnection.java b/src/main/java/net/spy/memcached/MemcachedConnection.java
index <HASH>..<HASH> 100644
--- a/src/main/java/net/spy/memcached/MemcachedConnection.java
+++ b/src/main/java/net/spy/memcached/MemcachedConnection.java
@@ -293,6 +293,10 @@ public final class MemcachedConnection extends SpyObject {
ByteBuffer rbuf=qa.getRbuf();
final SocketChannel channel = qa.getChannel();
int read=channel.read(rbuf);
+ if (read < 0) {
+ // GRUMBLE.
+ throw new IOException("Disconnected");
+ }
while(read > 0) {
getLogger().debug("Read %d bytes", read);
rbuf.flip();
|
if the memcache server disconnects, try to notice.
|
diff --git a/playerRecord.py b/playerRecord.py
index <HASH>..<HASH> 100644
--- a/playerRecord.py
+++ b/playerRecord.py
@@ -34,7 +34,7 @@ class PlayerRecord(object):
self.type = c.PlayerDesigns(c.HUMAN)
self.difficulty = c.ComputerDifficulties(None) # only matters if type is a computer
self.initCmd = "" # only used if self.type is an AI or bot
- self.rating = 500
+ self.rating = c.DEFAULT_RATING
self.created = time.time() # origination timestamp
self._matches = [] # match history
# initialize with new values
@@ -122,6 +122,12 @@ class PlayerRecord(object):
raise ValueError("Encountered invalid attributes. ALLOWED: %s%s%s"\
%(list(self.__dict__), os.linesep, badAttrsMsg))
############################################################################
+ def control(self):
+ """the type of control this player exhibits"""
+ if self.isComputer: value = c.COMPUTER
+ else: value = c.PARTICIPANT
+ return c.PlayerControls(value)
+ ############################################################################
def load(self, playerName=None):
"""retrieve the PlayerRecord settings from saved disk file"""
if playerName: # switch the PlayerRecord this object describes
|
- use DEFAULT_RATING
- migrated control() method from PlayerPreGame
|
diff --git a/core/src/test/java/jlibs/core/i18n/ResourceBundleTest.java b/core/src/test/java/jlibs/core/i18n/ResourceBundleTest.java
index <HASH>..<HASH> 100644
--- a/core/src/test/java/jlibs/core/i18n/ResourceBundleTest.java
+++ b/core/src/test/java/jlibs/core/i18n/ResourceBundleTest.java
@@ -58,6 +58,7 @@ public class ResourceBundleTest{
Assert.assertNull(errors, "compilation failed with errors:\n"+errors);
else{
errors = errors.replace('\\', '/');
+ errors = errors.replace("\r\n", "\n");
for(String error: searchFor){
if(errors.indexOf(error)==-1)
Assert.fail("[Expected Error] "+error+"\n[Actual Error] "+errors);
|
tests were failing on windows because of pathseparator
|
diff --git a/src/EventSourcing/DBAL/AggregateAwareDBALEventStore.php b/src/EventSourcing/DBAL/AggregateAwareDBALEventStore.php
index <HASH>..<HASH> 100644
--- a/src/EventSourcing/DBAL/AggregateAwareDBALEventStore.php
+++ b/src/EventSourcing/DBAL/AggregateAwareDBALEventStore.php
@@ -275,4 +275,4 @@ class AggregateAwareDBALEventStore implements EventStoreInterface
return $id;
}
-}
\ No newline at end of file
+}
|
III-<I> Fixed coding standards.
|
diff --git a/pyrtl/passes.py b/pyrtl/passes.py
index <HASH>..<HASH> 100644
--- a/pyrtl/passes.py
+++ b/pyrtl/passes.py
@@ -85,9 +85,14 @@ def optimize(update_working_block=True, block=None):
def constant_propagation(block):
- """Removes excess constants in the block"""
-
+ """
+ Removes excess constants in the block
+ Note on resulting block:
+ The output of the block can have wirevectors that are driven but not
+ listened to. This is to be expected. These are to be removed by the
+ remove_unlistened_nets function
+ """
current_nets = 0
while len(block.logic) != current_nets:
|
Added more constant propogation documentation
|
diff --git a/colorise/parser.py b/colorise/parser.py
index <HASH>..<HASH> 100644
--- a/colorise/parser.py
+++ b/colorise/parser.py
@@ -181,7 +181,7 @@ class ColorFormatParser(object):
r = [None, None]
for token in tokens:
- for i, e in enumerate(('fg=', 'bg=')):
+ for i, e in enumerate(['fg=', 'bg=']):
if token.startswith(e):
if r[i] is not None:
raise ColorSyntaxError("Multiple color definitions of"
|
Use a list for better readability
|
diff --git a/core/src/main/java/org/mwg/core/scheduler/HybridScheduler.java b/core/src/main/java/org/mwg/core/scheduler/HybridScheduler.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/mwg/core/scheduler/HybridScheduler.java
+++ b/core/src/main/java/org/mwg/core/scheduler/HybridScheduler.java
@@ -76,7 +76,12 @@ public class HybridScheduler implements Scheduler {
@Override
public void run() {
while (running) {
- final Job globalPolled = globalQueue.poll();
+ Job globalPolled = null;
+ try {
+ globalPolled = globalQueue.take();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
if (globalPolled != null) {
try {
globalPolled.run();
|
Fixing performance issue due to active check.
|
diff --git a/src/Form/Builder.php b/src/Form/Builder.php
index <HASH>..<HASH> 100644
--- a/src/Form/Builder.php
+++ b/src/Form/Builder.php
@@ -163,7 +163,7 @@ class Builder
$html[] = "$name=\"$value\"";
}
- return '<form '.implode(' ', $html).'>';
+ return '<form '.implode(' ', $html).' pjax-container>';
}
/**
diff --git a/views/index.blade.php b/views/index.blade.php
index <HASH>..<HASH> 100644
--- a/views/index.blade.php
+++ b/views/index.blade.php
@@ -93,6 +93,10 @@
container: '#pjax-container'
});
+ $(document).on('submit', 'form[pjax-container]', function(event) {
+ $.pjax.submit(event, '#pjax-container')
+ })
+
$(document).on("pjax:popstate", function() {
$(document).one("pjax:end", function(event) {
|
use pjax when submit forms
|
diff --git a/tests/types/array.test.js b/tests/types/array.test.js
index <HASH>..<HASH> 100644
--- a/tests/types/array.test.js
+++ b/tests/types/array.test.js
@@ -4,6 +4,7 @@ import expect from 'expect';
import ArrayType from '../../src/types/array';
import { create } from '../../src/microstates';
import { valueOf } from '../../src/meta';
+import { Store } from '../../index';
describe("ArrayType", function() {
@@ -477,4 +478,15 @@ describe("ArrayType", function() {
expect(array.remove(null)).toBe(array);
});
});
+
+ describe('within a Store', ()=> {
+ it('return undefined at the end of an iteration', ()=> {
+ let array = Store(create([Number], [1,2]));
+ let iterator = array[Symbol.iterator]();
+ iterator.next();
+ iterator.next();
+ expect(iterator.next().value).toBe(undefined);
+ });
+ });
+
});
|
Cover the case of an iterable inside a store.
|
diff --git a/tests/implemented.py b/tests/implemented.py
index <HASH>..<HASH> 100755
--- a/tests/implemented.py
+++ b/tests/implemented.py
@@ -41,6 +41,7 @@ DUMMY_CARDS = (
# Dynamic buffs set by their parent
"CS2_236e", # Divine Spirit
"EX1_304e", # Consume (Void Terror)
+ "LOE_030e" # Hollow (Unused)
"NEW1_018e", # Treasure Crazed (Bloodsail Raider)
)
|
Mark Hollow enchant as a dynamic buff
|
diff --git a/ospd/ospd.py b/ospd/ospd.py
index <HASH>..<HASH> 100644
--- a/ospd/ospd.py
+++ b/ospd/ospd.py
@@ -199,7 +199,8 @@ class OSPDaemon(object):
specific options eg. the w3af profile for w3af wrapper.
"""
- def __init__(self, certfile, keyfile, cafile, customvtfilter=None):
+ def __init__(self, certfile, keyfile, cafile,
+ customvtfilter=None, wrapper_logger=None):
""" Initializes the daemon's internal data. """
# @todo: Actually it makes sense to move the certificate params to
# a separate function because it is not mandatory anymore to
@@ -234,6 +235,9 @@ class OSPDaemon(object):
self.vts_filter = customvtfilter
else:
self.vts_filter = VtsFilter()
+ if wrapper_logger:
+ global logger
+ logger = wrapper_logger
def set_command_attributes(self, name, attributes):
""" Sets the xml attributes of a specified command. """
|
Allows to set the logging domain from the wrapper.
This allows to run different ospd-wrappers and to log in the same file, and distinguish which wrapper is coming from. If no logger is set from the wrapper, the default one "ospd.ospd" domain will be used.
|
diff --git a/client.go b/client.go
index <HASH>..<HASH> 100644
--- a/client.go
+++ b/client.go
@@ -12,7 +12,7 @@ import (
)
const (
- libraryVersion = "0.1.0"
+ libraryVersion = "0.4.0"
)
type Response http.Response
|
Update version to <I> in preparation for refactor
|
diff --git a/go/kbfs/libkbfs/folder_branch_ops.go b/go/kbfs/libkbfs/folder_branch_ops.go
index <HASH>..<HASH> 100644
--- a/go/kbfs/libkbfs/folder_branch_ops.go
+++ b/go/kbfs/libkbfs/folder_branch_ops.go
@@ -8502,8 +8502,8 @@ func (fbo *folderBranchOps) Reset(
return err
}
oldHandle.SetFinalizedInfo(finalizedInfo)
- // This can't be subject to the WaitGroup due to a potential deadlock,
- // so we use a raw goroutine here instead of `goTracked`.
+ // FIXME: This can't be subject to the WaitGroup due to a potential
+ // deadlock, so we use a raw goroutine here instead of `goTracked`.
go fbo.observers.tlfHandleChange(ctx, oldHandle)
return nil
}
|
folder_branch_ops: clarify comment
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -151,6 +151,19 @@ module.exports = function(grunt) {
fs.renameSync(oldFileName + fileExtension, newFileName + fileExtension);
});
+ grunt.registerTask("delete_coverage_dir", function() {
+ var done = this.async();
+ var rimraf = require("rimraf");
+ rimraf("coverage", function(err) {
+ if(err) {
+ console.log("Error while deleting coverage directory from the package.");
+ done(false);
+ }
+
+ done();
+ });
+ });
+
grunt.registerTask("test", ["ts:devall", "shell:ci_unit_tests"]);
grunt.registerTask("pack", [
"ts:release_build",
@@ -161,6 +174,7 @@ module.exports = function(grunt) {
"shell:ci_unit_tests",
"set_package_version",
+ "delete_coverage_dir",
"shell:build_package",
"setPackageName"
]);
|
Delete coverage dir from build package - really
Delete coverage dir from build package - this time really. Our package is buid with grunt pack command - add new async grunt task in order to delete the coverage directory.
<URL>
|
diff --git a/src/pfs/server/combined_api_server.go b/src/pfs/server/combined_api_server.go
index <HASH>..<HASH> 100644
--- a/src/pfs/server/combined_api_server.go
+++ b/src/pfs/server/combined_api_server.go
@@ -115,7 +115,9 @@ func (a *combinedAPIServer) GetFileInfo(ctx context.Context, getFileInfoRequest
if !ok {
return &pfs.GetFileInfoResponse{}, nil
}
- return &pfs.GetFileInfoResponse{fileInfo}, nil
+ return &pfs.GetFileInfoResponse{
+ FileInfo: fileInfo,
+ }, nil
}
func (a *combinedAPIServer) MakeDirectory(ctx context.Context, makeDirectoryRequest *pfs.MakeDirectoryRequest) (*google_protobuf.Empty, error) {
|
fix go vet for pfs
|
diff --git a/raft/log.go b/raft/log.go
index <HASH>..<HASH> 100644
--- a/raft/log.go
+++ b/raft/log.go
@@ -44,6 +44,8 @@ type raftLog struct {
applied uint64
}
+// newLog returns log using the given storage. It recovers the log to the state
+// that it just commits and applies the lastest snapshot.
func newLog(storage Storage) *raftLog {
if storage == nil {
log.Panic("storage must not be nil")
@@ -68,7 +70,7 @@ func newLog(storage Storage) *raftLog {
}
func (l *raftLog) String() string {
- return fmt.Sprintf("unstable=%d committed=%d applied=%d", l.unstable, l.committed, l.applied)
+ return fmt.Sprintf("unstable=%d committed=%d applied=%d len(unstableEntries)=%d", l.unstable, l.committed, l.applied, len(l.unstableEnts))
}
// maybeAppend returns (0, false) if the entries cannot be appended. Otherwise,
|
raft: add comment to newLog
|
diff --git a/lib/codecs.js b/lib/codecs.js
index <HASH>..<HASH> 100644
--- a/lib/codecs.js
+++ b/lib/codecs.js
@@ -3,7 +3,13 @@
* Current id.
*/
-var id = 0;
+var id = 1;
+
+/**
+ * Max codecs.
+ */
+
+var max = 9;
/**
* Name map.
@@ -23,6 +29,7 @@ exports.define = function(name, fns){
if ('string' != typeof name) throw new Error('codec name required');
if ('function' != typeof fns.encode) throw new Error('codec .encode required');
if ('function' != typeof fns.decode) throw new Error('codec .decode required');
+ if (id === max) throw new Error('too many codecs');
exports[name] = {
encode: fns.encode,
|
Sets a maximum number of codecs defined and changes the intial codec.id too 1 rather than 0.
|
diff --git a/actionview/lib/action_view/helpers/form_tag_helper.rb b/actionview/lib/action_view/helpers/form_tag_helper.rb
index <HASH>..<HASH> 100644
--- a/actionview/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/form_tag_helper.rb
@@ -469,13 +469,17 @@ module ActionView
# # => <button data-disable-with="Please wait..." name="button" type="submit">Checkout</button>
#
def button_tag(content_or_options = nil, options = nil, &block)
+ options ||= {}
+ default_options = { 'name' => 'button', 'type' => 'submit' }
if content_or_options.is_a?(Hash)
options = content_or_options
content_or_options = nil
end
- options = button_tag_options_with_defaults(options)
+ options = options.stringify_keys
+ options.reverse_merge default_options
+
content_tag :button, content_or_options || 'Button', options, &block
end
@@ -742,14 +746,6 @@ module ActionView
def sanitize_to_id(name)
name.to_s.delete(']').gsub(/[^-a-zA-Z0-9:.]/, "_")
end
-
- def button_tag_options_with_defaults(options)
- options = options || {}
- options = options.stringify_keys
-
- default_options = { 'name' => 'button', 'type' => 'submit' }
- options.reverse_merge default_options
- end
end
end
end
|
cleanup and move extracted method right into the helper
|
diff --git a/src/AbstractNormalizedEventManager.php b/src/AbstractNormalizedEventManager.php
index <HASH>..<HASH> 100644
--- a/src/AbstractNormalizedEventManager.php
+++ b/src/AbstractNormalizedEventManager.php
@@ -152,8 +152,26 @@ abstract class AbstractNormalizedEventManager extends AbstractWpEventManager
*/
protected function _registerCacheClearHandler(EventInterface $event)
{
- $me = $this;
$priority = static::CACHE_CLEAR_HANDLER_PRIORITY;
+ $callback = $this->_createCacheClearHandler($event);
+
+ $this->_addHook($event->getName(), $callback, $priority);
+
+ return $this;
+ }
+
+ /**
+ * Creates a cache clear handler.
+ *
+ * @since [*next-version*]
+ *
+ * @param EventInterface $event The event instance to be cleared from cache by the handler.
+ *
+ * @return \callable The created handler.
+ */
+ protected function _createCacheClearHandler(EventInterface $event)
+ {
+ $me = $this;
$callback = function($value) use ($me, $event, &$callback, $priority) {
$me->_zRemoveCachedEvent($event->getName());
@@ -162,9 +180,7 @@ abstract class AbstractNormalizedEventManager extends AbstractWpEventManager
return $value;
};
- $me->_addHook($event->getName(), $callback, $priority);
-
- return $this;
+ return $callback;
}
/**
|
Separated clear cache handler creation and registration (#6)
|
diff --git a/library/src/main/java/de/mrapp/android/dialog/view/DialogRootView.java b/library/src/main/java/de/mrapp/android/dialog/view/DialogRootView.java
index <HASH>..<HASH> 100644
--- a/library/src/main/java/de/mrapp/android/dialog/view/DialogRootView.java
+++ b/library/src/main/java/de/mrapp/android/dialog/view/DialogRootView.java
@@ -250,7 +250,8 @@ public class DialogRootView extends LinearLayout implements AreaListener {
* The view may not be null
*/
private boolean applyDialogPaddingTop(@NonNull final Area area, @NonNull final View view) {
- if (area != Area.HEADER && area != Area.BUTTON_BAR) {
+ if (area != Area.HEADER && area != Area.BUTTON_BAR &&
+ view.getVisibility() == View.VISIBLE) {
view.setPadding(view.getPaddingLeft(), dialogPadding[1], view.getPaddingRight(),
view.getPaddingBottom());
return true;
|
A dialog's top padding is now correctly applied when no title is shown.
|
diff --git a/src/config/hisite.php b/src/config/hisite.php
index <HASH>..<HASH> 100644
--- a/src/config/hisite.php
+++ b/src/config/hisite.php
@@ -159,9 +159,6 @@ $config = [
'assets' => [
\hipanel\assets\AppAsset::class,
],
- 'pathDirs' => [
- 'hisite' => '@hipanel',
- ],
],
'menuManager' => [
'class' => \hiqdev\menumanager\MenuManager::class,
|
removed expired pathDirs config
|
diff --git a/ledis/dump.go b/ledis/dump.go
index <HASH>..<HASH> 100644
--- a/ledis/dump.go
+++ b/ledis/dump.go
@@ -46,21 +46,22 @@ func (l *Ledis) Dump(w io.Writer) error {
var commitID uint64
var snap *store.Snapshot
- {
- l.wLock.Lock()
- defer l.wLock.Unlock()
-
- if l.r != nil {
- if commitID, err = l.r.LastCommitID(); err != nil {
- return err
- }
- }
+ l.wLock.Lock()
- if snap, err = l.ldb.NewSnapshot(); err != nil {
+ if l.r != nil {
+ if commitID, err = l.r.LastCommitID(); err != nil {
+ l.wLock.Unlock()
return err
}
}
+ if snap, err = l.ldb.NewSnapshot(); err != nil {
+ l.wLock.Unlock()
+ return err
+ }
+
+ l.wLock.Unlock()
+
wb := bufio.NewWriterSize(w, 4096)
h := &DumpHead{commitID}
|
closure defer not works as I think
|
diff --git a/core-bundle/contao/library/Contao/File.php b/core-bundle/contao/library/Contao/File.php
index <HASH>..<HASH> 100644
--- a/core-bundle/contao/library/Contao/File.php
+++ b/core-bundle/contao/library/Contao/File.php
@@ -832,6 +832,7 @@ class File extends \System
'qt' => array('video/quicktime', 'iconVIDEO.gif'),
'rv' => array('video/vnd.rn-realvideo', 'iconVIDEO.gif'),
'avi' => array('video/x-msvideo', 'iconVIDEO.gif'),
+ 'ogv' => array('video/ogg', 'iconVIDEO.gif'),
'movie' => array('video/x-sgi-movie', 'iconVIDEO.gif')
);
|
[Core] Add `ogv` to the mime types of the `Files` class (see #<I>)
|
diff --git a/bosh-director/lib/bosh/director/api/controller.rb b/bosh-director/lib/bosh/director/api/controller.rb
index <HASH>..<HASH> 100644
--- a/bosh-director/lib/bosh/director/api/controller.rb
+++ b/bosh-director/lib/bosh/director/api/controller.rb
@@ -585,12 +585,7 @@ module Bosh::Director
end
end
- # JMS and MB: We don't know why this code exists. According to JP it shouldn't. We want to remove it.
- # To get comforable with that idea, we log something we can look for in production.
- #
- # GET /resources/deadbeef
get '/resources/:id' do
- @logger.warn('Something is proxying a blob through the director. Find out why before we remove this method. ZAUGYZ')
tmp_file = @resource_manager.get_resource_path(params[:id])
send_disposable_file(tmp_file, :type => 'application/x-gzip')
end
|
removed stale comment - used for fetch_logs
|
diff --git a/src/Sluggable/SluggableTrait.php b/src/Sluggable/SluggableTrait.php
index <HASH>..<HASH> 100644
--- a/src/Sluggable/SluggableTrait.php
+++ b/src/Sluggable/SluggableTrait.php
@@ -70,6 +70,12 @@ trait SluggableTrait
$id = $model->findRecordIdForSlugFromCmsTable($slug, $locale);
+ // if it is translated, return by entry ID instead
+ if ($model->isTranslationModel()) {
+
+ return $model->where(config('pxlcms.translatable.translation_foreign_key'), $id)->first();
+ }
+
return $model->find($id);
}
|
fixed incorrect return for findBySlug on translations
|
diff --git a/lib/brcobranca/currency.rb b/lib/brcobranca/currency.rb
index <HASH>..<HASH> 100755
--- a/lib/brcobranca/currency.rb
+++ b/lib/brcobranca/currency.rb
@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
# @author Fernando Vieira do http://simplesideias.com.br
module Brcobranca #:nodoc:[all]
module Currency #:nodoc:[all]
@@ -63,4 +65,4 @@ end
[ String ].each do |klass|
klass.class_eval { include Brcobranca::Currency::String }
-end
\ No newline at end of file
+end
diff --git a/lib/brcobranca/retorno/base.rb b/lib/brcobranca/retorno/base.rb
index <HASH>..<HASH> 100755
--- a/lib/brcobranca/retorno/base.rb
+++ b/lib/brcobranca/retorno/base.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
module Brcobranca
module Retorno
class Base # Classe base para retornos bancários
|
fix to run on <I>
|
diff --git a/src/main/java/org/wololo/geojson/Feature.java b/src/main/java/org/wololo/geojson/Feature.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/wololo/geojson/Feature.java
+++ b/src/main/java/org/wololo/geojson/Feature.java
@@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonInclude.Include;
-@JsonPropertyOrder({"type", "id", "geometry", "property"})
+@JsonPropertyOrder({"type", "id", "geometry", "properties"})
public class Feature extends GeoJSON {
@JsonInclude(Include.NON_EMPTY)
private final Object id;
|
Fixed a typo in the JsonPropertyOrder of class Feature
|
diff --git a/src/scs_core/aqcsv/connector/datum_mapping.py b/src/scs_core/aqcsv/connector/datum_mapping.py
index <HASH>..<HASH> 100644
--- a/src/scs_core/aqcsv/connector/datum_mapping.py
+++ b/src/scs_core/aqcsv/connector/datum_mapping.py
@@ -108,7 +108,7 @@ class DatumMapping(JSONable):
# position...
gps = self.gps(datum)
- if gps is not None:
+ if gps is not None and gps.elv is not None:
lat = gps.pos.lat
lon = gps.pos.lng
gis_datum = AQCSVRecord.GIS_DATUM
|
Fixed a GPS handling bug in DatumMapping.
|
diff --git a/server/workers/swf_meta.py b/server/workers/swf_meta.py
index <HASH>..<HASH> 100644
--- a/server/workers/swf_meta.py
+++ b/server/workers/swf_meta.py
@@ -57,8 +57,15 @@ def test():
import zerorpc
c = zerorpc.Client()
c.connect("tcp://127.0.0.1:4242")
+
+ # Generate the input data for this worker
md5 = c.store_sample('unknown.swf', open('../../data/swf/unknown.swf', 'rb').read(), 'pe')
- output = c.work_request('swf_meta', md5)
+ input_data = c.get_sample(md5)
+ input_data.update(c.work_request('meta', md5))
+
+ # Execute the worker
+ worker = SWFMeta()
+ output = worker.execute(input_data)
print 'SWFMeta: '
import pprint
pprint.pprint(output)
|
small reorg of test so that debugger/coverage work locally
Former-commit-id: d<I>ab7c<I>bdd<I>f0c9d6c9e<I>d<I>a
|
diff --git a/ccmlib/node.py b/ccmlib/node.py
index <HASH>..<HASH> 100644
--- a/ccmlib/node.py
+++ b/ccmlib/node.py
@@ -1100,4 +1100,4 @@ class Node():
sh_file = os.path.join(common.CASSANDRA_CONF_DIR, common.CASSANDRA_WIN_ENV)
dst = os.path.join(self.get_path(), sh_file)
common.replace_in_file(dst, "JMX_PORT=", " $JMX_PORT=\"" + self.jmx_port + "\"")
- common.replace_in_file(dst,'CASSANDRA_PARAMS=',' $env:CASSANDRA_PARAMS="-Dcassandra -Dlogback.configurationFile=logback.xml -Dcassandra.config=file:/$env:CASSANDRA_CONF/cassandra.yaml"')
+ common.replace_in_file(dst,'CASSANDRA_PARAMS=',' $env:CASSANDRA_PARAMS="-Dcassandra -Dlogback.configurationFile=/$env:CASSANDRA_CONF/logback.xml -Dcassandra.config=file:/$env:CASSANDRA_CONF/cassandra.yaml"')
|
Switched to full pathing for logback.xml
|
diff --git a/build.js b/build.js
index <HASH>..<HASH> 100644
--- a/build.js
+++ b/build.js
@@ -5,7 +5,8 @@
*/
-/*jslint anon:true, sloppy:true, nomen:true, regexp:true, stupid:true*/
+/*jslint anon:true, sloppy:true, nomen:true, regexp:true, stupid:true,
+ continue: true*/
var libpath = require('path'),
diff --git a/start.js b/start.js
index <HASH>..<HASH> 100644
--- a/start.js
+++ b/start.js
@@ -74,7 +74,7 @@ exports.run = function(params, opts, callback) {
pack = {};
}
- options.port = params[0] || appConfig.appPort || 8666;
+ options.port = params[0] || appConfig.appPort || process.env.PORT || 8666;
if (inputOptions.context) {
options.context = utils.contextCsvToObject(inputOptions.context);
}
|
Delinted changed js files.
|
diff --git a/minorminer/package_info.py b/minorminer/package_info.py
index <HASH>..<HASH> 100644
--- a/minorminer/package_info.py
+++ b/minorminer/package_info.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-__version__ = "0.2.0"
+__version__ = "0.2.1"
__author__ = "Kelly Boothby"
__authoremail__ = "boothby@dwavesys.com"
__description__ = "heuristic algorithm to find graph minor embeddings"
|
Update version <I> -> <I>
Fixed issue with false K_4 embeddings.
|
diff --git a/kie-api/src/main/java/org/kie/api/runtime/manager/audit/NodeInstanceLog.java b/kie-api/src/main/java/org/kie/api/runtime/manager/audit/NodeInstanceLog.java
index <HASH>..<HASH> 100644
--- a/kie-api/src/main/java/org/kie/api/runtime/manager/audit/NodeInstanceLog.java
+++ b/kie-api/src/main/java/org/kie/api/runtime/manager/audit/NodeInstanceLog.java
@@ -37,6 +37,11 @@ public interface NodeInstanceLog {
public static final int TYPE_EXIT = 1;
/**
+ * Inidcates that the node instace was left because an abort operation (it is not active anymore)
+ */
+ public static final int TYPE_ABORTED = 2;
+
+ /**
* @return process instance identifier
*/
Long getProcessInstanceId();
|
[RHPAM-<I>] AchievedAtDate for milestone is not preserved when case is reopen
added a new event log for node instance to be able to tell the different when
a node is left or aborted
|
diff --git a/src/scripts/utils/scitran.js b/src/scripts/utils/scitran.js
index <HASH>..<HASH> 100644
--- a/src/scripts/utils/scitran.js
+++ b/src/scripts/utils/scitran.js
@@ -314,7 +314,7 @@ export default {
createSnapshot (projectId, callback) {
request.post(config.scitran.url + 'snapshots', {
- body: {project: projectId}
+ query: {project: projectId}
}, callback);
},
|
updated snapshot creation to pass projectId as query param instead of body property
|
diff --git a/src/radical/ensemblemd/__init__.py b/src/radical/ensemblemd/__init__.py
index <HASH>..<HASH> 100644
--- a/src/radical/ensemblemd/__init__.py
+++ b/src/radical/ensemblemd/__init__.py
@@ -16,6 +16,7 @@ from radical.ensemblemd.file import File
from radical.ensemblemd.kernel import Kernel
# Execution Patterns
+from radical.ensemblemd.patterns.all_pairs_pattern import AllPairsPattern
from radical.ensemblemd.patterns.pipeline import Pipeline
from radical.ensemblemd.patterns.replica_exchange import ReplicaExchange
from radical.ensemblemd.patterns.simulation_analysis_loop import SimulationAnalysisLoop
|
Update __init__.py
Added All Pairs Pattern in the Patterns imports
|
diff --git a/lib/js/structure.js b/lib/js/structure.js
index <HASH>..<HASH> 100644
--- a/lib/js/structure.js
+++ b/lib/js/structure.js
@@ -97,13 +97,13 @@ function process(ast, context){
}
},
'object': function(token, scope){
- token.obj = {};
- token.objSource = {};
- for (var i = 0, prop; prop = token[1][i]; i++)
- {
- token.obj[prop[0]] = scope.resolve(prop[1]) || prop[1];
- token.objSource[prop[0]] = token;
- }
+ var props = token[1];
+ var obj = {};
+
+ for (var i = 0, prop; prop = props[i]; i++)
+ obj[prop[0]] = scope.resolve(prop[1]) || prop[1];
+
+ token.obj = obj;
},
'assign': function(token, scope){
var op = token[1];
|
don't add objSource for js ast nodes
|
diff --git a/gwpy/detector/units.py b/gwpy/detector/units.py
index <HASH>..<HASH> 100644
--- a/gwpy/detector/units.py
+++ b/gwpy/detector/units.py
@@ -27,6 +27,9 @@ from astropy.units.format.generic import Generic
__author__ = "Duncan Macleod <duncan.macleod@ligo.org>"
+# container for new units (so that each one only gets created once)
+UNRECOGNIZED_UNITS = {}
+
# -- parser to handle any unit ------------------------------------------------
@@ -78,7 +81,12 @@ class GWpyFormat(Generic):
'should work, but conversions to other units '
'will not.'.format(str(exc).rstrip(' ')),
category=units.UnitsWarning)
- return units.def_unit(name, doc='Unrecognized unit')
+ try: # return previously created unit
+ return UNRECOGNIZED_UNITS[name]
+ except KeyError: # or create new one now
+ u = UNRECOGNIZED_UNITS[name] = units.def_unit(
+ name, doc='Unrecognized unit')
+ return u
return cls._parse_unit(alt)
|
detector.units: cache unrecognised units
that have been created on-the-fly. this is required so that `IrreducibleUnit('blah') == IrreducibleUnit('blah')` evaluates to `True`, which is required by `TimeSeries.is_compatible` and friends
|
diff --git a/ipfsApi/commands.py b/ipfsApi/commands.py
index <HASH>..<HASH> 100644
--- a/ipfsApi/commands.py
+++ b/ipfsApi/commands.py
@@ -2,7 +2,6 @@ from __future__ import absolute_import
import os
import fnmatch
-import functools
import mimetypes
from . import filestream
|
removed unneeded functools import
|
diff --git a/volume/volume.go b/volume/volume.go
index <HASH>..<HASH> 100644
--- a/volume/volume.go
+++ b/volume/volume.go
@@ -16,6 +16,8 @@ package volume
import (
"errors"
+ "github.com/zenoss/glog"
+
"fmt"
)
@@ -160,3 +162,20 @@ func Mount(driverName, volumeName, rootDir string) (volume Volume, err error) {
}
return volume, nil
}
+
+// ShutdownActiveDrivers shuts down all drivers that have been initialized
+func ShutdownActiveDrivers() error {
+ errs := []error{}
+ for _, driver := range driversByRoot {
+ glog.Infof("Shutting down %s driver for %s", driver.GetFSType(), driver.Root())
+ if err := driver.Cleanup(); err != nil {
+ glog.Errorf("Unable to clean up %s driver for %s: %s", driver.GetFSType(), driver.Root(), err)
+ errs = append(errs, err)
+ }
+ }
+ if len(errs) > 0 {
+ // TODO: Something better
+ return fmt.Errorf("Errors unmounting volumes: %s")
+ }
+ return nil
+}
|
Add ShutdownActiveDrivers method
|
diff --git a/lib/puppet/provider/service/gentoo.rb b/lib/puppet/provider/service/gentoo.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/provider/service/gentoo.rb
+++ b/lib/puppet/provider/service/gentoo.rb
@@ -38,7 +38,7 @@ Puppet::Type.type(:service).provide :gentoo, :parent => :init do
return :false unless line
# If it's enabled then it will print output showing service | runlevel
- if output =~ /#{@resource[:name]}\s*\|\s*(boot|default)/
+ if output =~ /^\s*#{@resource[:name]}\s*\|\s*(boot|default)/
return :true
else
return :false
|
Fixes #<I> - service provider for gentoo fails with ambiguous suffixes
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup(
author_email='wes@1stvamp.org',
url='https://github.com/1stvamp/marked.py',
install_requires=[
- 'BeautifulSoup >= 3.0',
+ 'beautifulsoup4 >= 4.3',
'markgen >= 0.9'
],
packages=find_packages(exclude=['marked_tests']),
|
Switch to beautifulsoup4 package
|
diff --git a/lib/pseudohiki/blockparser.rb b/lib/pseudohiki/blockparser.rb
index <HASH>..<HASH> 100644
--- a/lib/pseudohiki/blockparser.rb
+++ b/lib/pseudohiki/blockparser.rb
@@ -293,6 +293,8 @@ module PseudoHiki
['//', CommentOutLeaf],
['----\s*$', HrLeaf]]
+ IRREGULAR_LEAFS = [:entire_matched_part, BlockNodeEnd, VerbatimLeaf, HrLeaf]
+
def self.assign_head_re
irregular_leafs = [BlockNodeEnd, VerbatimLeaf, HrLeaf]
irregular_head_pats, regular_leaf_types, head_to_leaf = [], [], {}
@@ -345,7 +347,7 @@ module PseudoHiki
def select_leaf_type(line)
matched = IRREGULAR_HEAD_PAT.match(line)
- 1.upto(NUMBER_OF_IRREGULAR_LEAF_TYPES) {|i| return IRREGULAR_LEAF_TYPES[i] if matched[i] } if matched
+ 1.upto(NUMBER_OF_IRREGULAR_LEAF_TYPES) {|i| return IRREGULAR_LEAFS[i] if matched[i] } if matched
REGULAR_LEAF_TYPES.each {|head| return HEAD_TO_LEAF[head] if line.start_with?(head) }
ParagraphLeaf
end
|
introduced IRREGULAR_LEAFS
|
diff --git a/src/_pytest/python_api.py b/src/_pytest/python_api.py
index <HASH>..<HASH> 100644
--- a/src/_pytest/python_api.py
+++ b/src/_pytest/python_api.py
@@ -211,9 +211,7 @@ class ApproxScalar(ApproxBase):
the pre-specified tolerance.
"""
if _is_numpy_array(actual):
- import numpy as np
-
- return np.all(abs(self.expected - actual) <= self.tolerance)
+ return all(a == self for a in actual)
# Short-circuit exact equality.
if actual == self.expected:
|
Implement change suggested by @kalekundert in PR
|
diff --git a/responsys/client.py b/responsys/client.py
index <HASH>..<HASH> 100644
--- a/responsys/client.py
+++ b/responsys/client.py
@@ -232,6 +232,21 @@ class InteractClient(object):
return [DeleteResult(delete_result) for delete_result in result]
return [DeleteResult(result)]
+ def merge_table_records(self, table, record_data, match_column_names):
+ """ Responsys.mergeTableRecords call
+
+ Accepts:
+ InteractObject table
+ RecordData record_data
+ list match_column_names
+
+ Returns a MergeResult
+ """
+ table = table.get_soap_object(self.client)
+ record_data = record_data.get_soap_object(self.client)
+ return MergeResult(self.call(
+ 'mergeTableRecords', table, record_data, match_column_names))
+
def merge_table_records_with_pk(self, table, record_data, insert_on_no_match, update_on_match):
""" Responsys.mergeTableRecordsWithPK call
|
Add merge_table_records method
|
diff --git a/ImapClient/IncomingMessage.php b/ImapClient/IncomingMessage.php
index <HASH>..<HASH> 100644
--- a/ImapClient/IncomingMessage.php
+++ b/ImapClient/IncomingMessage.php
@@ -387,7 +387,14 @@ class IncomingMessage
}
}
if (isset($objNew->plain)) {
- $objNew->text = quoted_printable_decode( mb_convert_encoding( $objNew->plain, "utf-8", $objNew->plain->charset ));
+ switch ($objNew->plain->structure->encoding) {
+ case 3:
+ $objNew->text = imap_base64(mb_convert_encoding( $objNew->plain, "utf-8", $objNew->plain->charset ));
+ break;
+ default:
+ $objNew->text = quoted_printable_decode(mb_convert_encoding( $objNew->plain, "utf-8", $objNew->plain->charset ));
+ break;
+ }
$objNew->types[] = 'text';
} else {
$objNew->text = null;
|
Added support for base<I> encoded mail
|
diff --git a/lib/lyber_core/log.rb b/lib/lyber_core/log.rb
index <HASH>..<HASH> 100644
--- a/lib/lyber_core/log.rb
+++ b/lib/lyber_core/log.rb
@@ -13,6 +13,8 @@ module LyberCore
# Initial state
@@logfile = DEFAULT_LOGFILE
@@log ||= Logger.new(@@logfile)
+ # $stdout.reopen(@@logfile)
+ # $stderr.reopen(@@logfile)
@@log.level = DEFAULT_LOG_LEVEL
@@log.formatter = DEFAULT_FORMATTER
@@ -43,7 +45,9 @@ module LyberCore
current_log_level = @@log.level
current_formatter = @@log.formatter
@@logfile = new_logfile
- @@log = Logger.new(@@logfile)
+ @@log = Logger.new(@@logfile)
+ # $stdout.reopen(@@logfile)
+ # $stderr.reopen(@@logfile)
@@log.level = current_log_level
@@log.formatter = current_formatter
rescue Exception => e
|
We can redirect stdout and stderr to the log file if we want to, but I tried it and it doesn't seem that useful.
|
diff --git a/calloway/settings.py b/calloway/settings.py
index <HASH>..<HASH> 100644
--- a/calloway/settings.py
+++ b/calloway/settings.py
@@ -170,5 +170,5 @@ NATIVE_TAGS = (
ADMIN_TOOLS_MENU = 'calloway.menu.CustomMenu'
STORY_RELATION_MODELS = ['massmedia.audio', 'massmedia.image', 'massmedia.document',
- 'massmedia.video', 'massmedia.collection', 'stories.story','viewpoint.entry','viewpoint.blog','pullquote.quote',]
+ 'massmedia.video', 'massmedia.collection', 'stories.story','viewpoint.entry','viewpoint.blog',]
|
removed pullquote from story relations, had it backwards
|
diff --git a/countly.js b/countly.js
index <HASH>..<HASH> 100644
--- a/countly.js
+++ b/countly.js
@@ -16,6 +16,8 @@
crashSegments = null,
autoExtend = true,
lastBeat,
+ failTimeout = 0,
+ failTimeoutAmount = 60,
startTime;
Countly.init = function(ob){
@@ -444,17 +446,18 @@
}
//process request queue with event queue
- if(requestQueue.length > 0){
- var params = requestQueue.shift();
- log("Processing request", params);
- sendXmlHttpRequest(params, function(err, params){
- log("Request Finished", params, err);
- if(err){
- requestQueue.unshift(params);
- store("cly_queue", requestQueue, true);
- }
- });
- store("cly_queue", requestQueue, true);
+ if(requestQueue.length > 0 && getTimestamp() > failTimeout){
+ var params = requestQueue.shift();
+ log("Processing request", params);
+ sendXmlHttpRequest(params, function(err, params){
+ log("Request Finished", params, err);
+ if(err){
+ requestQueue.unshift(params);
+ store("cly_queue", requestQueue, true);
+ failTimeout = getTimestamp() + failTimeoutAmount;
+ }
+ });
+ store("cly_queue", requestQueue, true);
}
setTimeout(heartBeat, beatInterval);
|
[requests] added <I> seconds cooldown for failed requests
|
diff --git a/src/com/opera/core/systems/scope/internal/OperaIntervals.java b/src/com/opera/core/systems/scope/internal/OperaIntervals.java
index <HASH>..<HASH> 100644
--- a/src/com/opera/core/systems/scope/internal/OperaIntervals.java
+++ b/src/com/opera/core/systems/scope/internal/OperaIntervals.java
@@ -12,13 +12,13 @@ public enum OperaIntervals {
POLL_INVERVAL(10),
SCRIPT_RETRY(5),
SCRIPT_RETRY_INTERVAL(50),
- EXEC_SLEEP(10),
+ EXEC_SLEEP(100),
HANDSHAKE_TIMEOUT(30000),
SERVER_PORT(7001),
ENABLE_DEBUGGER(1),
- KILL_GRACE_TIMEOUT(1000),
+ KILL_GRACE_TIMEOUT(1000),
BACKWARDS_COMPATIBLE(1),
- DEFAULT_RESPONSE_TIMEOUT(10000);
+ DEFAULT_RESPONSE_TIMEOUT(10000);
private long value;
|
Changes to exec sleep and indention fixes
|
diff --git a/test/protractor/test.spec.js b/test/protractor/test.spec.js
index <HASH>..<HASH> 100644
--- a/test/protractor/test.spec.js
+++ b/test/protractor/test.spec.js
@@ -1,4 +1,5 @@
'use strict';
+require('./../protractor_coverage_test.js');
describe('Ensure that the plugin works', function() {
it('should not really do much.', function() {
browser.sleep(3000);
|
including require in specfile for testing purposes
|
diff --git a/test/define/class/check.js b/test/define/class/check.js
index <HASH>..<HASH> 100644
--- a/test/define/class/check.js
+++ b/test/define/class/check.js
@@ -92,20 +92,6 @@ describe("define/class/check", function () {
});
});
- it("supports only $abstract = true", function () {
- var exceptionCaught;
- try {
- _gpfDefineBuildTypedEntity({
- $type: "class",
- $name: "Test",
- $abstract: false
- });
- } catch (e) {
- exceptionCaught = e;
- }
- assert(exceptionCaught instanceof gpf.Error.InvalidClass$AbstractSpecification);
- });
-
});
}
|
Isolates $abstract (#<I>)
|
diff --git a/lib/Thelia/Coupon/Type/RemoveXPercent.php b/lib/Thelia/Coupon/Type/RemoveXPercent.php
index <HASH>..<HASH> 100644
--- a/lib/Thelia/Coupon/Type/RemoveXPercent.php
+++ b/lib/Thelia/Coupon/Type/RemoveXPercent.php
@@ -64,7 +64,7 @@ class RemoveXPercent extends AbstractRemove
*/
public function exec()
{
- return round($this->facade->getCartTotalTaxPrice($this->isAvailableOnSpecialOffers()) * $this->percentage/100, 2);
+ return ($this->facade->getCartTotalTaxPrice($this->isAvailableOnSpecialOffers()) * $this->percentage/100);
}
/**
|
No round for discount, saved as decimal(<I>,6)
|
diff --git a/swifter/__init__.py b/swifter/__init__.py
index <HASH>..<HASH> 100644
--- a/swifter/__init__.py
+++ b/swifter/__init__.py
@@ -1,4 +1,5 @@
from .swifter import SeriesAccessor, DataFrameAccessor
+from .tqdm_dask_progressbar import TQDMDaskProgressBar
__all__ = ['SeriesAccessor, DataFrameAccessor']
-__version__ = '0.225'
+__version__ = '0.241'
|
Access to TQDMDaskProgressBar
|
diff --git a/bundle/Controller/LayoutWizard.php b/bundle/Controller/LayoutWizard.php
index <HASH>..<HASH> 100644
--- a/bundle/Controller/LayoutWizard.php
+++ b/bundle/Controller/LayoutWizard.php
@@ -41,6 +41,12 @@ final class LayoutWizard extends Controller
'location' => $location,
'form' => $form->createView(),
],
+ new Response(
+ null,
+ $form->isSubmitted() ?
+ Response::HTTP_UNPROCESSABLE_ENTITY :
+ Response::HTTP_OK
+ ),
);
}
|
Return HTTP <I> status code is form for layout wizard is not valid
|
diff --git a/lib/primalize/single.rb b/lib/primalize/single.rb
index <HASH>..<HASH> 100644
--- a/lib/primalize/single.rb
+++ b/lib/primalize/single.rb
@@ -53,6 +53,10 @@ module Primalize
Float.new(&coerce)
end
+ def number &coerce
+ Number.new(&coerce)
+ end
+
def optional *types, &coerce
Optional.new(types, &coerce)
end
@@ -146,6 +150,18 @@ module Primalize
end
end
+ class Number
+ include Type
+
+ def === value
+ ::Numeric === value
+ end
+
+ def inspect
+ 'number'
+ end
+ end
+
class String
include Type
diff --git a/spec/primalize/single_spec.rb b/spec/primalize/single_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/primalize/single_spec.rb
+++ b/spec/primalize/single_spec.rb
@@ -23,6 +23,7 @@ module Primalize
address: optional(string),
state: enum(1, 2, 3, 4),
order: primalize(order_serializer_class),
+ value: number,
created_at: timestamp,
)
end
@@ -44,6 +45,7 @@ module Primalize
price_cents: 123_45,
payment_method: 'card_123456',
),
+ value: 21.3,
created_at: Time.new(1999, 12, 31, 23, 59, 59),
}
end
@@ -218,6 +220,7 @@ module Primalize
address: optional(string),
state: enum(1, 2, 3, 4),
order: primalize(OrderSerializer),
+ value: number,
)
EOF
|
Primalize all types of primitive numbers
|
diff --git a/modules/core/templates/logout-iframe.php b/modules/core/templates/logout-iframe.php
index <HASH>..<HASH> 100644
--- a/modules/core/templates/logout-iframe.php
+++ b/modules/core/templates/logout-iframe.php
@@ -105,6 +105,8 @@ foreach ($SPs AS $assocId => $sp) {
echo '<tr>';
+ echo '<td style="width: 3em;"></td>';
+
echo '<td>';
echo '<img class="logoutstatusimage" id="statusimage-' . $spId . '" src="' . htmlspecialchars($stateImage[$spState]) . '" alt="' . htmlspecialchars($stateText[$spState]) . '"/>';
echo '</td>';
|
Logout: indent the service list.
|
diff --git a/lib/active_interaction/grouped_input.rb b/lib/active_interaction/grouped_input.rb
index <HASH>..<HASH> 100644
--- a/lib/active_interaction/grouped_input.rb
+++ b/lib/active_interaction/grouped_input.rb
@@ -4,5 +4,16 @@ require 'ostruct'
module ActiveInteraction
class GroupedInput < OpenStruct
+ def [](name)
+ return super if self.class.superclass.method_defined?(:[])
+
+ send(name)
+ end
+
+ def []=(name, value)
+ return super if self.class.superclass.method_defined?(:[]=)
+
+ send("#{name}=", value)
+ end
end
end
|
Define methods for backwards compatibility
|
diff --git a/atomic_reactor/plugins/pre_flatpak_create_dockerfile.py b/atomic_reactor/plugins/pre_flatpak_create_dockerfile.py
index <HASH>..<HASH> 100644
--- a/atomic_reactor/plugins/pre_flatpak_create_dockerfile.py
+++ b/atomic_reactor/plugins/pre_flatpak_create_dockerfile.py
@@ -35,7 +35,10 @@ LABEL com.redhat.component="{name}"
LABEL version="{stream}"
LABEL release="{version}"
-RUN dnf -y --nogpgcheck --disablerepo=* --enablerepo=atomic-reactor-module-* \\
+RUN dnf -y --nogpgcheck \\
+ --disablerepo=* \\
+ --enablerepo=atomic-reactor-koji-plugin-* \\
+ --enablerepo=atomic-reactor-module-* \\
--installroot=/var/tmp/flatpak-build install {packages}
RUN rpm --root=/var/tmp/flatpak-build {rpm_qf_args} > /var/tmp/flatpak-build.rpm_qf
COPY cleanup.sh /var/tmp/flatpak-build/tmp/
|
flatpak_create_dockerfile: Enable the repository from the 'koji' plugin
With the switch to "Hybrid" modularity in Fedora, modules typically need
to pull packages from a base package set as well. The build tag of the
Koji target provides a way to pass in an appropriate base package set, so
we'll make odcs-client enable the 'koji' plugin, and the Dockerfile should
enable the resulting repository.
|
diff --git a/djstripe/views.py b/djstripe/views.py
index <HASH>..<HASH> 100644
--- a/djstripe/views.py
+++ b/djstripe/views.py
@@ -133,7 +133,6 @@ class SyncHistoryView(CsrfExemptMixin, LoginRequiredMixin, View):
# ============================================================================ #
class ConfirmFormView(LoginRequiredMixin, FormValidMessageMixin, SubscriptionMixin, FormView):
- """TODO: Add stripe_token to the form and use form_valid() instead of post()."""
form_class = PlanForm
template_name = "djstripe/confirm_form.html"
@@ -188,7 +187,6 @@ class SubscribeView(LoginRequiredMixin, SubscriptionMixin, TemplateView):
class ChangePlanView(LoginRequiredMixin, FormValidMessageMixin, SubscriptionMixin, FormView):
"""
- TODO: This logic should be in form_valid() instead of post().
TODO: Work in a trial_days kwarg
Also, this should be combined with ConfirmFormView.
|
Remove TODOs that don't make any sense.
|
diff --git a/spec/support/connection_string.rb b/spec/support/connection_string.rb
index <HASH>..<HASH> 100644
--- a/spec/support/connection_string.rb
+++ b/spec/support/connection_string.rb
@@ -214,9 +214,6 @@ module Mongo
# Replica Set Options
'replicaset' => :replica_set,
- # Auth Source
- 'authsource' => :auth_source,
-
# Timeout Options
'connecttimeoutms' => :connect_timeout,
'sockettimeoutms' => :socket_timeout,
|
RUBY-<I> Remove duplicate key from test map (#<I>)
|
diff --git a/lib/bigcommerce/version.rb b/lib/bigcommerce/version.rb
index <HASH>..<HASH> 100644
--- a/lib/bigcommerce/version.rb
+++ b/lib/bigcommerce/version.rb
@@ -1,6 +1,6 @@
module Bigcommerce
major = 0
- minor = 8
- patch = 4
+ minor = 9
+ patch = 0
VERSION = [major, minor, patch].join('.') unless defined? Bigcommerce::VERSION
end
|
Bumped version to <I>
|
diff --git a/jsonrpc.go b/jsonrpc.go
index <HASH>..<HASH> 100644
--- a/jsonrpc.go
+++ b/jsonrpc.go
@@ -8,6 +8,7 @@ import (
"errors"
"fmt"
"net/http"
+ "strconv"
"sync"
)
@@ -58,6 +59,10 @@ type RPCError struct {
Data interface{} `json:"data"`
}
+func (e *RPCError) Error() string {
+ return strconv.Itoa(e.Code) + ": " + e.Message
+}
+
// RPCClient sends jsonrpc requests over http to the provided rpc backend.
// RPCClient is created using the factory function NewRPCClient().
type RPCClient struct {
|
implemented Error interface on RPCError (#8)
implemented Error interface on RPCError
|
diff --git a/test/test_producer_integration.py b/test/test_producer_integration.py
index <HASH>..<HASH> 100644
--- a/test/test_producer_integration.py
+++ b/test/test_producer_integration.py
@@ -19,7 +19,6 @@ from test.fixtures import ZookeeperFixture, KafkaFixture
from test.testutil import KafkaIntegrationTestCase, kafka_versions
class TestKafkaProducerIntegration(KafkaIntegrationTestCase):
- topic = b'produce_topic'
@classmethod
def setUpClass(cls): # noqa
|
Use a different topic for each producer integration test for isolation
|
diff --git a/lib/metior/version.rb b/lib/metior/version.rb
index <HASH>..<HASH> 100644
--- a/lib/metior/version.rb
+++ b/lib/metior/version.rb
@@ -6,6 +6,6 @@
module Metior
# The current version of the Metior gem
- VERSION = '0.1.4'
+ VERSION = '0.1.4' unless defined? Metior::VERSION
end
|
Don't redefine VERSION constant
|
diff --git a/photos/actions.js b/photos/actions.js
index <HASH>..<HASH> 100644
--- a/photos/actions.js
+++ b/photos/actions.js
@@ -43,7 +43,7 @@ actions.searchPhotos = (req, res, next) => {
.then((flattenedPhotos) => {
return _.sortBy(flattenedPhotos, [
(photo) => {
- return photo.dateCreated ? photo.dateCreated.valueOf() * -1 : photo.datePublished.valueOf() * -1;
+ return photo.dateCreated ? photo.dateCreated.valueOf() * -1 : photo.datePublished ? photo.datePublished.valueOf() * -1 : 0;
}
]);
})
|
Hmmm. Apparently `datePublished` can be falsy, so guard against it.
Need to figure out exactly where I left off with this...
|
diff --git a/examples/duplicate_table.py b/examples/duplicate_table.py
index <HASH>..<HASH> 100644
--- a/examples/duplicate_table.py
+++ b/examples/duplicate_table.py
@@ -120,8 +120,10 @@ logger.info('Response: {}'.format(res))
copy_src_client = CopySQLClient(auth_src_client)
copy_dst_client = CopySQLClient(auth_dst_client)
-# COPY (streaming) the data from the source to the dest table
-# we use here all the COPY defaults
+# COPY (streaming) the data from the source to the dest table. We use
+# here all the COPY defaults. Note that we take the `response` from
+# the `copyto`, which can be iterated, and we pipe it directly into
+# the `copyfrom`.
logger.info("Streaming the data from source to destination...")
response = copy_src_client.copyto('COPY %s TO STDOUT' % TABLE_NAME)
result = copy_dst_client.copyfrom('COPY %s FROM STDIN' % TABLE_NAME, response)
|
Better comment the gist of the example
|
diff --git a/app/app.js b/app/app.js
index <HASH>..<HASH> 100644
--- a/app/app.js
+++ b/app/app.js
@@ -80,9 +80,9 @@ function (app, $, _, Backbone, Bootstrap, Helpers, Utils, FauxtonAPI, Couchdb) {
var cookies = parseCookies(document.cookie);
var csrf = cookies['CouchDB-CSRF'] ? cookies['CouchDB-CSRF'] : 'true';
var origBeforeSend = settings.beforeSend;
- var newBeforeSend = function (xhr) {
+ var newBeforeSend = function (xhr, o) {
if (origBeforeSend) {
- origBeforeSend(xhr);
+ origBeforeSend(xhr, o);
}
xhr.setRequestHeader('X-CouchDB-CSRF', csrf);
};
|
Pass the second param to beforeSend
I forgot to send this argument on which broke attachment uploading
COUCHDB-<I>
|
diff --git a/tensorboard/pip_package/setup.py b/tensorboard/pip_package/setup.py
index <HASH>..<HASH> 100644
--- a/tensorboard/pip_package/setup.py
+++ b/tensorboard/pip_package/setup.py
@@ -64,6 +64,7 @@ setup(
},
install_requires=REQUIRED_PACKAGES,
tests_require=REQUIRED_PACKAGES,
+ python_requires=">=3.6",
# PyPI package information.
classifiers=[
"Development Status :: 4 - Beta",
|
pip: explicitly require Python <I> above (#<I>)
With `python_requires`, we can disallow other versions of Pythons from
installing TensorBoard. Removal in the earlier change was done without
completely understanding its intent.
|
diff --git a/command/agent/dns_test.go b/command/agent/dns_test.go
index <HASH>..<HASH> 100644
--- a/command/agent/dns_test.go
+++ b/command/agent/dns_test.go
@@ -1405,7 +1405,7 @@ func TestDNS_RecursorTimeout(t *testing.T) {
testClientTimeout := serverClientTimeout + 5*time.Second
dir, srv := makeDNSServerConfig(t, func(c *Config) {
- c.DNSRecursor = "127.0.0.77" // must be an unreachable host
+ c.DNSRecursor = "10.255.255.1" // host must cause a connection|read|write timeout
}, func(c *DNSConfig) {
c.RecursorTimeout = serverClientTimeout
})
|
Made the dns recursor timeout test more reliable
|
diff --git a/tests/Api/LeadsTest.php b/tests/Api/LeadsTest.php
index <HASH>..<HASH> 100644
--- a/tests/Api/LeadsTest.php
+++ b/tests/Api/LeadsTest.php
@@ -13,16 +13,8 @@ class LeadsTest extends ContactsTest
{
public function setUp()
{
+ parent::setUp();
$this->api = $this->getContext('leads');
- $this->testPayload = array(
- 'firstname' => 'test',
- 'lastname' => 'test',
- 'points' => 3,
- 'tags' => array(
- 'APItag1',
- 'APItag2',
- )
- );
}
// Use the method from ContactsTest to test the 'leads' endpoint for BC
|
Use payload from ContactsTest for LeadsTest to ensure both test the same
|
diff --git a/packages/babel-plugin-proposal-object-rest-spread/src/index.js b/packages/babel-plugin-proposal-object-rest-spread/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/babel-plugin-proposal-object-rest-spread/src/index.js
+++ b/packages/babel-plugin-proposal-object-rest-spread/src/index.js
@@ -455,6 +455,11 @@ export default declare((api, opts) => {
try {
helper = file.addHelper("objectSpread2");
} catch {
+ // TODO: This is needed to workaround https://github.com/babel/babel/issues/10187
+ // and https://github.com/babel/babel/issues/10179 for older @babel/core versions
+ // where #10187 isn't fixed.
+ this.file.declarations["objectSpread2"] = null;
+
// objectSpread2 has been introduced in v7.5.0
// We have to maintain backward compatibility.
helper = file.addHelper("objectSpread");
|
Workaround #<I> in proposal-object-rest-spread (#<I>)
|
diff --git a/lib/dimples/page.rb b/lib/dimples/page.rb
index <HASH>..<HASH> 100644
--- a/lib/dimples/page.rb
+++ b/lib/dimples/page.rb
@@ -10,29 +10,23 @@ module Dimples
attr_accessor :filename
attr_accessor :extension
attr_accessor :layout
+ attr_accessor :contents
attr_accessor :rendered_contents
- attr_writer :contents
-
def initialize(site, path = nil)
@site = site
@extension = @site.config['file_extensions']['pages']
+ @path = path
- if path
- @path = path
- @filename = File.basename(path, File.extname(path))
- @contents = read_with_yaml(path)
+ if @path
+ @filename = File.basename(@path, File.extname(@path))
+ @contents = read_with_yaml(@path)
else
- @path = nil
@filename = 'index'
@contents = ''
end
end
- def contents
- @contents
- end
-
def output_file_path(parent_path)
parts = [parent_path]
|
Switched to an attr_accessor for contents. Simplified the initialiser's path code.
|
diff --git a/lib/grade/grade_category.php b/lib/grade/grade_category.php
index <HASH>..<HASH> 100644
--- a/lib/grade/grade_category.php
+++ b/lib/grade/grade_category.php
@@ -377,6 +377,7 @@ class grade_category extends grade_object {
}
$this->aggregate_grades($prevuser, $items, $grade_values, $oldgrade, $excluded);//the last one
}
+ rs_close($rs);
}
return true;
diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index <HASH>..<HASH> 100644
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -629,6 +629,7 @@ class grade_item extends grade_object {
}
}
}
+ rs_close($rs);
}
return $result;
@@ -1430,6 +1431,7 @@ class grade_item extends grade_object {
$return = false;
}
}
+ rs_close($rs);
}
return $return;
|
added proper rs_close($rs)
|
diff --git a/src/main/java/com/buschmais/jqassistant/scm/maven/ScanMojo.java b/src/main/java/com/buschmais/jqassistant/scm/maven/ScanMojo.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/buschmais/jqassistant/scm/maven/ScanMojo.java
+++ b/src/main/java/com/buschmais/jqassistant/scm/maven/ScanMojo.java
@@ -64,14 +64,14 @@ public class ScanMojo extends AbstractModuleMojo {
@Override
public void execute(MavenProject mavenProject, Store store) throws MojoExecutionException, MojoFailureException {
List<ScannerPlugin<?, ?>> scannerPlugins;
+ ScannerContext scannerContext = new ScannerContextImpl(store);
ScannerPluginRepository scannerPluginRepository = pluginRepositoryProvider.getScannerPluginRepository();
try {
- scannerPlugins = scannerPluginRepository.getScannerPlugins(getPluginProperties());
+ scannerPlugins = scannerPluginRepository.getScannerPlugins(scannerContext, getPluginProperties());
} catch (PluginRepositoryException e) {
throw new MojoExecutionException("Cannot determine scanner plugins.", e);
}
ScopePluginRepository scopePluginRepository = pluginRepositoryProvider.getScopePluginRepository();
- ScannerContext scannerContext = new ScannerContextImpl(store);
Scanner scanner = new ScannerImpl(scannerContext, scannerPlugins, scopePluginRepository.getScopes());
store.beginTransaction();
try {
|
#<I> provide scanner context during configuration of plugins
|
diff --git a/test/ocsp/helper/helper.go b/test/ocsp/helper/helper.go
index <HASH>..<HASH> 100644
--- a/test/ocsp/helper/helper.go
+++ b/test/ocsp/helper/helper.go
@@ -122,6 +122,9 @@ func Req(fileName string) (*ocsp.Response, error) {
http.DefaultClient.Timeout = 5 * time.Second
httpResp, err := sendHTTPRequest(req, ocspURL)
+ if err != nil {
+ return nil, err
+ }
fmt.Printf("HTTP %d\n", httpResp.StatusCode)
for k, v := range httpResp.Header {
for _, vv := range v {
|
Return error from `sendHTTPRequest` immediately. (#<I>)
Prior to this commit the `httpResp` result of `sendHTTPRequest` was
examined even in the case where `sendHTTPRequest` returns a non-nil
error. This can cause a nil panic since the `httpResp` may be `nil` when
the error is not. This commit returns an error from `Req()` immediately
when `sendHTTPRequest` returns one.
|
diff --git a/opal/browser/compatibility.rb b/opal/browser/compatibility.rb
index <HASH>..<HASH> 100644
--- a/opal/browser/compatibility.rb
+++ b/opal/browser/compatibility.rb
@@ -66,16 +66,17 @@ module Compatibility
end
def self.new_event?
- %x{
- try {
- new Event("x");
+ return @new_event if defined?(@new_event)
- return true;
- }
- catch (e) {
- return false;
- }
- }
+ begin
+ `new Event("*")`
+
+ @new_event = true
+ rescue
+ @new_event = false
+ end
+
+ @new_event
end
def self.create_event?
@@ -107,7 +108,11 @@ module Compatibility
end
def self.post_message?
- return false unless has?(:postMessage) && !has?(:importScripts)
+ return @post_message if defined?(@post_message)
+
+ unless has?(:postMessage) && !has?(:importScripts)
+ return @post_message = false
+ end
%x{
var ok = true,
@@ -117,7 +122,7 @@ module Compatibility
window.postMessage("", "*")
window.onmessage = old;
- return ok;
+ return #@post_message = ok;
}
end
|
compatibility: cache some heavy predicates
|
diff --git a/src/Entity/Task.php b/src/Entity/Task.php
index <HASH>..<HASH> 100644
--- a/src/Entity/Task.php
+++ b/src/Entity/Task.php
@@ -79,7 +79,7 @@ class Task
public function getStatus()
{
- return $this->progress;
+ return $this->status;
}
public function setStatus($status)
|
Fix can't save task because null status
|
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -149,7 +149,7 @@ module AbstractController
# ==== Parameters
# * <tt>action_name</tt> - The name of an action to be tested
def available_action?(action_name)
- _find_action_name(action_name).present?
+ _find_action_name(action_name)
end
# Returns true if the given controller is capable of rendering
|
remove present? call; we do not need it
|
diff --git a/src/net/tootallnate/websocket/WebSocketServer.java b/src/net/tootallnate/websocket/WebSocketServer.java
index <HASH>..<HASH> 100644
--- a/src/net/tootallnate/websocket/WebSocketServer.java
+++ b/src/net/tootallnate/websocket/WebSocketServer.java
@@ -218,7 +218,7 @@ public abstract class WebSocketServer implements Runnable, WebSocketListener {
// if isWritable == true
// then we need to send the rest of the data to the client
- if (key.isWritable()) {
+ if (key.isValid() && key.isWritable()) {
WebSocket conn = (WebSocket)key.attachment();
if (conn.handleWrite()) {
conn.socketChannel().register(selector,
|
Fixed an issue with WebSocketServer that was causing a CancelledKeyException to be thrown when a client disconnected.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.