diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/tools/buildgen/generate_projects.py b/tools/buildgen/generate_projects.py
index <HASH>..<HASH> 100755
--- a/tools/buildgen/generate_projects.py
+++ b/tools/buildgen/generate_projects.py
@@ -50,7 +50,10 @@ jobs = []
for root, dirs, files in os.walk('templates'):
for f in files:
if os.path.splitext(f)[1] == '.template':
- out = '.' + root[len('templates'):] + '/' + os.path.splitext(f)[0]
+ out_dir = '.' + root[len('templates'):]
+ out = out_dir + '/' + os.path.splitext(f)[0]
+ if not os.path.exists(out_dir):
+ os.makedirs(out_dir)
cmd = ['tools/buildgen/mako_renderer.py']
for plugin in plugins:
cmd.append('-p')
|
generate_projects.py should make directories.
That's necessary for generating Visual Studio project files that are in separate empty directories otherwise.
|
diff --git a/modules/prebidServerBidAdapter/index.js b/modules/prebidServerBidAdapter/index.js
index <HASH>..<HASH> 100644
--- a/modules/prebidServerBidAdapter/index.js
+++ b/modules/prebidServerBidAdapter/index.js
@@ -594,7 +594,7 @@ const OPEN_RTB_PROTOCOL = {
}
if (!utils.isEmpty(videoParams)) {
- if (videoParams.context === 'outstream' && !adUnit.renderer) {
+ if (videoParams.context === 'outstream' && (!videoParams.renderer || !adUnit.renderer)) {
// Don't push oustream w/o renderer to request object.
utils.logError('Outstream bid without renderer cannot be sent to Prebid Server.');
} else {
|
Accept outstream renderers defined in mediatype for PBS (#<I>)
|
diff --git a/src/Shell/Task/ImportTask.php b/src/Shell/Task/ImportTask.php
index <HASH>..<HASH> 100644
--- a/src/Shell/Task/ImportTask.php
+++ b/src/Shell/Task/ImportTask.php
@@ -59,10 +59,8 @@ class ImportTask extends Shell
$entity = $table->patchEntity($entity, $group);
$result = $table->save($entity);
if (!$result) {
- $this->abort("Failed to create group [" . $group['name'] . "]");
$this->err("Errors: \n" . implode("\n", $this->getImportErrors($entity)));
-
- return false;
+ $this->abort("Failed to create group [" . $group['name'] . "]");
}
}
|
Show errors before aborting the ImportTask
|
diff --git a/lib/components/viewers/route-viewer.js b/lib/components/viewers/route-viewer.js
index <HASH>..<HASH> 100644
--- a/lib/components/viewers/route-viewer.js
+++ b/lib/components/viewers/route-viewer.js
@@ -15,9 +15,9 @@ import {
} from '../../actions/ui'
import { findRoutes, findRoute } from '../../actions/api'
import {
- getSortedFilteredRoutes,
+ getAgenciesFromRoutes,
getModesForActiveAgencyFilter,
- getAgenciesFromRoutes
+ getSortedFilteredRoutes
} from '../../util/state'
import { ComponentContext } from '../../util/contexts'
import { getModeFromRoute } from '../../util/viewer'
@@ -255,7 +255,7 @@ const RouteDetails = styled.div`
`
class RouteRow extends PureComponent {
- static contextType = ComponentContext;
+ static contextType = ComponentContext
_onClick = () => {
const { findRoute, isActive, route, setViewedRoute } = this.props
|
refactor(route-viewer): address pr comments
|
diff --git a/lib/swag_dev-project.rb b/lib/swag_dev-project.rb
index <HASH>..<HASH> 100644
--- a/lib/swag_dev-project.rb
+++ b/lib/swag_dev-project.rb
@@ -27,7 +27,7 @@ if lock
require 'bootsnap'
Bootsnap.setup(
- cache_dir: 'cache',
+ cache_dir: "#{__dir__}/../cache",
development_mode: true,
load_path_cache: true,
autoload_paths_cache: true,
|
bootstrapping set bootsnap cache_dir as absolute path
|
diff --git a/src/main/java/water/Key.java b/src/main/java/water/Key.java
index <HASH>..<HASH> 100644
--- a/src/main/java/water/Key.java
+++ b/src/main/java/water/Key.java
@@ -57,7 +57,7 @@ public final class Key extends Iced implements Comparable {
public static final byte USER_KEY = 32;
/** List of illegal characters which are not allowed in user keys. */
- public static final CharSequence ILLEGAL_USER_KEY_CHARS = "!@#$%^&*()+={}[]|\\;:\"'<>,/?";
+ public static final CharSequence ILLEGAL_USER_KEY_CHARS = " !@#$%^&*()+={}[]|\\;:\"'<>,/?";
// 64 bits of Cloud-specific cached stuff. It is changed atomically by any
// thread that visits it and has the wrong Cloud. It has to be read *in the
|
Added ' ' into illegal user characters.
|
diff --git a/lib-dempsyimpl/src/test/java/com/nokia/dempsy/TestDempsy.java b/lib-dempsyimpl/src/test/java/com/nokia/dempsy/TestDempsy.java
index <HASH>..<HASH> 100644
--- a/lib-dempsyimpl/src/test/java/com/nokia/dempsy/TestDempsy.java
+++ b/lib-dempsyimpl/src/test/java/com/nokia/dempsy/TestDempsy.java
@@ -1117,6 +1117,7 @@ public class TestDempsy
TestAdaptor adaptor = (TestAdaptor)context.getBean("adaptor");
adaptor.pushMessage(new TestMessage("test1")); // this causes the container to clone the Mp
+ assertTrue(poll(baseTimeoutMillis,mp,new Condition<TestMp>() { @Override public boolean conditionMet(TestMp mp) { return mp.cloneCalls.get()==1; } }));
Thread.sleep(100);
assertEquals(0,statsCollector.getMessageProcessorsCreated());
|
Minor test timing bug fix. Uncovered with the delay calulcation correction in the batching code.
|
diff --git a/Form/Type/DurationType.php b/Form/Type/DurationType.php
index <HASH>..<HASH> 100755
--- a/Form/Type/DurationType.php
+++ b/Form/Type/DurationType.php
@@ -40,6 +40,8 @@ class DurationType extends HookType
public function buildForm(FormBuilderInterface $builder, array $options)
{
+ $this->setOptions($options);
+
if ('rest' == $this->view) {
$builder->add('startDate', 'datetime', array(
'widget' => 'single_text',
|
CampaignChain/campaignchain#<I> Upgrade to Symfony 3.x
|
diff --git a/networkzero/discovery.py b/networkzero/discovery.py
index <HASH>..<HASH> 100644
--- a/networkzero/discovery.py
+++ b/networkzero/discovery.py
@@ -216,6 +216,7 @@ class _Beacon(threading.Thread):
_logger.debug("Advertise %s on %s %s TTL=%s", name, address, fail_if_exists, ttl_s)
canonical_address = core.address(address)
+ superseded_services = set()
for service in self._services_to_advertise:
if service.name == name:
if fail_if_exists:
@@ -223,7 +224,10 @@ class _Beacon(threading.Thread):
return None
else:
_logger.warn("Superseding service %s which already exists on %s", name, service.address)
- self._services_to_advertise.remove(service)
+ superseded_services.add(service)
+
+ for s in superseded_services:
+ self._services_to_advertise.remove(s)
service = _Service(name, canonical_address, ttl_s)
self._services_to_advertise.append(service)
|
Slight rework of superseded services
|
diff --git a/spaceship/lib/spaceship/version.rb b/spaceship/lib/spaceship/version.rb
index <HASH>..<HASH> 100644
--- a/spaceship/lib/spaceship/version.rb
+++ b/spaceship/lib/spaceship/version.rb
@@ -1,4 +1,4 @@
module Spaceship
- VERSION = "0.29.1".freeze
+ VERSION = "0.30.0".freeze
DESCRIPTION = "Ruby library to access the Apple Dev Center and iTunes Connect".freeze
end
|
[spaceship] Version bump (#<I>)
Update spaceship to work with the new iTunes Connect screenshot API
|
diff --git a/kernel/src/main/java/org/efaps/importer/DataImport.java b/kernel/src/main/java/org/efaps/importer/DataImport.java
index <HASH>..<HASH> 100644
--- a/kernel/src/main/java/org/efaps/importer/DataImport.java
+++ b/kernel/src/main/java/org/efaps/importer/DataImport.java
@@ -52,12 +52,30 @@ public class DataImport {
*/
private RootObject root = null;
+ /**
+ * contains the Path of the Base for the Context
+ */
private String baseName = null;
+ /**
+ * DefaultConstructor used by Shell -create
+ */
+ public DataImport() {
+
+ }
+
+ /**
+ * Constructor setting the BaseName
+ *
+ * @param _basename
+ */
public DataImport(final String _basename) {
this.baseName = _basename;
}
+ /**
+ * initialises the Context for the VFS
+ */
public void initialise() {
System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
"org.efaps.importer.InitialContextFactory");
@@ -197,6 +215,11 @@ public class DataImport {
this.root.dbAddChilds();
}
+ /**
+ * has the root recieved Data from the digester that must be inserted
+ *
+ * @return true, if there is Data
+ */
public boolean hasData() {
return this.root != null;
}
|
- added Constructor, to be started from shell -create
git-svn-id: <URL>
|
diff --git a/spec/services/hyrax/workflow/permission_query_spec.rb b/spec/services/hyrax/workflow/permission_query_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/services/hyrax/workflow/permission_query_spec.rb
+++ b/spec/services/hyrax/workflow/permission_query_spec.rb
@@ -164,12 +164,18 @@ module Hyrax
subject { described_class.scope_processing_agents_for(user: nil) }
it { is_expected.to eq([]) }
end
+
context 'when user is persisted' do
let(:user) { create(:user) }
+ before do
+ allow(user).to receive(:groups).and_return(['librarians'])
+ end
+
subject { described_class.scope_processing_agents_for(user: user) }
+
it 'will equal [kind_of(Sipity::Agent)]' do
is_expected.to contain_exactly(PowerConverter.convert_to_sipity_agent(user),
- PowerConverter.convert_to_sipity_agent(Group.new('registered')))
+ PowerConverter.convert_to_sipity_agent(Group.new('librarians')))
end
end
end
|
Fix tests that was depending on User.groups returning a 'registered' pseudo-group
|
diff --git a/ineffassign.go b/ineffassign.go
index <HASH>..<HASH> 100644
--- a/ineffassign.go
+++ b/ineffassign.go
@@ -12,7 +12,7 @@ import (
)
func main() {
- if len(os.Args) < 1 {
+ if len(os.Args) != 2 {
fmt.Println("missing argument: filepath")
return
}
|
Fix index panic if no argument supplied
Check that there are exactly two values in argv, the program name
and the package.
|
diff --git a/lib/Cake/Error/ExceptionRenderer.php b/lib/Cake/Error/ExceptionRenderer.php
index <HASH>..<HASH> 100644
--- a/lib/Cake/Error/ExceptionRenderer.php
+++ b/lib/Cake/Error/ExceptionRenderer.php
@@ -179,7 +179,7 @@ class ExceptionRenderer {
*/
protected function _cakeError(CakeException $error) {
$url = $this->controller->request->here();
- $code = $error->getCode();
+ $code = ($error->getCode() >= 400 && $error->getCode() < 506) ? $error->getCode() : 500;
$this->controller->response->statusCode($code);
$this->controller->set(array(
'code' => $code,
|
Adding error code checking around CakeException handling
SocketExceptions can have error codes outside of the HTTP values.
|
diff --git a/testing/constants.go b/testing/constants.go
index <HASH>..<HASH> 100644
--- a/testing/constants.go
+++ b/testing/constants.go
@@ -27,4 +27,4 @@ var LongAttempt = &utils.AttemptStrategy{
}
// SupportedSeries lists the series known to Juju.
-var SupportedSeries = []string{"precise", "quantal", "raring", "saucy", "trusty"}
+var SupportedSeries = []string{"precise", "quantal", "raring", "saucy", "trusty", "utopic"}
|
utopic is now available from distro-info, so needs to be updated
|
diff --git a/framework/core/js/src/forum/components/Search.js b/framework/core/js/src/forum/components/Search.js
index <HASH>..<HASH> 100644
--- a/framework/core/js/src/forum/components/Search.js
+++ b/framework/core/js/src/forum/components/Search.js
@@ -12,13 +12,13 @@ import UsersSearchSource from './UsersSearchSource';
* The `Search` component displays a menu of as-you-type results from a variety
* of sources.
*
- * The search box will be 'activated' if the app's seach state's
+ * The search box will be 'activated' if the app's search state's
* getInitialSearch() value is a truthy value. If this is the case, an 'x'
* button will be shown next to the search field, and clicking it will clear the search.
*
* PROPS:
*
- * - state: AlertState instance.
+ * - state: SearchState instance.
*/
export default class Search extends Component {
init() {
|
Fix typo and update outdated doc block
|
diff --git a/lib/rules/no-wrap-func.js b/lib/rules/no-wrap-func.js
index <HASH>..<HASH> 100644
--- a/lib/rules/no-wrap-func.js
+++ b/lib/rules/no-wrap-func.js
@@ -1,5 +1,5 @@
/**
- * @fileoverview Rule to flag wrapping none-iffe in parens
+ * @fileoverview Rule to flag wrapping non-iife in parens
* @author Ilya Volodin
*/
|
Fix: typo: iffe to iife, none to non
|
diff --git a/agon/models.py b/agon/models.py
index <HASH>..<HASH> 100644
--- a/agon/models.py
+++ b/agon/models.py
@@ -67,7 +67,7 @@ def award_points(target, key):
points_given = lookup_point_value(key)
updated = TargetStat.objects.filter(**lookup_params).update(
- total = models.F("total") + points_given,
+ points = models.F("points") + points_given,
)
if not updated:
try:
|
fixed incorrect field name after TargetStat addition
|
diff --git a/spec/ethon/easy/http/put_spec.rb b/spec/ethon/easy/http/put_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/ethon/easy/http/put_spec.rb
+++ b/spec/ethon/easy/http/put_spec.rb
@@ -103,7 +103,7 @@ describe Ethon::Easy::Http::Put do
let(:easy) do
e = Ethon::Easy.new(:url => url, :upload => true)
e.set_read_callback(file)
- e.infilesize = file.size
+ e.infilesize = File.size(file.path)
e
end
|
Fix again <I> file api issues.
|
diff --git a/lib/graphql/query/context.rb b/lib/graphql/query/context.rb
index <HASH>..<HASH> 100644
--- a/lib/graphql/query/context.rb
+++ b/lib/graphql/query/context.rb
@@ -221,7 +221,7 @@ module GraphQL
def_delegators :@context,
:[], :[]=, :key?, :fetch, :to_h, :namespace,
- :spawn, :schema, :warden, :errors,
+ :spawn, :warden, :errors,
:execution_strategy, :strategy
# @return [GraphQL::Language::Nodes::Field] The AST node for the currently-executing field
|
Remove delegate for `FieldResolutionContext#schema`
It's already cached via an ivar in the initializer.
|
diff --git a/packages/mjml-parser-xml/src/index.js b/packages/mjml-parser-xml/src/index.js
index <HASH>..<HASH> 100644
--- a/packages/mjml-parser-xml/src/index.js
+++ b/packages/mjml-parser-xml/src/index.js
@@ -76,7 +76,6 @@ export default function MJMLParser(xml, options = {}, includedIn = []) {
children: [],
}
cur.children.push(newNode)
- cur = newNode
return
}
|
fix #<I> cur when failed include
|
diff --git a/cloudplatform/service/camera/src/main/java/io/rhiot/cloudplatform/service/camera/spring/CameraServiceConfiguration.java b/cloudplatform/service/camera/src/main/java/io/rhiot/cloudplatform/service/camera/spring/CameraServiceConfiguration.java
index <HASH>..<HASH> 100644
--- a/cloudplatform/service/camera/src/main/java/io/rhiot/cloudplatform/service/camera/spring/CameraServiceConfiguration.java
+++ b/cloudplatform/service/camera/src/main/java/io/rhiot/cloudplatform/service/camera/spring/CameraServiceConfiguration.java
@@ -33,7 +33,7 @@ public class CameraServiceConfiguration {
@Bean(name = "camera")
CameraService cameraService(IoTConnector connector, ProducerTemplate producerTemplate,
- @Value("camera.imagesDirectory:/tmp/rhiot/camera") File imagesDirectory) {
+ @Value("${camera.imagesDirectory:/tmp/rhiot/camera}") File imagesDirectory) {
return new DefaultCameraService(connector, producerTemplate, imagesDirectory);
}
|
Create CameraService#process operation #<I>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ setup(
packages=find_packages(),
license="MIT",
keywords="wagtail cms model utility",
- download_url="https://github.com/rkhleics/wagailmenus/tarball/0.1",
+ download_url="https://github.com/rkhleics/wagailmenus/tarball/1.0.0",
url="https://github.com/rkhleics/wagailmenus",
include_package_data=True,
zip_safe=False,
|
Use tarball to match current version
|
diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index <HASH>..<HASH> 100644
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@ -634,11 +634,12 @@ class _HTTPConnection(httputil.HTTPMessageDelegate):
# redirect, the request method should be preserved.
# However, browsers implemented this by changing the
# method to GET, and the behavior stuck. 303 redirects
- # always specified this POST-to-GET behavior (arguably 303
- # redirects should change *all* requests to GET, but
- # libcurl only does this for POST so we follow their
- # example).
- if self.code in (301, 302, 303) and self.request.method == "POST":
+ # always specified this POST-to-GET behavior, arguably
+ # for *all* methods, but libcurl < 7.70 only does this
+ # for POST, while libcurl >= 7.70 does it for other methods.
+ if (self.code == 303 and self.request.method != "HEAD") or (
+ self.code in (301, 302) and self.request.method == "POST"
+ ):
new_request.method = "GET"
new_request.body = None
for h in [
|
simple_httpclient: after <I> redirect, turn all methods into GET
not just POST (but still not HEAD)
following the behavior of libcurl > <I>
|
diff --git a/src/main/java/com/couchbase/cblite/support/CBLMultipartReader.java b/src/main/java/com/couchbase/cblite/support/CBLMultipartReader.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/couchbase/cblite/support/CBLMultipartReader.java
+++ b/src/main/java/com/couchbase/cblite/support/CBLMultipartReader.java
@@ -145,7 +145,8 @@ public class CBLMultipartReader {
// The entire message might start with a boundary without a leading CRLF.
byte[] boundaryWithoutLeadingCRLF = getBoundaryWithoutLeadingCRLF();
if (bufLen >= boundaryWithoutLeadingCRLF.length) {
- if (Arrays.equals(buffer.toByteArray(), boundaryWithoutLeadingCRLF)) {
+ // if (Arrays.equals(buffer.toByteArray(), boundaryWithoutLeadingCRLF)) {
+ if (memcmp(buffer.toByteArray(), boundaryWithoutLeadingCRLF, boundaryWithoutLeadingCRLF.length)) {
deleteUpThrough(boundaryWithoutLeadingCRLF.length);
nextState = CBLMultipartReaderState.kInHeaders;
}
|
passes all tests! issue #<I>.
|
diff --git a/integration/rpctest/node.go b/integration/rpctest/node.go
index <HASH>..<HASH> 100644
--- a/integration/rpctest/node.go
+++ b/integration/rpctest/node.go
@@ -115,10 +115,6 @@ func (n *nodeConfig) arguments() []string {
args = append(args, fmt.Sprintf("--rpccert=%s", n.certFile))
// --rpckey
args = append(args, fmt.Sprintf("--rpckey=%s", n.keyFile))
- // --txindex
- args = append(args, "--txindex")
- // --addrindex
- args = append(args, "--addrindex")
if n.dataDir != "" {
// --datadir
args = append(args, fmt.Sprintf("--datadir=%s", n.dataDir))
|
integration/rpctest: disable the txindex by default
In this commit, we disable the txindex by default as the flag cannot be
overwritten by btcd once set.
|
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -1085,9 +1085,14 @@ EOT
},
:dynamicfacts => {
:default => "memorysize,memoryfree,swapsize,swapfree",
- :desc => "Facts that are dynamic; these facts will be ignored when deciding whether
+ :desc => "(Deprecated) Facts that are dynamic; these facts will be ignored when deciding whether
changed facts should result in a recompile. Multiple facts should be
comma-separated.",
+ :hook => proc { |value|
+ if value
+ Puppet.deprecation_warning "The dynamicfacts setting is deprecated and will be ignored."
+ end
+ }
},
:splaylimit => {
:default => "$runinterval",
|
Maint: Deprecate dynamicfacts setting
The dynamicfacts setting was used to avoid recompiling catalogs when
only transient related facts were modified, e.g. free memory. According
to Luke, this optimization was removed when "we disabled staleness
checking for catalogs, which was early in the <I> release cycle", see
ticket #<I>.
This commit deprecates the setting rather than removing it, because it
the setting was actually used at one time, unlike `ca_md`.
|
diff --git a/lib/app/assets/scripts/alchemy.js b/lib/app/assets/scripts/alchemy.js
index <HASH>..<HASH> 100644
--- a/lib/app/assets/scripts/alchemy.js
+++ b/lib/app/assets/scripts/alchemy.js
@@ -377,5 +377,32 @@ if (hawkejs.scene.exposed.enable_websockets) {
});
}
+/**
+ * Fetch date from the server
+ *
+ * @author Jelle De Loecker <jelle@develry.be>
+ * @since 0.4.0
+ * @version 0.4.0
+ */
+alchemy.fetch = function fetch(href, options, callback) {
+
+ var temp;
+
+ if (typeof href == 'object' && !(href instanceof Blast.Classes.URL)) {
+ callback = options;
+ options = href;
+ href = options.href;
+ }
+
+ // The href could be a resource name, try getting the url
+ temp = hawkejs.scene.helpers.Router.routeUrl(href);
+
+ if (temp) {
+ href = temp;
+ }
+
+ return hawkejs.scene.fetch(href, options, callback);
+};
+
__Protoblast.emit('alchemy-loaded');
}());
\ No newline at end of file
|
Add client-side alchemy.fetch method
|
diff --git a/molgenis-data/src/main/java/org/molgenis/data/meta/AttributeMetaDataRepositoryDecorator.java b/molgenis-data/src/main/java/org/molgenis/data/meta/AttributeMetaDataRepositoryDecorator.java
index <HASH>..<HASH> 100644
--- a/molgenis-data/src/main/java/org/molgenis/data/meta/AttributeMetaDataRepositoryDecorator.java
+++ b/molgenis-data/src/main/java/org/molgenis/data/meta/AttributeMetaDataRepositoryDecorator.java
@@ -298,7 +298,7 @@ public class AttributeMetaDataRepositoryDecorator implements Repository<Attribut
@Override
public void deleteAll(Stream<Object> ids)
{
- decoratedRepo.deleteById(ids.filter(id ->
+ decoratedRepo.deleteAll(ids.filter(id ->
{
validateAndDelete(findOneById(id));
return true;
|
FIX deleteAll calls wrong method on delegate
|
diff --git a/code/models/DocumentationEntity.php b/code/models/DocumentationEntity.php
index <HASH>..<HASH> 100755
--- a/code/models/DocumentationEntity.php
+++ b/code/models/DocumentationEntity.php
@@ -260,4 +260,17 @@ class DocumentationEntity extends ViewableData {
public function compare(DocumentationEntity $other) {
return version_compare($this->getVersion(), $other->getVersion());
}
+
+ /**
+ * @return array
+ */
+ public function toMap() {
+ return array(
+ 'Key' => $this->key,
+ 'Path' => $this->getPath(),
+ 'Version' => $this->getVersion(),
+ 'IsStable' => $this->getIsStable(),
+ 'Language' => $this->getLanguage()
+ );
+ }
}
\ No newline at end of file
|
Add DocumentationEntity::toMap() for assert compability
|
diff --git a/lib/kondate/cli.rb b/lib/kondate/cli.rb
index <HASH>..<HASH> 100644
--- a/lib/kondate/cli.rb
+++ b/lib/kondate/cli.rb
@@ -137,7 +137,7 @@ module Kondate
env['RUBYOPT'] = "-I #{Config.plugin_dir} -r bundler/setup -r ext/itamae/kondate"
property_files.each do |role, property_file|
next if property_file.empty?
- command = "bundle exec itamae ssh"
+ command = "itamae ssh"
command << " -h #{host}"
properties = property_file.load
@@ -185,7 +185,7 @@ module Kondate
env['TARGET_HOST'] = host
env['TARGET_NODE_FILE'] = property_file.path
- command = "bundle exec rspec #{spec_files.map{|f| f.shellescape }.join(' ')}"
+ command = "rspec #{spec_files.map{|f| f.shellescape }.join(' ')}"
$stdout.puts "env #{env.map {|k, v| "#{k}=#{v.shellescape}" }.join(' ')} #{command}"
return false unless system(env, command)
|
bundler exec inside bundle exec makes troubles
|
diff --git a/service/server/host/src/main/java/com/emc/pravega/service/server/host/selftest/Actor.java b/service/server/host/src/main/java/com/emc/pravega/service/server/host/selftest/Actor.java
index <HASH>..<HASH> 100644
--- a/service/server/host/src/main/java/com/emc/pravega/service/server/host/selftest/Actor.java
+++ b/service/server/host/src/main/java/com/emc/pravega/service/server/host/selftest/Actor.java
@@ -115,7 +115,7 @@ abstract class Actor extends AbstractService implements AutoCloseable {
} catch (Throwable ex) {
ex = ExceptionHelpers.getRealException(ex);
if (failureCause != null) {
- TestLogger.log(getLogId(), "Original Failure (%s).", failureCause);
+ TestLogger.log(getLogId(), "Original Failure: %s.", failureCause);
failureCause.printStackTrace();
failureCause = ex;
}
@@ -125,7 +125,7 @@ abstract class Actor extends AbstractService implements AutoCloseable {
if (failureCause == null) {
notifyStopped();
} else {
- TestLogger.log(getLogId(), "Failed (%s).", failureCause);
+ TestLogger.log(getLogId(), "Failed: %s.", failureCause);
notifyFailed(failureCause);
}
});
|
Update Actor.java
(almost) no-op commit to try to trigger build.
|
diff --git a/examples/mongodb/model.js b/examples/mongodb/model.js
index <HASH>..<HASH> 100755
--- a/examples/mongodb/model.js
+++ b/examples/mongodb/model.js
@@ -108,7 +108,10 @@ model.saveAccessToken = function (token, clientId, expires, userId, callback) {
model.getUser = function (username, password, callback) {
console.log('in getUser (username: ' + username + ', password: ' + password + ')');
- OAuthUsersModel.findOne({ username: username, password: password }, callback);
+ OAuthUsersModel.findOne({ username: username, password: password }, function(err, user) {
+ if(err) return callback(err);
+ callback(null, user._id);
+ });
};
/*
|
Fix in mongo model.getUser to only return the _id. Prevents full user object from being assigned to userId parameter in save methods.
Style changes to conform with module standards.
Adding return.
|
diff --git a/src/CartSubItem.php b/src/CartSubItem.php
index <HASH>..<HASH> 100644
--- a/src/CartSubItem.php
+++ b/src/CartSubItem.php
@@ -17,7 +17,6 @@ class CartSubItem
public $locale;
- public $items = [];
public $internationalFormat;
private $itemHash;
@@ -54,8 +53,8 @@ class CartSubItem
{
$price = $this->price;
- if(isset($this->options['items'])) {
- foreach ($this->options['items'] as $item) {
+ if(isset($this->items)) {
+ foreach ($this->items as $item) {
$price += $item->getPrice(false, false) + $item->subItemsTotal(false, false);
}
}
|
removing no used public varabiel
|
diff --git a/lib/kaminari/models/active_record_extension.rb b/lib/kaminari/models/active_record_extension.rb
index <HASH>..<HASH> 100644
--- a/lib/kaminari/models/active_record_extension.rb
+++ b/lib/kaminari/models/active_record_extension.rb
@@ -18,7 +18,7 @@ module Kaminari
include Kaminari::ActiveRecordRelationMethods
include Kaminari::PageScopeMethods
end
- end
+ end if kls.superclass == ActiveRecord::Base
end
end
end
|
Only add extensions to direct descendents of ActiveRecord::Base
|
diff --git a/fireplace/entity.py b/fireplace/entity.py
index <HASH>..<HASH> 100644
--- a/fireplace/entity.py
+++ b/fireplace/entity.py
@@ -97,7 +97,7 @@ class BuffableEntity(BaseEntity):
def clear_buffs(self):
if self.buffs:
self.log("Clearing buffs from %r", self)
- for buff in self.buffs:
+ for buff in self.buffs[:]:
buff.destroy()
diff --git a/tests/test_mechanics.py b/tests/test_mechanics.py
index <HASH>..<HASH> 100644
--- a/tests/test_mechanics.py
+++ b/tests/test_mechanics.py
@@ -594,6 +594,20 @@ def test_silence_deathrattle():
assert len(game.player1.field) == 0
+def test_silence_multiple_buffs():
+ game = prepare_game()
+ wisp = game.player1.give(WISP)
+ wisp.play()
+ assert wisp.atk == 1
+ # Play Blessing of Might (+3 attack) twice
+ game.player1.give("CS2_087").play(target=wisp)
+ assert wisp.atk == 1 + 3
+ game.player1.give("CS2_087").play(target=wisp)
+ assert wisp.atk == 1 + 3 + 3
+ game.player1.give(SILENCE).play(target=wisp)
+ assert wisp.atk == 1
+
+
def test_spell_power():
game = prepare_game(HUNTER, HUNTER)
|
Ensure multiple buffs are always removed on entity.clear_buffs()
Previously we would remove buffs from the buff list while iterating over
it. This could lead to premature termination of the loop and failure to
destroy all buffs.
|
diff --git a/provider/openstack/provider.go b/provider/openstack/provider.go
index <HASH>..<HASH> 100644
--- a/provider/openstack/provider.go
+++ b/provider/openstack/provider.go
@@ -2343,3 +2343,10 @@ func (*Environ) AreSpacesRoutable(ctx context.ProviderCallContext, space1, space
func (*Environ) SSHAddresses(ctx context.ProviderCallContext, addresses corenetwork.SpaceAddresses) (corenetwork.SpaceAddresses, error) {
return addresses, nil
}
+
+// SupportsRulesWithIPV6CIDRs returns true if the environment supports ingress
+// rules containing IPV6 CIDRs. It is part of the FirewallFeatureQuerier
+// interface.
+func (e *Environ) SupportsRulesWithIPV6CIDRs(ctx context.ProviderCallContext) (bool, error) {
+ return true, nil
+}
|
Implement FirewallFeatureQuerier for the openstack provider
Openstack supports IPV6 CIDRs for firewall ingress rules. To this end,
this commit implements SupportsRulesWithIPV6CIDRs for the openstack
provider.
|
diff --git a/cmem.js b/cmem.js
index <HASH>..<HASH> 100644
--- a/cmem.js
+++ b/cmem.js
@@ -11,7 +11,8 @@ function create() {
clear: { value: clear },
unit: { value: unit },
iterator: { value: iterator },
- memos: { value: [] }
+ memos: { value: [] },
+ noop: { value: _silent }
});
return cmem;
|
Added silent function to API as come.noop
|
diff --git a/cmd/gateway-main.go b/cmd/gateway-main.go
index <HASH>..<HASH> 100644
--- a/cmd/gateway-main.go
+++ b/cmd/gateway-main.go
@@ -135,7 +135,8 @@ func StartGateway(ctx *cli.Context, gw Gateway) {
handleCommonCmdArgs(ctx)
// Get port to listen on from gateway address
- _, gatewayPort, pErr := net.SplitHostPort(gatewayAddr)
+ var pErr error
+ _, globalMinioPort, pErr = net.SplitHostPort(gatewayAddr)
if pErr != nil {
logger.FatalIf(pErr, "Unable to start gateway")
}
@@ -144,7 +145,7 @@ func StartGateway(ctx *cli.Context, gw Gateway) {
// to IPv6 address ie minio will start listening on IPv6 address whereas another
// (non-)minio process is listening on IPv4 of given port.
// To avoid this error situation we check for port availability.
- logger.FatalIf(checkPortAvailability(gatewayPort), "Unable to start the gateway")
+ logger.FatalIf(checkPortAvailability(globalMinioPort), "Unable to start the gateway")
// Create certs path.
logger.FatalIf(createConfigDir(), "Unable to create configuration directories")
|
gateway: Properly set globalMinioPort (#<I>)
globalMinioPort is used in federation which stores the address
and the port number of the server hosting the specified bucket,
this latter uses globalMinioPort but this latter is not set in
startup of the gateway mode.
This commit fixes the behavior.
|
diff --git a/src/Fields/TextField.php b/src/Fields/TextField.php
index <HASH>..<HASH> 100644
--- a/src/Fields/TextField.php
+++ b/src/Fields/TextField.php
@@ -22,11 +22,6 @@ class TextField extends AbstractField
return $this;
}
- public function make(): FieldInterface
- {
- return (new TextField($this->getName()))->getValue();
- }
-
public function getTypeDefinition(): array
{
$properties = parent::getTypeDefinition();
|
Remove nonfunctional and unnecessary text field factory method
|
diff --git a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/MatchChunk.java b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/MatchChunk.java
index <HASH>..<HASH> 100644
--- a/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/MatchChunk.java
+++ b/jodd-db/src/main/java/jodd/db/oom/sqlgen/chunks/MatchChunk.java
@@ -57,7 +57,7 @@ public class MatchChunk extends SqlChunk {
}
int eq = expression.indexOf('=');
if (eq == -1) {
- throw new DbSqlBuilderException("Template syntax error, expected 'match' equality: {tableRef=objectRef}.");
+ throw new DbSqlBuilderException("Syntax error, expected 'match' equality: {tableRef=objectRef}.");
}
tableRef = expression.substring(0, eq).trim();
objectRef = expression.substring(eq + 1, lastNdx).trim();
@@ -97,6 +97,12 @@ public class MatchChunk extends SqlChunk {
continue;
}
}
+ // special case for strings
+ if (value instanceof CharSequence) {
+ if (StringUtil.isBlank((CharSequence) value)) {
+ continue;
+ }
+ }
}
if (count > 0) {
out.append(AND);
|
added special case for ignoring blank strings
|
diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/KVGrid.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/KVGrid.java
index <HASH>..<HASH> 100644
--- a/rapidoid-gui/src/main/java/org/rapidoid/gui/KVGrid.java
+++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/KVGrid.java
@@ -60,7 +60,8 @@ public class KVGrid extends AbstractWidget {
val = Lmbd.eval(valueView, val);
}
- tbl = tbl.append(tr(td(key), td(val)));
+ Tag tr = val != null ? tr(td(key), td(val)) : tr(td(key).colspan("2"));
+ tbl = tbl.append(tr);
}
return tbl;
|
Generating full rows in KVGrid from map entries with null value.
|
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -118,6 +118,11 @@ class Embark {
});
});
+ engine.events.on('outputDone', function () {
+ engine.logger.info("Looking for documentation? You can find it at ".cyan + "http://embark.readthedocs.io/".green.underline + ".".cyan);
+ engine.logger.info("Ready".underline);
+ });
+
engine.deployManager.deployContracts(function (err) {
engine.startService("fileWatcher");
if (options.runWebserver) {
@@ -136,8 +141,6 @@ class Embark {
} else {
engine.events.emit('firstDeploymentDone');
engine.events.emit("status", "Ready".green);
- engine.logger.info("Looking for documentation? you can find it at ".cyan + "http://embark.readthedocs.io/".green.underline);
- engine.logger.info("Ready".underline);
let size = windowSize.get();
if (size.height < 40 || size.width < 118) {
@@ -249,7 +252,6 @@ class Embark {
resetCmd();
}
- // TODO: should deploy if it hasn't already
upload(platform, options) {
options.buildDir = 'dist/';
|
Moved console "ready" message to write after outputDone event is emitted
|
diff --git a/bridge.go b/bridge.go
index <HASH>..<HASH> 100644
--- a/bridge.go
+++ b/bridge.go
@@ -221,10 +221,15 @@ func (bridge *Bridge) GetAllLights() ([]Light, error) {
for index := 1; index < 101; index++ {
light, err := bridge.GetLightByIndex(index)
if err != nil {
- break
+ break // Final light index reached, index does not exist.
}
lights = append(lights, light)
}
+ if len(lights) == 0 {
+ err := errors.New("Error: No lights found by GetAllLights.")
+ log.Println(err)
+ return lights, err
+ }
return lights, nil
}
|
Implemented error catching on GetAllLights if no lights are found.
|
diff --git a/lib/oneview-sdk/resource/api200/volume.rb b/lib/oneview-sdk/resource/api200/volume.rb
index <HASH>..<HASH> 100644
--- a/lib/oneview-sdk/resource/api200/volume.rb
+++ b/lib/oneview-sdk/resource/api200/volume.rb
@@ -123,7 +123,8 @@ module OneviewSDK
# @return [true] if snapshot was created successfully
def delete_snapshot(name)
result = get_snapshot(name)
- response = @client.rest_delete(result['uri'], { 'If-Match' => @data['eTag'] }, @api_version)
+ puts "hi"
+ response = @client.rest_delete(result['uri'], { 'If-Match' => result['eTag'] }, @api_version)
@client.response_handler(response)
true
end
|
Snapshot delete fix with correct etags
|
diff --git a/source/node/Entry.js b/source/node/Entry.js
index <HASH>..<HASH> 100644
--- a/source/node/Entry.js
+++ b/source/node/Entry.js
@@ -226,7 +226,6 @@ class Entry {
}
const raw = this._getRemoteObject().properties;
- var result = [];
if (!(propertyExpression instanceof RegExp)) {
propertyExpression = new RegExp(propertyExpression);
|
Remove unused var added in PR#<I>
|
diff --git a/src/org/zaproxy/zap/extension/dynssl/ExtensionDynSSL.java b/src/org/zaproxy/zap/extension/dynssl/ExtensionDynSSL.java
index <HASH>..<HASH> 100644
--- a/src/org/zaproxy/zap/extension/dynssl/ExtensionDynSSL.java
+++ b/src/org/zaproxy/zap/extension/dynssl/ExtensionDynSSL.java
@@ -73,7 +73,7 @@ public class ExtensionDynSSL extends ExtensionAdaptor {
try {
createNewRootCa();
} catch (Exception e) {
- logger.error(e.getMessage(), e);
+ logger.error("Failed to create new root CA certificate:", e);
}
}
}).start();
@@ -92,10 +92,11 @@ public class ExtensionDynSSL extends ExtensionAdaptor {
}
public void createNewRootCa() throws NoSuchAlgorithmException, UnrecoverableKeyException, KeyStoreException {
- logger.info("Creating new root CA");
+ logger.info("Creating new root CA certificate");
KeyStore newrootca = SslCertificateUtils.createRootCA();
setRootCa(newrootca);
getParams().setRootca(newrootca);
+ logger.info("New root CA certificate created");
}
private DynamicSSLPanel getOptionsPanel() {
|
Log that the root CA certificate was created
The creation of root CA certificate, if successful, just logs "Creating
new root CA", which is very misleading giving the impression that ZAP
hanged, as reported in #<I>.
With the change it always logs something either that it was created or,
if something went wrong, the exception.
Tweak existing log messages to include "certificate", also change log of
the exception to explicitly say that the creation of root CA certificate
failed.
|
diff --git a/ffn/core.py b/ffn/core.py
index <HASH>..<HASH> 100644
--- a/ffn/core.py
+++ b/ffn/core.py
@@ -858,6 +858,16 @@ class GroupStats(dict):
def plot_correlation(self, period='m', title=None,
figsize=(12, 6), **kwargs):
+ """
+ Utility function to plot correlations.
+
+ Args:
+ * period (str): Pandas offset alias string
+ * title (str): Plot title
+ * figsize (tuple (x,y)): figure size
+ * kwargs: passed to Pandas' plot_corr_heatmap function
+
+ """
if title is None:
title = '%s return correlation matrix' % get_period_name(period)
|
added doctring for plot_correlation
|
diff --git a/cnab240/errors.py b/cnab240/errors.py
index <HASH>..<HASH> 100644
--- a/cnab240/errors.py
+++ b/cnab240/errors.py
@@ -11,7 +11,7 @@ class AtribuicaoCampoError(Cnab240Error):
def __init__(self, campo, valor):
self.campo = campo
self.valor = valor
- super(AtribuicaoCampoError, self).__init__(self)
+ super(AtribuicaoCampoError, self).__init__()
def __unicode__(self):
return u'campo:{0} formato:{1} decimais:{2} digitos:{3} - valor:{4}'.\
@@ -41,7 +41,7 @@ class FaltandoArgsError(Cnab240Error):
def __init__(self, args_faltantes):
self.args_faltantes = args_faltantes
- super(FaltandoArgsError, self).__init__(self)
+ super(FaltandoArgsError, self).__init__()
def __unicode__(self):
return (u'Os seguintes kwargs sao obrigatorios e nao foram '
|
Avoid recursion error when trying to print TipoError exception
|
diff --git a/builder/parallels/common/step_test.go b/builder/parallels/common/step_test.go
index <HASH>..<HASH> 100644
--- a/builder/parallels/common/step_test.go
+++ b/builder/parallels/common/step_test.go
@@ -9,6 +9,7 @@ import (
func testState(t *testing.T) multistep.StateBag {
state := new(multistep.BasicStateBag)
+ state.Put("debug", false)
state.Put("driver", new(DriverMock))
state.Put("ui", &packer.BasicUi{
Reader: new(bytes.Buffer),
|
Fix unit tests, broken in #<I>. (#<I>)
|
diff --git a/lib/wlang/version.rb b/lib/wlang/version.rb
index <HASH>..<HASH> 100644
--- a/lib/wlang/version.rb
+++ b/lib/wlang/version.rb
@@ -3,7 +3,7 @@ module WLang
MAJOR = 3
MINOR = 0
- TINY = 0
+ TINY = 1
def self.to_s
[ MAJOR, MINOR, TINY ].join('.')
|
Bump to <I> and release.
|
diff --git a/src/Validation/UploadValidator.php b/src/Validation/UploadValidator.php
index <HASH>..<HASH> 100644
--- a/src/Validation/UploadValidator.php
+++ b/src/Validation/UploadValidator.php
@@ -34,7 +34,7 @@ class UploadValidator extends Validator {
*
* @var string
*/
- protected $_fileSize = 0;
+ protected $_filesize = 0;
/**
* Upload error message.
@@ -89,8 +89,8 @@ class UploadValidator extends Validator {
* @return boolean
*/
public function fileSize($value, $size, $operator = '>') {
- $this->_fileSize = $value['size'];
- return $this->_validateSize($value['size'], $operator, $size);
+ $this->_filesize = $value['size'];
+ return Validation::fileSize($value, $operator, $size);
}
/**
|
#<I> Fixing the file size validation.
|
diff --git a/type_converter/TypeConverter.php b/type_converter/TypeConverter.php
index <HASH>..<HASH> 100644
--- a/type_converter/TypeConverter.php
+++ b/type_converter/TypeConverter.php
@@ -384,7 +384,7 @@ class TypeConverter {
$xml = @simplexml_load_string($xml);
}
- if ($xml->count() <= 0) {
+ if (count($xml->children()) <= 0) {
return (string)$xml;
}
@@ -408,7 +408,7 @@ class TypeConverter {
'value' => (string)$node
);
- if ($node->count() > 0) {
+ if (count($node->children()) > 0) {
$data['value'] = self::xmlToArray($node, $format);
}
@@ -420,7 +420,7 @@ class TypeConverter {
case self::XML_MERGE:
case self::XML_OVERWRITE:
if ($format == self::XML_MERGE) {
- if ($node->count() > 0) {
+ if (count($node->children()) > 0) {
$data = $data + self::xmlToArray($node, $format);
} else {
$data['value'] = (string)$node;
|
Updated to support PHP <I>
|
diff --git a/src/event.js b/src/event.js
index <HASH>..<HASH> 100644
--- a/src/event.js
+++ b/src/event.js
@@ -778,9 +778,11 @@ jQuery.each(["bind", "one"], function( i, name ) {
jQuery( this ).unbind( event, handler );
return fn.apply( this, arguments );
}) : fn;
- return type === "unload" ? this.one(type, data, handler, thisObject) : this.each(function() {
- jQuery.event.add( this, type, handler, data );
- });
+ return type === "unload" && name !== "one" ?
+ this.one( type, data, fn, thisObject ) :
+ this.each(function() {
+ jQuery.event.add( this, type, handler, data );
+ });
};
});
|
When .bind('unload') was called it accidentally went recursive, from 1bac<I>b6c<I>ab4bcfc<I>b0d<I>c<I>dd<I>. Fixes #<I>.
|
diff --git a/lib/xhive/widgify.rb b/lib/xhive/widgify.rb
index <HASH>..<HASH> 100644
--- a/lib/xhive/widgify.rb
+++ b/lib/xhive/widgify.rb
@@ -28,13 +28,19 @@ module Xhive
end
def normalized_routes
- routes = Rails.application.routes.routes.to_a | Xhive::Engine.routes.routes.to_a
+ load_routes_for(Rails.application.routes) | load_routes_for(Xhive::Engine.routes)
+ end
+
+ def load_routes_for(router)
+ # TODO: find another way to get the routes prefix. This might get changed as is not public API.
+ mount_point = router._generate_prefix({}).to_s
+ routes = router.routes.to_a
routes.collect do |route|
if route.requirements[:controller] && route.requirements[:action]
controller = route.requirements[:controller].gsub(/rails\/|xhive\//, '')
action = route.requirements[:action]
path = route.path.spec.to_s
- { :end_point => "#{controller}##{action}", :path => path }
+ { :end_point => "#{controller}##{action}", :path => "#{mount_point}#{path}" }
end
end.compact
end
|
Changes to how the routes are built
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,6 +14,12 @@
*/
module.exports = function (grunt) {
+ // One may filter tests to be run; useful for debugging.
+ // Usage (any regexp should do):
+ // grunt jasmine_node --grep=load_plugin
+ // grunt jasmine_node --grep="(event.*|config)"
+ var grep = grunt.option('grep') || "";
+
grunt.initConfig({
jshint: {
all : ['package.json', 'grunt.js', 'lib/**/*.js', 'spec/**/*.spec.js', '!lib/**/html5shiv.js'],
@@ -27,6 +33,7 @@ module.exports = function (grunt) {
tasks: ['dev']
},
jasmine_node: {
+ match : grep + ".", // "." is the default
forceExit: true
},
beautify: {
|
Filter tests to be run by jasmine
Possibility to filter which attester specs should run;
useful for debugging attester.
Usage:
grunt jasmine_node --grep=<pattern>
Close #<I>.
|
diff --git a/src/lib/connectTraceToPlot.js b/src/lib/connectTraceToPlot.js
index <HASH>..<HASH> 100644
--- a/src/lib/connectTraceToPlot.js
+++ b/src/lib/connectTraceToPlot.js
@@ -55,6 +55,11 @@ export default function connectTraceToPlot(WrappedComponent) {
};
this.icon = renderTraceIcon(plotlyTraceToCustomTrace(trace));
this.name = fullTrace.name;
+
+ const DEFAULT_FIN_CHART_TRACE_NAME = '- increasing';
+ if (fullTrace.name.indexOf(DEFAULT_FIN_CHART_TRACE_NAME) && !trace.name) {
+ this.name = fullTrace.name.replace(DEFAULT_FIN_CHART_TRACE_NAME, '');
+ }
}
getChildContext() {
|
Remove the additional plotly.js '- increasing' label from trace names if no trace.name was set by user
|
diff --git a/providers/providers_test.go b/providers/providers_test.go
index <HASH>..<HASH> 100644
--- a/providers/providers_test.go
+++ b/providers/providers_test.go
@@ -206,3 +206,26 @@ func TestLargeProvidersSet(t *testing.T) {
}
//*/
+
+func TestUponCacheMissProvidersAreReadFromDatastore(t *testing.T) {
+ old := lruCacheSize
+ lruCacheSize = 1
+ defer func() { lruCacheSize = old }()
+ ctx := context.Background()
+
+ p1, p2 := peer.ID("a"), peer.ID("b")
+ c1 := cid.NewCidV1(cid.CBOR, u.Hash([]byte("1")))
+ c2 := cid.NewCidV1(cid.CBOR, u.Hash([]byte("2")))
+ pm := NewProviderManager(ctx, p1, ds.NewMapDatastore())
+
+ pm.AddProvider(ctx, c1, p1)
+ // make the cached provider for c1 go to datastore
+ pm.AddProvider(ctx, c2, p1)
+ // now just offloaded record should be brought back and joined with p2
+ pm.AddProvider(ctx, c1, p2)
+
+ c1Provs := pm.GetProviders(ctx, c1)
+ if len(c1Provs) != 2 {
+ t.Fatalf("expected c1 to be provided by 2 peers, is by %d", len(c1Provs))
+ }
+}
|
Test if datastore is checked upon cache miss on adding providers
License: MIT
|
diff --git a/lib/rack/app/singleton_methods/route_handling.rb b/lib/rack/app/singleton_methods/route_handling.rb
index <HASH>..<HASH> 100644
--- a/lib/rack/app/singleton_methods/route_handling.rb
+++ b/lib/rack/app/singleton_methods/route_handling.rb
@@ -57,8 +57,8 @@ module Rack::App::SingletonMethods::RouteHandling
@namespaces ||= []
@namespaces.push(request_path_namespace)
yield
+ ensure
@namespaces.pop
- nil
end
end
|
refactor: move namespace pop part to ensure block
|
diff --git a/lib/thinking_sphinx.rb b/lib/thinking_sphinx.rb
index <HASH>..<HASH> 100644
--- a/lib/thinking_sphinx.rb
+++ b/lib/thinking_sphinx.rb
@@ -1,6 +1,7 @@
if RUBY_PLATFORM == 'java'
require 'java'
require 'jdbc/mysql'
+ Jdbc::MySQL.load_driver
else
require 'mysql2'
end
|
Make sure MySQL driver is loaded for JDBC.
|
diff --git a/lib/foreman_discovery/engine.rb b/lib/foreman_discovery/engine.rb
index <HASH>..<HASH> 100644
--- a/lib/foreman_discovery/engine.rb
+++ b/lib/foreman_discovery/engine.rb
@@ -173,10 +173,6 @@ module ForemanDiscovery
# add dashboard widget
widget 'discovery_widget', :name=>N_('Discovered Hosts'), :sizex => 6, :sizey =>1
- # allowed helpers and variables
- allowed_template_helpers :rand
- allowed_template_variables :kexec_kernel, :kexec_initrd
-
template_labels 'kexec' => N_('Discovery Kexec template')
# apipie API documentation
|
Fixes #<I> - Removing macros that are in core
Removing allowance of macros and variables because they are now live in
core.
|
diff --git a/testing/python/setup_plan.py b/testing/python/setup_plan.py
index <HASH>..<HASH> 100644
--- a/testing/python/setup_plan.py
+++ b/testing/python/setup_plan.py
@@ -1,4 +1,5 @@
def test_show_fixtures_and_test(testdir):
+ """ Verifies that fixtures are not executed. """
p = testdir.makepyfile('''
import pytest
@pytest.fixture
|
Improve commenting for setupplan unittest.
|
diff --git a/js/Axis.js b/js/Axis.js
index <HASH>..<HASH> 100644
--- a/js/Axis.js
+++ b/js/Axis.js
@@ -53,6 +53,10 @@ Axis.prototype = {
this._calculateTicks();
}
}
+
+ // Ticks to strings
+ _.each(this.ticks, function (tick) { tick.label += ''; });
+ _.each(this.minorTicks, function (tick) { tick.label += ''; });
},
/**
|
Cast ticks to strings.
Ensure ticks are strings before proceding. Tick formatters may return a
number. We should not blow up because of this. Fixes #<I>.
|
diff --git a/gwpy/table/tests/test_gravityspy.py b/gwpy/table/tests/test_gravityspy.py
index <HASH>..<HASH> 100644
--- a/gwpy/table/tests/test_gravityspy.py
+++ b/gwpy/table/tests/test_gravityspy.py
@@ -35,12 +35,12 @@ JSON_RESPONSE = {
"url4": [u"https://panoptes-uploads.zooniverse.org/production/"
"subject_location/08895951-ea30-4cf7-9374-135a335afe0e.png"],
"peak_frequency": [84.4759674072266],
- "links_subjects": [5740011],
+ "links_subjects": [5740011.0],
"ml_label": [u"Scratchy"],
"searchedID": [u"8FHTgA8MEu"],
"snr": [8.96664047241211],
"gravityspy_id": [u"8FHTgA8MEu"],
- "searchedzooID": [5740011],
+ "searchedzooID": [5740011.0],
"ifo": [u"H1"],
"url3": [u"https://panoptes-uploads.zooniverse.org/production/"
"subject_location/415dde44-3109-434c-b3ad-b722a879c159.png"],
|
Ah yes the great int does not equal float dtype fail.
|
diff --git a/scout/server/blueprints/cases/controllers.py b/scout/server/blueprints/cases/controllers.py
index <HASH>..<HASH> 100644
--- a/scout/server/blueprints/cases/controllers.py
+++ b/scout/server/blueprints/cases/controllers.py
@@ -59,8 +59,8 @@ def case(store, institute_obj, case_obj):
case_obj['panel_names'] = []
for panel_info in case_obj.get('panels', []):
if panel_info.get('is_default'):
- panel_obj = store.panel(panel_info['panel_id'])
- distinct_genes.update([gene['hgnc_id'] for gene in panel_obj['genes']])
+ panel_obj = store.gene_panel(panel_info['panel_name'], version=panel_info.get('version'))
+ distinct_genes.update([gene['hgnc_id'] for gene in panel_obj.get('genes', [])])
full_name = "{} ({})".format(panel_obj['display_name'], panel_obj['version'])
case_obj['panel_names'].append(full_name)
case_obj['default_genes'] = list(distinct_genes)
|
Fetch correct gene panels in controller for cases
|
diff --git a/cartoframes/context.py b/cartoframes/context.py
index <HASH>..<HASH> 100644
--- a/cartoframes/context.py
+++ b/cartoframes/context.py
@@ -335,13 +335,13 @@ class CartoContext(object):
the length of the DataFrame.
""" # noqa
tqdm.write('Params: encode_geom, geom_col and everything in kwargs are deprecated and not being used any more')
- dataset = Dataset.from_dataframe(df, table_name=table_name, context=self)
+ dataset = Dataset.from_dataframe(df)
if_exists = Dataset.FAIL
if overwrite:
if_exists = Dataset.REPLACE
- dataset = dataset.upload(with_lonlat=lnglat, if_exists=if_exists)
+ dataset = dataset.upload(with_lonlat=lnglat, if_exists=if_exists, table_name=table_name, context=self)
tqdm.write('Table successfully written to CARTO: {table_url}'.format(
table_url=utils.join_url(self.creds.base_url(),
@@ -1577,8 +1577,7 @@ class CartoContext(object):
if persist_as:
dataset = Dataset.from_query(query, context=self)
- dataset.table_name = persist_as
- dataset.upload()
+ dataset.upload(table_name=persist_as)
result = dataset.download(decode_geom=True)
else:
result = self.fetch(query, decode_geom=True)
|
using upload method with new params
|
diff --git a/huobitrade/service.py b/huobitrade/service.py
index <HASH>..<HASH> 100644
--- a/huobitrade/service.py
+++ b/huobitrade/service.py
@@ -730,7 +730,7 @@ class HBRestAPI(metaclass=Singleton):
class HBDerivativesRestAPI(metaclass=Singleton):
- def __init__(self, url=None, keys=None, get_acc=False):
+ def __init__(self, url=None, keys=None):
"""
火币合约REST API封装
:param url: 传入url，若为None，默认是https://api.hbdm.com
@@ -740,17 +740,7 @@ class HBDerivativesRestAPI(metaclass=Singleton):
if keys:
setKey(*keys)
- if get_acc:
- try:
- accounts = self.get_accounts()['data']
- self.acc_id = self.get_accounts()['data'][0]['id']
- if len(accounts) > 1:
- warnings.warn(f'默认设置acc_id为{self.acc_id}')
- except Exception as e:
- raise Exception(f'Failed to get account: key may not be set ->{e}')
- def set_acc_id(self, acc_id):
- self.acc_id = acc_id
def __async_request_exception_handler(self, req, e):
logger.error(f'async_request:{req}--exception:{e}')
|
debug, derivatives trading did not need acc_id
|
diff --git a/library/oxAcceptanceTestCase.php b/library/oxAcceptanceTestCase.php
index <HASH>..<HASH> 100644
--- a/library/oxAcceptanceTestCase.php
+++ b/library/oxAcceptanceTestCase.php
@@ -1764,7 +1764,8 @@ class oxAcceptanceTestCase extends oxMinkWrapper
public function clearCookies()
{
$testConfig = new oxTestConfig();
- $this->open($testConfig->getShopUrl() . '/_cc.php?' . time());
+ $shopUrl = preg_replace("|(https?://[^:/]*?):[0-9]+|", '$1', $testConfig->getShopUrl());
+ $this->open($shopUrl . '/_cc.php');
if ($this->getHtmlSource() != '<head></head><body></body>') {
$this->getMinkSession()->stop();
}
|
Fix clearing cookies when varnish is enabled
_cc is unable to clear browser cookies when called via varnish url (url with port), therefore port is removed before calling this file.
|
diff --git a/lib/zendesk2/version.rb b/lib/zendesk2/version.rb
index <HASH>..<HASH> 100644
--- a/lib/zendesk2/version.rb
+++ b/lib/zendesk2/version.rb
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module Zendesk2
- VERSION = '1.12.0'.freeze
+ VERSION = '1.13.0'.freeze
end
|
Bump zendesk2 to <I>
|
diff --git a/internetarchive/iacli/ia_delete.py b/internetarchive/iacli/ia_delete.py
index <HASH>..<HASH> 100755
--- a/internetarchive/iacli/ia_delete.py
+++ b/internetarchive/iacli/ia_delete.py
@@ -56,6 +56,10 @@ def main(argv):
files = [f for f in [item.get_file(f) for f in fnames] if f]
+ if not files:
+ sys.stderr.write(' warning: no files found, nothing deleted.\n')
+ sys.exit(1)
+
for f in files:
if not f:
if verbose:
|
better error message if no file is found to delete.
|
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='py-august',
- version='0.2.0',
+ version='0.3.0',
packages=['august'],
url='https://github.com/snjoetw/py-august',
license='MIT',
|
- Bumped version to <I>
|
diff --git a/keyring/backends/fail.py b/keyring/backends/fail.py
index <HASH>..<HASH> 100644
--- a/keyring/backends/fail.py
+++ b/keyring/backends/fail.py
@@ -9,12 +9,12 @@ class Keyring(KeyringBackend):
>>> kr.get_password('svc', 'user')
Traceback (most recent call last):
...
- RuntimeError: ...
+ RuntimeError: ...No recommended backend...
"""
priority = 0
def get_password(self, service, username, password=None):
- raise RuntimeError("No recommended password was available")
+ raise RuntimeError("No recommended backend was available")
set_password = delete_pasword = get_password
|
Correct error message to better communicate what is missing. Ref #<I>.
|
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -58,12 +58,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
protected $startTime;
protected $loadClassCache;
- const VERSION = '3.2.5';
- const VERSION_ID = 30205;
+ const VERSION = '3.2.6-DEV';
+ const VERSION_ID = 30206;
const MAJOR_VERSION = 3;
const MINOR_VERSION = 2;
- const RELEASE_VERSION = 5;
- const EXTRA_VERSION = '';
+ const RELEASE_VERSION = 6;
+ const EXTRA_VERSION = 'DEV';
const END_OF_MAINTENANCE = '07/2017';
const END_OF_LIFE = '01/2018';
|
bumped Symfony version to <I>
|
diff --git a/spec/visitors/chewy_term_filter/visit_value_spec.rb b/spec/visitors/chewy_term_filter/visit_value_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/visitors/chewy_term_filter/visit_value_spec.rb
+++ b/spec/visitors/chewy_term_filter/visit_value_spec.rb
@@ -2,15 +2,15 @@ require 'spec_helper'
describe MSFL::Visitors::ChewyTermFilter do
- let(:collector) { Array.new }
+ subject { node.accept visitor }
let(:node) { fail ArgumentError, "You must define the node variable in each scope." }
- let(:test_instance) { described_class.new }
+ let(:visitor) { described_class.new collector }
- describe "#visit_MSFL_Nodes_Boolean" do
+ let(:collector) { Array.new }
- subject { test_instance.visit_MSFL_Nodes_Boolean node, collector }
+ describe "visiting a Boolean node" do
let(:node) { MSFL::Nodes::Boolean.new value }
@@ -33,9 +33,7 @@ describe MSFL::Visitors::ChewyTermFilter do
end
end
- describe "#visit_MSFL_Nodes_Word" do
-
- subject { test_instance.visit_MSFL_Nodes_Word node, collector }
+ describe "visiting a Word node" do
let(:node) { MSFL::Nodes::Word.new "node_content" }
|
Updated visit_value_spec to conform with new visit_ testing convention
|
diff --git a/test/spec/selectBoxItSpec.js b/test/spec/selectBoxItSpec.js
index <HASH>..<HASH> 100644
--- a/test/spec/selectBoxItSpec.js
+++ b/test/spec/selectBoxItSpec.js
@@ -25,7 +25,7 @@ describe('selectBoxIt jQuery Plugin', function () {
expect(selectBoxIt.div).toExist();
- expect(selectBoxIt.div).toBe("div");
+ expect(selectBoxIt.div).toBe("span");
expect(selectBoxIt.div).toBeVisible();
|
Updated SelectBoxIt tests suite to look for a span instead of a div
|
diff --git a/src/backends/backend.js b/src/backends/backend.js
index <HASH>..<HASH> 100644
--- a/src/backends/backend.js
+++ b/src/backends/backend.js
@@ -30,7 +30,7 @@ const slugFormatter = (template = "{{slug}}", entryData) => {
const getIdentifier = (entryData) => {
const validIdentifierFields = ["title", "path"];
const identifiers = validIdentifierFields.map((field) =>
- entryData.find((_, key) => key.toLowerCase() === field)
+ entryData.find((_, key) => key.toLowerCase().trim() === field)
);
const identifier = identifiers.find(ident => ident !== undefined);
|
Change .find() predicate to not reject field names based on spurious whitespace.
|
diff --git a/drivers/bridge/bridge.go b/drivers/bridge/bridge.go
index <HASH>..<HASH> 100644
--- a/drivers/bridge/bridge.go
+++ b/drivers/bridge/bridge.go
@@ -926,6 +926,11 @@ func (d *driver) CreateEndpoint(nid, eid types.UUID, epInfo driverapi.EndpointIn
}
endpoint.macAddress = mac
+ // Up the host interface after finishing all netlink configuration
+ if err := netlink.LinkSetUp(host); err != nil {
+ return fmt.Errorf("could not set link up for host interface %s: %v", hostIfName, err)
+ }
+
// v6 address for the sandbox side pipe interface
ipv6Addr = &net.IPNet{}
if config.EnableIPv6 {
|
Manually bring up the host side veth interface
In preparation for the new update of vishvananda/netlink package
we need to bringup the host veth interface manually.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup(
packages=['spreadsheetresponsemixin'],
include_package_data=True,
license=LICENSE,
- description='An mixin for views with a queryset that provides a CSV/Excel export.',
+ description='A mixin for views with a queryset that provides a CSV/Excel export.',
long_description=README,
url='https://github.com/birdsarah/django-spreadsheetresponsemixin',
author='Sarah Bird',
|
setup.py description grammar fix
Changing "An mixin" to "A mixin"
|
diff --git a/tutorials/xhrPagingDemo.js b/tutorials/xhrPagingDemo.js
index <HASH>..<HASH> 100644
--- a/tutorials/xhrPagingDemo.js
+++ b/tutorials/xhrPagingDemo.js
@@ -72,7 +72,7 @@ function demo() {
callback(data, offset, rows);
});
// rows is not used by this API, other APIs usually define some sort of records per page
- url = 'http://jservice.io/api/clues?offset=:offset'
+ url = 'https://jservice.io/api/clues?offset=:offset'
.replace(':offset', offset)
.replace(':rows', rows);
xhr.open('GET', url);
|
changed to https, but it probably wont help
|
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index <HASH>..<HASH> 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -12,7 +12,7 @@ Rails::Initializer.run do |config|
# -- all .rb files in that directory are automatically loaded.
# Add additional load paths for your own custom dirs
- # config.load_paths += %w( #{RAILS_ROOT}/extras )
+ # config.load_paths += %W( #{RAILS_ROOT}/extras )
# Specify gems that this application depends on and have them installed with rake gems:install
# config.gem "bj"
@@ -36,6 +36,6 @@ Rails::Initializer.run do |config|
config.time_zone = 'UTC'
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
- # config.i18n.load_path << Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
+ # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
# config.i18n.default_locale = :de
end
\ No newline at end of file
|
Github comments are an excellent way to perform community code review -- keep it up!
|
diff --git a/src/Robo/Commands/Tests/BehatCommand.php b/src/Robo/Commands/Tests/BehatCommand.php
index <HASH>..<HASH> 100644
--- a/src/Robo/Commands/Tests/BehatCommand.php
+++ b/src/Robo/Commands/Tests/BehatCommand.php
@@ -127,6 +127,8 @@ class BehatCommand extends TestsCommandBase {
->option("webdriver", 4444)
->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERBOSE)
->background()
+ ->timeout(6000)
+ ->silent(true)
->run();
}
|
Increasing timeout for PhantomJS.
|
diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index <HASH>..<HASH> 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -45,7 +45,7 @@ let librariesRegistered = false;
`Application` class, which will be run by Ember when the application is
initialized.
- ```javascript
+ ```app/app.js
const App = Application.extend({
ready() {
// your code here
|
Update packages/@ember/application/lib/application.js
|
diff --git a/src/codemod.py b/src/codemod.py
index <HASH>..<HASH> 100755
--- a/src/codemod.py
+++ b/src/codemod.py
@@ -780,7 +780,7 @@ def _parse_command_line():
parser.add_argument('-m', action='store_true',
help='Have regex work over multiple lines (e.g. have dot match newlines). '
'By default, codemod applies the regex one line at a time.')
- parser.add_argument('-d', action='store', type=str,
+ parser.add_argument('-d', action='store', type=str, default='.',
help='The path whose descendent files are to be explored. '
'Defaults to current dir.')
|
Fix default param for directory
Without this, running without -d simply fails with an error since the directory is None instead of .
|
diff --git a/receive_stream.go b/receive_stream.go
index <HASH>..<HASH> 100644
--- a/receive_stream.go
+++ b/receive_stream.go
@@ -29,7 +29,6 @@ type receiveStream struct {
sender streamSender
frameQueue *frameSorter
- readOffset protocol.ByteCount
finalOffset protocol.ByteCount
currentFrame []byte
@@ -169,7 +168,6 @@ func (s *receiveStream) readImpl(p []byte) (bool /*stream completed */, int, err
m := copy(p[bytesRead:], s.currentFrame[s.readPosInFrame:])
s.readPosInFrame += m
bytesRead += m
- s.readOffset += protocol.ByteCount(m)
s.mutex.Lock()
// when a RESET_STREAM was received, the was already informed about the final byteOffset for this stream
|
remove unused readOffset member variable in receiveStream
|
diff --git a/mollie/api/objects/order.py b/mollie/api/objects/order.py
index <HASH>..<HASH> 100644
--- a/mollie/api/objects/order.py
+++ b/mollie/api/objects/order.py
@@ -146,7 +146,7 @@ class Order(Base):
refund = OrderRefunds(self.client).on(self).create(data, **params)
return refund
- def cancel_lines(self, data=None, **params):
+ def cancel_lines(self, data=None):
"""Cancel the lines given. When no lines are given, cancel all the lines.
Canceling an order line causes the order line status to change to canceled.
@@ -154,7 +154,7 @@ class Order(Base):
"""
from ..resources.order_lines import OrderLines
- canceled = OrderLines(self.client).on(self).delete(data, **params)
+ canceled = OrderLines(self.client).on(self).delete(data)
return canceled
@property
|
**params are not useful nor supported when sending a DELETE
|
diff --git a/lexicon/providers/auto.py b/lexicon/providers/auto.py
index <HASH>..<HASH> 100644
--- a/lexicon/providers/auto.py
+++ b/lexicon/providers/auto.py
@@ -44,13 +44,13 @@ def _get_ns_records_for_domain(domain):
# Available both for Windows and Linux (if dnsutils is installed for the latter)
try:
output = subprocess.check_output(['nslookup', '-querytype=NS', domain],
- stderr=subprocess.STDOUT)
+ stderr=subprocess.STDOUT, universal_newlines=True)
except subprocess.CalledProcessError as e:
if 'NXDOMAIN' in e.output:
raise ValueError('Error, domain {0} could not be resolved.'.format(domain))
pattern = re.compile(r'nameserver = (.*?)\.*{0}'.format(os.linesep))
- match = pattern.findall(output.decode())
+ match = pattern.findall(output)
if not match:
raise ValueError('Error, could not find ns entries for domain {0}. '
|
Protect nslookup call against non-ANSI and non-UTF8 output
|
diff --git a/eth/vm/code_stream.py b/eth/vm/code_stream.py
index <HASH>..<HASH> 100644
--- a/eth/vm/code_stream.py
+++ b/eth/vm/code_stream.py
@@ -39,12 +39,18 @@ class CodeStream(object):
def __len__(self) -> int:
return self._length_cache
- def __iter__(self) -> 'CodeStream':
- return self
-
def __getitem__(self, i: int) -> int:
return self._raw_code_bytes[i]
+ def __iter__(self) -> Iterator[int]:
+ # a very performance-sensitive method
+ read = self.read
+ try:
+ while True:
+ yield ord(read(1))
+ except TypeError:
+ yield STOP
+
def __next__(self) -> int:
# a very performance-sensitive method
next_opcode_as_byte = self._bound_stream_read(1)
|
CodeStream.__iter__ speedup (<I>%)
Avoid a self.read references, byte check, and call overhead to
__next__() at every iteration (assuming that re-starting the generator
is faster than invoking __next__() again).
Pretty surprising that this didn't give more speedup actually. It's
essentially undetectable.
|
diff --git a/core/array.rb b/core/array.rb
index <HASH>..<HASH> 100644
--- a/core/array.rb
+++ b/core/array.rb
@@ -978,7 +978,7 @@ class Array
}
end
- def zip(*others)
+ def zip(*others, &block)
%x{
var result = [], size = this.length, part, o;
@@ -998,6 +998,14 @@ class Array
result[i] = part;
}
+ if (block !== nil) {
+ for (var i = 0; i < size; i++) {
+ block.call($context, result[i]);
+ }
+
+ return nil;
+ }
+
return result;
}
end
diff --git a/core_spec/core/array/zip_spec.rb b/core_spec/core/array/zip_spec.rb
index <HASH>..<HASH> 100644
--- a/core_spec/core/array/zip_spec.rb
+++ b/core_spec/core/array/zip_spec.rb
@@ -11,4 +11,13 @@ describe "Array#zip" do
[1, 2, 3, 4, 5].zip(["a", "b", "c", "d"]).should ==
[[1, "a"], [2, "b"], [3, "c"], [4, "d"], [5, nil]]
end
+
+ it "calls block if supplied" do
+ values = []
+ [1, 2, 3, 4].zip(["a", "b", "c", "d", "e"]) { |value|
+ values << value
+ }.should == nil
+
+ values.should == [[1, "a"], [2, "b"], [3, "c"], [4, "d"]]
+ end
end
|
Add block support to Array#zip
|
diff --git a/lib/wechat/http_client.rb b/lib/wechat/http_client.rb
index <HASH>..<HASH> 100644
--- a/lib/wechat/http_client.rb
+++ b/lib/wechat/http_client.rb
@@ -8,7 +8,7 @@ module Wechat
@base = base
@httprb = HTTP.timeout(:global, write: timeout, connect: timeout, read: timeout)
@ssl_context = OpenSSL::SSL::SSLContext.new
- @ssl_context.ssl_version = :TLSv1_client
+ @ssl_context.ssl_version = :TLSv1
@ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE if skip_verify_ssl
end
|
Fix TLSv1_client method type "_client" is ignored in Ruby <I>
|
diff --git a/emailtemplates/email.py b/emailtemplates/email.py
index <HASH>..<HASH> 100644
--- a/emailtemplates/email.py
+++ b/emailtemplates/email.py
@@ -6,7 +6,7 @@ from smtplib import SMTPException
from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist
from django.core.mail import EmailMessage
-from django.template import Template, Context, TemplateDoesNotExist
+from django.template import Template, TemplateDoesNotExist
from django.template.loader import get_template
from .models import now, EmailTemplate
@@ -110,8 +110,7 @@ class EmailFromTemplate(object):
def render_message(self):
self.__compile_template()
- context = Context(self.context)
- self.message = self.compiled_template.render(context)
+ self.message = self.compiled_template.render(self.context)
def send_email(self, send_to, *args, **kwargs):
"""
|
Removed Context from render_to_response function - support for django <I>
|
diff --git a/tests/test_module_doc.py b/tests/test_module_doc.py
index <HASH>..<HASH> 100644
--- a/tests/test_module_doc.py
+++ b/tests/test_module_doc.py
@@ -47,11 +47,7 @@ OBSELETE_PARAM = [
RE_PARAM = re.compile(
'^ - `(?P<name>[^`]*)`.*?('
'\*\(default (?P<value>('
- '("[^"]*")' # double quote strings
- '|'
- "('[^']*')" # quote strings
- '|'
- '([^)]*)' # anything else
+ '.*'
'))\)\*)?$'
)
@@ -164,6 +160,8 @@ def get_module_attributes(path):
# NameConstant so we use them for the default
default = python2_names.get(value.id)
attr_value = extra.get(value.id, default)
+ elif class_name == 'Tuple':
+ attr_value = tuple(map(get_value, value.elts))
elif class_name == 'UnaryOp':
op = value.op.__class__.__name__
attr_value = get_value(value.operand)
|
Add tuples support to doc checker
|
diff --git a/tests/compute/helper.rb b/tests/compute/helper.rb
index <HASH>..<HASH> 100644
--- a/tests/compute/helper.rb
+++ b/tests/compute/helper.rb
@@ -26,12 +26,12 @@ def compute_providers
},
:server_attributes => {}.tap do |hash|
[:zone_id, :network_ids, :image_id, :flavor_id].each do |k|
- hash[k]= Fog.credentials[:cloudstack][k]
+ hash[k]= Fog.credentials[:cloudstack] && Fog.credentials[:cloudstack][k]
end
end,
:volume_attributes => {:name => "somevolume"}.tap do |hash|
[:zone_id, :disk_offering_id].each do |k|
- hash[k]= Fog.credentials[:cloudstack][k]
+ hash[k]= Fog.credentials[:cloudstack] && Fog.credentials[:cloudstack][k]
end
end,
:mocked => true
|
[cloudstack] prevent mock test failure when cloudstack credentials are not defined
|
diff --git a/src/config/form.php b/src/config/form.php
index <HASH>..<HASH> 100644
--- a/src/config/form.php
+++ b/src/config/form.php
@@ -46,7 +46,7 @@ return array(
*/
'fieldset' => array(
- 'button' => array('class' => 'btn'),
+ 'button' => array(),
'checkbox' => array(),
'file' => array(),
'input' => array('class' => 'twelve columns input-with-feedback'),
@@ -60,7 +60,7 @@ return array(
'button' => function ($data) {
return Form::button(
$data->value,
- $data->attributes
+ HTML::decorate($data->attributes, array('class' => 'btn'))
);
},
'checkbox' => function ($data) {
|
Slightly reorganize the config.
|
diff --git a/lib/para/inputs/nested_one_input.rb b/lib/para/inputs/nested_one_input.rb
index <HASH>..<HASH> 100644
--- a/lib/para/inputs/nested_one_input.rb
+++ b/lib/para/inputs/nested_one_input.rb
@@ -12,6 +12,8 @@ module Para
unless (resource = object.send(:"#{ attribute_name }"))
# Build association without trying to save the new record
resource = case association
+ when ActiveRecord::Associations::HasOneThroughAssociation
+ association.replace(model.new)
when ActiveRecord::Associations::HasOneAssociation
association.replace(model.new, false)
else
|
fix issue with HasOneThroughAssociation nested fields building
|
diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/org/bitcoinj/wallet/Wallet.java
+++ b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
@@ -1128,6 +1128,12 @@ public class Wallet extends BaseTaggableObject
}
}
+ /** @deprecated Use {@link #findKeyFromPubKeyHash(byte[], ScriptType)} */
+ @Deprecated
+ public ECKey findKeyFromPubHash(byte[] pubKeyHash) {
+ return findKeyFromPubKeyHash(pubKeyHash, Script.ScriptType.P2PK);
+ }
+
/**
* Locates a keypair from the basicKeyChain given the hash of the public key. This is needed when finding out which
* key we need to use to redeem a transaction output.
|
Wallet: Add back deprecated findKeyFromPubHash() for compatibility.
|
diff --git a/lib/CustomPredefs.js b/lib/CustomPredefs.js
index <HASH>..<HASH> 100644
--- a/lib/CustomPredefs.js
+++ b/lib/CustomPredefs.js
@@ -16,6 +16,11 @@ define ( function(){
angular: [ 'angular' ],
+ 'angular-scenario': {
+ deps: [ 'angular' ],
+ dict: [ 'pause', 'sleep', 'browser', 'expect', 'using', 'binding', 'input', 'repeater', 'select', 'element' ]
+ },
+
backbone: {
deps: [ 'jquery', 'underscore'],
dict: [ 'Backbone' ]
|
Added functions from Angular JS E2E testing.
|
diff --git a/atlassian/jira.py b/atlassian/jira.py
index <HASH>..<HASH> 100644
--- a/atlassian/jira.py
+++ b/atlassian/jira.py
@@ -90,6 +90,19 @@ class Jira(AtlassianRestAPI):
limit=limit)
return self.get(url)
+ def get_all_users_from_group(self, group, include_inactive_users=False, start=0, limit=50):
+ """
+ Just wrapping method user group members
+ :param group:
+ :param include_inactive_users:
+ :param start:
+ :param limit:
+ :return:
+ """
+ url = "rest/api/2/group/member?groupname={group}&includeInactiveUsers={include_inactive}&startAt={start}&maxResults={limit}".format(
+ group=group, include_inactive=include_inactive_users, start=start, limit=limit)
+ return self.get(url)
+
def issue_exists(self, issuekey):
try:
self.issue(issuekey, fields='*none')
|
Add method for the get user group members
|
diff --git a/lib/cli.js b/lib/cli.js
index <HASH>..<HASH> 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -19,8 +19,8 @@ function _build(jobName, params, args) {
console.log(message, jobName);
// wait for pending period
setTimeout(function () {
- _console()(jobName);
- }, 5000);
+ _console(jobName);
+ }, args.pending || 5000);
}
};
} else {
@@ -36,7 +36,7 @@ function _console(jobName) {
jenkins.console(jobName, bag.cli.exit);
}
-function _stop(jobName, params) {
+function _stop(jobName) {
jenkins.stop(
jobName,
bag.cli.exitCb(null, function (result) {
|
Add pending arg to override default 5 secs timeout before calling console after build.
|
diff --git a/Kernel.php b/Kernel.php
index <HASH>..<HASH> 100644
--- a/Kernel.php
+++ b/Kernel.php
@@ -61,6 +61,10 @@ class Kernel extends Component
foreach ($this->config->get('factories', []) as $interface => $definitions) {
foreach ($definitions as $name => $definition) {
+ if (is_string($definition) && $definition[0] === '#') {
+ $definition = "@$interface$definition";
+ }
+
$this->container->set("$interface#$name", $definition);
if ($name === 'default') {
|
ManaPHP\Kernel supporting factory of # reference
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ with open('README.rst', 'r') as f:
setup(
name='pyttsx3',
packages=['pyttsx3', 'pyttsx3.drivers'],
- version='2.8',
+ version='2.86',
description='Text to Speech (TTS) library for Python 2 and 3. Works without internet connection or delay. Supports multiple TTS engines, including Sapi5, nsss, and espeak.',
long_description=long_description,
summary='Offline Text to Speech library with multi-engine support',
|
updated version <I> after reverting to commit 3b<I>e4 to fix
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.