diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/services/accounts.php b/services/accounts.php
index <HASH>..<HASH> 100644
--- a/services/accounts.php
+++ b/services/accounts.php
@@ -27,7 +27,7 @@ return array(
),
'deleteSshKey' => array(
'httpMethod' => 'DELETE',
- 'uri' => 'ssh_keys/array(id),',
+ 'uri' => 'ssh_keys/{id}',
'summary' => 'Deletes an ssh key',
'parameters' => array(
'id' => array(
|
Fix ssh key deletion, broken by an overenthusiastic search&replace.
|
diff --git a/dataviews/collector.py b/dataviews/collector.py
index <HASH>..<HASH> 100644
--- a/dataviews/collector.py
+++ b/dataviews/collector.py
@@ -589,8 +589,8 @@ class Analyze(Collect):
else:
self.times = []
self.kwargs = kwargs
- self.stackwise = self.kwargs.pop('stackwise', False)
- self.mode = 'set'
+ self.stackwise = kwargs.pop('stackwise', False)
+ self.mode = kwargs.pop('mode', 'set')
self.path = None
@@ -736,7 +736,10 @@ class Collector(AttrTree):
Given a ViewRef and the ViewOperation analysisfn, process the
data resolved by the reference with analysisfn at each step.
"""
- return Analyze(reference, analysisfn, *args, **kwargs)
+ task = Analyze(reference, analysisfn, *args, **kwargs)
+ if task.mode == 'merge':
+ self.path_items[uuid.uuid4().hex] = task
+ return task
def __call__(self, attrtree=AttrTree(), times=[]):
|
Enable passing of mode (set/merge) via kwargs in Collector.analyze
|
diff --git a/test/v2/frame.js b/test/v2/frame.js
index <HASH>..<HASH> 100644
--- a/test/v2/frame.js
+++ b/test/v2/frame.js
@@ -34,8 +34,8 @@ TestBody.testWith('Frame.RW: read/write payload', testRW.cases(Frame.RW, [
0x01, 0x02, 0x03, 0x04, // id:4
0x00, 0x00, 0x00, 0x00, // reserved:4
0x00, 0x00, 0x00, 0x00, // reserved:4
-
- 0x04, 0x64, 0x6f, 0x67, 0x65 // payload~1
+ 0x04, 0x64, 0x6f, 0x67, // payload~1
+ 0x65 // ...
]
],
|
test/v2/frame: trivial cleanup
|
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java
index <HASH>..<HASH> 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ public class RabbitAutoConfiguration {
@Bean
@ConditionalOnProperty(prefix = "spring.rabbitmq", name = "dynamic", matchIfMissing = true)
@ConditionalOnMissingBean(AmqpAdmin.class)
- public AmqpAdmin amqpAdmin(CachingConnectionFactory connectionFactory) {
+ public AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) {
return new RabbitAdmin(connectionFactory);
}
|
Fix dependency of AmqpAdmin
AmqpAdmin does not require a CachingConnectionFactory. Using the more
general CachingConnectionFactory provides more flexibility.
Closes gh-<I>
|
diff --git a/lib/Parser/DocumentParser.php b/lib/Parser/DocumentParser.php
index <HASH>..<HASH> 100644
--- a/lib/Parser/DocumentParser.php
+++ b/lib/Parser/DocumentParser.php
@@ -563,7 +563,7 @@ class DocumentParser
$message = sprintf(
'Unknown directive: "%s" %sfor line "%s"',
$parserDirective->getName(),
- $this->environment->getCurrentFileName() ? sprintf('in "%s" ', $this->environment->getCurrentFileName()) : '',
+ $this->environment->getCurrentFileName() !== '' ? sprintf('in "%s" ', $this->environment->getCurrentFileName()) : '',
$line
);
|
Fix "Only booleans are allowed in a ternary operator condition" phpstan error.
|
diff --git a/src/Laravel/SentinelServiceProvider.php b/src/Laravel/SentinelServiceProvider.php
index <HASH>..<HASH> 100644
--- a/src/Laravel/SentinelServiceProvider.php
+++ b/src/Laravel/SentinelServiceProvider.php
@@ -56,6 +56,7 @@ class SentinelServiceProvider extends ServiceProvider {
$this->registerCheckpoints();
$this->registerReminders();
$this->registerSentinel();
+ $this->setUserResolver();
}
/**
@@ -465,4 +466,17 @@ class SentinelServiceProvider extends ServiceProvider {
return mt_rand(1, $lottery[1]) <= $lottery[0];
}
+ /**
+ * Sets the user resolver on the request class.
+ *
+ * @return void
+ */
+ protected function setUserResolver()
+ {
+ $this->app['request']->setUserResolver(function()
+ {
+ return $this->app['sentinel']->getUser();
+ });
+ }
+
}
|
set user resolver on the request class
|
diff --git a/packages/veritone-react-common/src/components/FilePicker/index.js b/packages/veritone-react-common/src/components/FilePicker/index.js
index <HASH>..<HASH> 100644
--- a/packages/veritone-react-common/src/components/FilePicker/index.js
+++ b/packages/veritone-react-common/src/components/FilePicker/index.js
@@ -31,7 +31,7 @@ class FilePicker extends Component {
height: 400,
width: 600,
accept: [],
- multiple: true,
+ multiple: false,
allowUrlUpload: true
};
|
multiple false by default to match html5 file input:
|
diff --git a/moz_sql_parser/formatting.py b/moz_sql_parser/formatting.py
index <HASH>..<HASH> 100644
--- a/moz_sql_parser/formatting.py
+++ b/moz_sql_parser/formatting.py
@@ -128,6 +128,11 @@ class Formatter:
return self._on(json)
if len(json) > 1:
+ # Nested queries
+ if 'from' in json:
+ return '({})'.format(self.format(json))
+ if 'select' in json:
+ return '({})'.format(self.format(json))
raise Exception('Operators should have only one key!')
key, value = list(json.items())[0]
@@ -208,6 +213,8 @@ class Formatter:
is_join = False
if 'from' in json:
from_ = json['from']
+ if 'union' in from_:
+ return self.union(from_['union'])
if not isinstance(from_, list):
from_ = [from_]
@@ -240,7 +247,8 @@ class Formatter:
def limit(self, json):
if 'limit' in json:
- return 'LIMIT {0}'.format(self.dispatch(json['limit']))
+ if json['limit']:
+ return 'LIMIT {0}'.format(self.dispatch(json['limit']))
def offset(self, json):
if 'offset' in json:
|
Handle nested queries in def op()
Passed test <I>-<I>
|
diff --git a/gns3server/handlers/api/compute/vpcs_handler.py b/gns3server/handlers/api/compute/vpcs_handler.py
index <HASH>..<HASH> 100644
--- a/gns3server/handlers/api/compute/vpcs_handler.py
+++ b/gns3server/handlers/api/compute/vpcs_handler.py
@@ -99,7 +99,6 @@ class VPCSHandler:
vm = vpcs_manager.get_node(request.match_info["node_id"], project_id=request.match_info["project_id"])
vm.name = request.json.get("name", vm.name)
vm.console = request.json.get("console", vm.console)
- vm.startup_script = request.json.get("startup_script", vm.startup_script)
vm.updated()
response.json(vm)
@@ -270,7 +269,6 @@ class VPCSHandler:
yield from vm.start_capture(port_number, pcap_file_path)
response.json({"pcap_file_path": pcap_file_path})
-
@Route.post(
r"/projects/{project_id}/vpcs/nodes/{node_id}/adapters/{adapter_number:\d+}/ports/{port_number:\d+}/stop_capture",
parameters={
|
Fix hostname of VPCS is not changed
Fix <URL>
|
diff --git a/lib/eye/process/monitor.rb b/lib/eye/process/monitor.rb
index <HASH>..<HASH> 100644
--- a/lib/eye/process/monitor.rb
+++ b/lib/eye/process/monitor.rb
@@ -3,14 +3,13 @@ module Eye::Process::Monitor
private
def load_external_pid_file
- newpid = load_pid_from_file
+ newpid = failsafe_load_pid
+
if !newpid
self.pid = nil
info "load_external_pid_file: no pid_file"
- return :no_pid_file
- end
-
- if process_pid_running?(newpid)
+ :no_pid_file
+ elsif process_pid_running?(newpid)
self.pid = newpid
info "load_external_pid_file: process <#{self.pid}> from pid_file found and already running"
:ok
|
use failsafe_load_pid as default
|
diff --git a/filesystems/native.py b/filesystems/native.py
index <HASH>..<HASH> 100644
--- a/filesystems/native.py
+++ b/filesystems/native.py
@@ -116,7 +116,7 @@ def _realpath(fs, path):
real = Path.root()
for segment in path.segments:
seen = current, = {str(real.descendant(segment))}
- while os.path.islink(current):
+ while fs.is_link(current):
current = os.path.join(
os.path.dirname(current), os.readlink(current),
)
|
One less use of os.path in internals.
|
diff --git a/master/buildbot/clients/tryclient.py b/master/buildbot/clients/tryclient.py
index <HASH>..<HASH> 100644
--- a/master/buildbot/clients/tryclient.py
+++ b/master/buildbot/clients/tryclient.py
@@ -179,7 +179,10 @@ class MercurialExtractor(SourceStampExtractor):
vcexe = "hg"
def getBaseRevision(self):
- d = self.dovc(["parents", "--template", "{node}\\n"])
+ upstream = ""
+ if self.repository:
+ upstream = "r'%s'" % self.repository
+ d = self.dovc(["log", "--template", "{node}\\n", "-r", "limit(parents(outgoing(%s) and branch(parents())) or parents(), 1)" % upstream])
d.addCallback(self.parseStatus)
return d
@@ -188,7 +191,7 @@ class MercurialExtractor(SourceStampExtractor):
self.baserev = m.group(0)
def getPatch(self, res):
- d = self.dovc(["diff"])
+ d = self.dovc(["diff", "-r", self.baserev])
d.addCallback(self.readPatch, self.patchlevel)
return d
|
try: For mercurial, create a patch containing all outgoing changesets on the current branch. (fixes #<I>, #<I>)
|
diff --git a/sift.js b/sift.js
index <HASH>..<HASH> 100755
--- a/sift.js
+++ b/sift.js
@@ -268,7 +268,7 @@
*/
$all: function(a, b) {
-
+ b = b || (b = [])
for(var i = a.length; i--;) {
var a1 = a[i];
var indexInB = ~b.indexOf(a1);
|
Handle null case in where the data's field may not be set
|
diff --git a/Tone/type/Frequency.js b/Tone/type/Frequency.js
index <HASH>..<HASH> 100644
--- a/Tone/type/Frequency.js
+++ b/Tone/type/Frequency.js
@@ -131,7 +131,7 @@ define(["Tone/core/Tone", "Tone/type/TimeBase"], function (Tone) {
*/
Tone.Frequency.prototype.toNote = function(){
var freq = this.toFrequency();
- var log = Math.log(freq / Tone.Frequency.A4) / Math.LN2;
+ var log = Math.log2(freq / Tone.Frequency.A4);
var noteNumber = Math.round(12 * log) + 57;
var octave = Math.floor(noteNumber/12);
if(octave < 0){
@@ -279,7 +279,7 @@ define(["Tone/core/Tone", "Tone/type/TimeBase"], function (Tone) {
* Tone.Frequency.ftom(440); // returns 69
*/
Tone.Frequency.ftom = function(frequency){
- return 69 + Math.round(12 * Math.log(frequency / Tone.Frequency.A4) / Math.LN2);
+ return 69 + Math.round(12 * Math.log2(frequency / Tone.Frequency.A4));
};
return Tone.Frequency;
|
using Math.log2 instead of dividing by Math.LN2
|
diff --git a/nose/test_diskdf.py b/nose/test_diskdf.py
index <HASH>..<HASH> 100644
--- a/nose/test_diskdf.py
+++ b/nose/test_diskdf.py
@@ -1291,6 +1291,18 @@ def test_dehnendf_flat_DFcorrection_sigmaR2():
assert diff_corr2 < diff_corr, 'sigmaR2 w/ corrected dehnenDF w/ 2 iterations is does not agree better with target than with 1 iteration'
return None
+def test_dehnendf_flat_DFcorrection_reload():
+ #Test that the corrections aren't re-calculated if they were saved
+ import time
+ start= time.time()
+ reddf= dehnendf(beta=0.,profileParams=(1./4.,1.,0.2),
+ correct=True,
+ niter=1,
+ npoints=21,
+ savedir='.')
+ assert time.time()-start < 1., 'Setup w/ correct=True, but already computed corrections takes too long'
+ return None
+
def stest_dehnendf_flat_DFcorrection_cleanup():
#This should run quickly
dfc= dehnendf(beta=0.,profileParams=(1./4.,1.,0.2),
|
test that once the corrections are calculated, setting up the corrections again is quick
|
diff --git a/src/Model/Activity.php b/src/Model/Activity.php
index <HASH>..<HASH> 100644
--- a/src/Model/Activity.php
+++ b/src/Model/Activity.php
@@ -104,9 +104,19 @@ class Activity extends Resource
/**
* Restore the backup associated with this activity.
*
+ * @param string|null $target The name of the target environment to
+ * which the backup should be restored (this
+ * could be the name of an existing
+ * environment, or a new environment). Leave
+ * this null to restore to the backup's
+ * original environment.
+ * @param string|null $branchFrom If a new environment will be created
+ * (depending on $target), this specifies
+ * the name of the parent branch.
+ *
* @return Activity
*/
- public function restore()
+ public function restore($target = null, $branchFrom = null)
{
if ($this->getProperty('type') !== 'environment.backup') {
throw new \BadMethodCallException('Cannot restore activity (wrong type)');
@@ -115,7 +125,15 @@ class Activity extends Resource
throw new \BadMethodCallException('Cannot restore backup (not complete)');
}
- return $this->runLongOperation('restore');
+ $options = [];
+ if ($target !== null) {
+ $options['environment_name'] = $target;
+ }
+ if ($branchFrom !== null) {
+ $options['branch_from'] = $branchFrom;
+ }
+
+ return $this->runLongOperation('restore', 'post', $options);
}
/**
|
Allow restoring to another target environment (#<I>)
* Allow restoring to another target environment
* Add $branchFrom option
|
diff --git a/parsl/channels/oauth_ssh/oauth_ssh.py b/parsl/channels/oauth_ssh/oauth_ssh.py
index <HASH>..<HASH> 100644
--- a/parsl/channels/oauth_ssh/oauth_ssh.py
+++ b/parsl/channels/oauth_ssh/oauth_ssh.py
@@ -44,7 +44,7 @@ class OAuthSSHChannel(SSHChannel):
self.hostname = hostname
self.username = username
self.script_dir = script_dir
-
+ self.port = port
self.envs = {}
if envs is not None:
self.envs = envs
|
Set optional port as proper Channel attribute. (#<I>)
|
diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py
index <HASH>..<HASH> 100644
--- a/sos/plugins/__init__.py
+++ b/sos/plugins/__init__.py
@@ -525,10 +525,12 @@ class Plugin(object):
"""Execute a command and save the output to a file for inclusion in the
report.
"""
+ start = time()
# pylint: disable-msg = W0612
result = self.get_command_output(exe, timeout=timeout, runat=runat)
if (result['status'] == 127):
return None
+ self.log_debug("collected output of '%s' in %s" % (exe.split()[0], time() - start))
if suggest_filename:
outfn = self.make_command_filename(suggest_filename)
|
Record duration of calls to external programs at debug level
The old profiling report was removed in favour of using external
profilers like cProfile. This is useful for overall profiling and
identifying code hotspots but is less helpful for drilling down
to the collection of individual items.
Since running programs is the dominant cost on typical hosts log
the time taken to run each call and tag it with the binary name.
This allows looking at the per-call and per-command cost across a
run of sosreport.
|
diff --git a/src/main/java/com/github/maven_nar/NarLogger.java b/src/main/java/com/github/maven_nar/NarLogger.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/github/maven_nar/NarLogger.java
+++ b/src/main/java/com/github/maven_nar/NarLogger.java
@@ -88,25 +88,14 @@ public class NarLogger
break;
case Project.MSG_INFO:
log.info( msg );
- /** This looks completely wrong/counterintuitive
- * It also prevents the commandLogLevel feature to have any effect...
- if ( ( msg.indexOf( "files were compiled" ) >= 0 ) || ( msg.indexOf( "Linking..." ) >= 0 ) )
- {
- log.info( msg );
- }
- else if ( msg.indexOf( "error" ) >= 0 )
+ if ( msg.indexOf( "error" ) >= 0 )
{
log.error( msg );
}
- else if ( msg.indexOf( "warning" ) >= 0 )
- {
- log.warn( msg );
- }
- else
- {
- log.debug( msg );
+ else
+ {
+ log.info( msg );
}
- */
break;
case Project.MSG_VERBOSE:
log.debug( msg );
|
Show messages properly again
Oops. I wanted to clean that up before merging.
|
diff --git a/pdfconduit/__init__.py b/pdfconduit/__init__.py
index <HASH>..<HASH> 100644
--- a/pdfconduit/__init__.py
+++ b/pdfconduit/__init__.py
@@ -1,5 +1,5 @@
__all__ = ["upscale", "rotate", "Encrypt", "Merge", "Watermark", "Label", "WatermarkAdd", "slicer",
- "GUI"]
+ "GUI", "Info"]
__version__ = '1.1.4'
__author__ = 'Stephen Neal'
|
Added Info class to __all__
|
diff --git a/app/controllers/comfy/cms/content_controller.rb b/app/controllers/comfy/cms/content_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/comfy/cms/content_controller.rb
+++ b/app/controllers/comfy/cms/content_controller.rb
@@ -15,7 +15,7 @@ class Comfy::Cms::ContentController < Comfy::Cms::BaseController
redirect_to @cms_page.target_page.url
else
respond_to do |format|
- format.json { render json: @cms_page }
+ format.json { render json: @cms_page } unless ComfortableMexicanSofa.config.allow_irb
format.all { render_page }
end
end
|
json api makes no sense if erb is allowed and not rendered
|
diff --git a/lib/sidekiq_unique_jobs/version.rb b/lib/sidekiq_unique_jobs/version.rb
index <HASH>..<HASH> 100644
--- a/lib/sidekiq_unique_jobs/version.rb
+++ b/lib/sidekiq_unique_jobs/version.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true
module SidekiqUniqueJobs
- VERSION = '6.0.0.beta1'
+ VERSION = '6.0.0.beta2'
end
|
Bump to <I>.beta2
|
diff --git a/DependencyInjection/Compiler/QPushCompilerPass.php b/DependencyInjection/Compiler/QPushCompilerPass.php
index <HASH>..<HASH> 100644
--- a/DependencyInjection/Compiler/QPushCompilerPass.php
+++ b/DependencyInjection/Compiler/QPushCompilerPass.php
@@ -6,7 +6,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\HttpKernel\DependencyInjection\RegisterListenersPass;
use InvalidArgumentException;
/**
@@ -89,13 +88,6 @@ class QPushCompilerPass implements CompilerPassInterface
$definition->addMethodCall('addSubscriberService', array($id, $class));
}
- $compilerPass = new RegisterListenersPass(
- 'event_dispatcher',
- 'uecode_qpush.listener.' . $listener,
- 'uecode_qpush.subscriber.' . $listener
- );
-
- $container->addCompilerPass($compilerPass);
}
}
|
removing poor attempt of adding a compiler pass
|
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
@@ -299,25 +299,20 @@ public class AttributeMetaDataRepositoryDecorator implements Repository<Attribut
@Override
public void deleteById(Object id)
{
- validateDeleteAllowed(findOneById(id));
- decoratedRepo.deleteById(id);
+ AttributeMetaData attr = findOneById(id);
+ delete(attr);
}
@Override
public void deleteAll(Stream<Object> ids)
{
- decoratedRepo.deleteAll(ids.filter(id ->
- {
- validateDeleteAllowed(findOneById(id));
- return true;
- }));
+ delete(findAll(ids));
}
@Override
public void deleteAll()
{
- iterator().forEachRemaining(this::validateDeleteAllowed);
- decoratedRepo.deleteAll();
+ delete(this.query().findAll());
}
@Override
|
Fix deleting attributes that are mapped by another attribute for deleteById, deleteAll(Stream), deleteAll
|
diff --git a/gwpy/tests/test_spectrogram.py b/gwpy/tests/test_spectrogram.py
index <HASH>..<HASH> 100644
--- a/gwpy/tests/test_spectrogram.py
+++ b/gwpy/tests/test_spectrogram.py
@@ -155,13 +155,17 @@ class TestSpectrogram(TestArray2D):
def test_plot(self, array, imshow):
with rc_context(rc={'text.usetex': False}):
plot = array.plot(imshow=imshow)
+ ax = plot.gca()
assert isinstance(plot, TimeSeriesPlot)
- assert isinstance(plot.gca(), TimeSeriesAxes)
- assert plot.gca().lines == []
+ assert isinstance(ax, TimeSeriesAxes)
+ assert ax.lines == []
if imshow:
- assert len(plot.gca().images) == 1
+ assert len(ax.images) == 1
else:
- assert len(plot.gca().collections) == 1
+ assert len(ax.collections) == 1
+ assert ax.get_epoch() == array.x0.value
+ assert ax.get_xlim() == array.xspan
+ assert ax.get_ylim() == array.yspan
with tempfile.NamedTemporaryFile(suffix='.png') as f:
plot.save(f.name)
plot.close()
|
tests: improved test of Spectrogram.plot
|
diff --git a/raiden/api/python.py b/raiden/api/python.py
index <HASH>..<HASH> 100644
--- a/raiden/api/python.py
+++ b/raiden/api/python.py
@@ -72,7 +72,7 @@ def event_filter_for_payments(
)
)
received_and_initiator_matches = (
- isinstance(event, (EventPaymentSentFailed, EventPaymentReceivedSuccess)) and
+ isinstance(event, EventPaymentReceivedSuccess) and
(
partner_address is None or
event.initiator == partner_address
|
EventPaymentSentFailed has no initiator
This fixes event_filter_for_payments() for #<I>
|
diff --git a/telemetry/telemetry/page/actions/scroll.py b/telemetry/telemetry/page/actions/scroll.py
index <HASH>..<HASH> 100644
--- a/telemetry/telemetry/page/actions/scroll.py
+++ b/telemetry/telemetry/page/actions/scroll.py
@@ -46,6 +46,9 @@ class ScrollAction(page_action.PageAction):
def CanBeBound(self):
return True
+ def CustomizeBrowserOptions(self, options):
+ options.extra_browser_args.append('--enable-gpu-benchmarking')
+
def BindMeasurementJavaScript(self, tab, start_js, stop_js):
# Make the scroll action start and stop measurement automatically.
tab.ExecuteJavaScript("""
|
Telemetry: CustomizeBrowserOptions for scroll.py action.
The scroll action needs to set --enable-gpu-benchmarking
so that record_wpr.py can record correctly
(otherwise, scroll.js uses rAF instead of smoothScrollBy).
BUG=<I>
Review URL: <URL>
|
diff --git a/Gruntfile.js b/Gruntfile.js
index <HASH>..<HASH> 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,7 +2,7 @@
* grunt-contrib-clean
* http://gruntjs.com/
*
- * Copyright (c) 2013 Tim Branyen, contributors
+ * Copyright (c) 2014 Tim Branyen, contributors
* Licensed under the MIT license.
*/
diff --git a/LICENSE-MIT b/LICENSE-MIT
index <HASH>..<HASH> 100644
--- a/LICENSE-MIT
+++ b/LICENSE-MIT
@@ -1,4 +1,4 @@
-Copyright (c) 2012 Tim Branyen, contributors
+Copyright (c) 2014 Tim Branyen, contributors
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
diff --git a/tasks/clean.js b/tasks/clean.js
index <HASH>..<HASH> 100644
--- a/tasks/clean.js
+++ b/tasks/clean.js
@@ -2,7 +2,7 @@
* grunt-contrib-clean
* http://gruntjs.com/
*
- * Copyright (c) 2013 Tim Branyen, contributors
+ * Copyright (c) 2014 Tim Branyen, contributors
* Licensed under the MIT license.
*/
|
Update copyright to <I>
|
diff --git a/src/test/org/openscience/cdk/qsar/descriptors/atomic/PartialTChargeMMFF94DescriptorTest.java b/src/test/org/openscience/cdk/qsar/descriptors/atomic/PartialTChargeMMFF94DescriptorTest.java
index <HASH>..<HASH> 100644
--- a/src/test/org/openscience/cdk/qsar/descriptors/atomic/PartialTChargeMMFF94DescriptorTest.java
+++ b/src/test/org/openscience/cdk/qsar/descriptors/atomic/PartialTChargeMMFF94DescriptorTest.java
@@ -185,7 +185,7 @@ public class PartialTChargeMMFF94DescriptorTest extends AtomicDescriptorTest {
*/
@Test
public void testPartialTotalChargeDescriptor_Benzene() throws ClassNotFoundException, CDKException, java.lang.Exception {
- double [] testResult={-0.15,0.15,-0.15,0.15,-0.15,0.15,-0.15,0.15,-0.15, 0.15,-0.15, 0.15};/* from Merck Molecular Force Field. II. Thomas A. Halgren*/
+ double [] testResult={-0.15,-0.15,-0.15,-0.15,-0.15,-0.15,0.15,0.15,0.15,0.15,0.15,0.15};/* from Merck Molecular Force Field. II. Thomas A. Halgren*/
IAtomicDescriptor descriptor = new PartialTChargeMMFF94Descriptor();
// IMolecule mol = sp.parseSmiles("c1ccccc1");
|
Fixed test: first six atoms are all carbons, and then all hydrogens come. That's how the test molecule is constructed, and reorded expected values accordingly
git-svn-id: <URL>
|
diff --git a/src/main/java/com/googlecode/objectify/impl/translate/CreateContext.java b/src/main/java/com/googlecode/objectify/impl/translate/CreateContext.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/googlecode/objectify/impl/translate/CreateContext.java
+++ b/src/main/java/com/googlecode/objectify/impl/translate/CreateContext.java
@@ -35,7 +35,7 @@ public class CreateContext
*/
@SuppressWarnings("unchecked")
public <P> Populator<P> getPopulator(Class<P> clazz, Path path) {
- if (clazz.equals(Object.class)) {
+ if (clazz == null || clazz.equals(Object.class)) {
return (Populator<P>)NullPopulator.INSTANCE;
} else {
ClassTranslator<P> classTranslator = (ClassTranslator<P>)this.<P, PropertyContainer>getTranslator(new TypeKey<P>(clazz), this, path);
|
Allow for null superclass
Apparently possible to have a null superclass without hitting Object
via bytecode manipulation.
Fixes issue #<I>
|
diff --git a/src/Document.php b/src/Document.php
index <HASH>..<HASH> 100644
--- a/src/Document.php
+++ b/src/Document.php
@@ -22,7 +22,7 @@ use ChapterThree\AppleNews\Document\Layouts\ComponentLayout;
*/
class Document extends Base {
- protected $version = '0.10.1';
+ protected $version = '0.10.13';
protected $identifier;
protected $title;
protected $language;
|
Update document version to <I>.
|
diff --git a/lib/api/add.js b/lib/api/add.js
index <HASH>..<HASH> 100644
--- a/lib/api/add.js
+++ b/lib/api/add.js
@@ -27,7 +27,7 @@ module.exports = function(API) {
}
// ampersand
for(var prop in props) {
- if(prop.charAt(0) === "&") {
+ if(/&/g.test(prop)) {
props[prop] = false;
}
}
diff --git a/tests/bugs/ampersand.and.plugin.spec.js b/tests/bugs/ampersand.and.plugin.spec.js
index <HASH>..<HASH> 100644
--- a/tests/bugs/ampersand.and.plugin.spec.js
+++ b/tests/bugs/ampersand.and.plugin.spec.js
@@ -11,6 +11,9 @@ describe("Fixing bug with ampersand inside a plugin", function() {
".ie8 &": {
color: "blue"
}
+ },
+ ".ie8 &": {
+ color: "#eee"
}
};
});
@@ -32,6 +35,9 @@ a:hover {\n\
}\n\
.ie8 a:hover {\n\
color: blue;\n\
+}\n\
+.ie8 a {\n\
+ color: #eee;\n\
}\n");
done();
});
|
Fix: Ampersand operator in any position in selector issue in plugins
- changed ampersand operator clearing condition with regex test
|
diff --git a/cmd/cmd.go b/cmd/cmd.go
index <HASH>..<HASH> 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -282,11 +282,14 @@ func setup(app *ccli.App) {
(*cmd.DefaultCmd.Options().Store).Init(opts...)
}
- // add the system rules
- for role, resources := range inauth.SystemRules {
- for _, res := range resources {
- if err := (*cmd.DefaultCmd.Options().Auth).Grant(role, res); err != nil {
- return err
+ // add the system rules if we're using the JWT implementation
+ // which doesn't have access to the rules in the auth service
+ if (*cmd.DefaultCmd.Options().Auth).String() == "jwt" {
+ for role, resources := range inauth.SystemRules {
+ for _, res := range resources {
+ if err := (*cmd.DefaultCmd.Options().Auth).Grant(role, res); err != nil {
+ return err
+ }
}
}
}
|
Only create internal rules for JWT
|
diff --git a/javalite-templator/src/main/java/org/javalite/templator/BuiltIn.java b/javalite-templator/src/main/java/org/javalite/templator/BuiltIn.java
index <HASH>..<HASH> 100644
--- a/javalite-templator/src/main/java/org/javalite/templator/BuiltIn.java
+++ b/javalite-templator/src/main/java/org/javalite/templator/BuiltIn.java
@@ -12,7 +12,12 @@ package org.javalite.templator;
*
* <p></p>
*
- * Subclasses must be stateless.
+ * Think of a built-in as a function that will do the last minute formatting of a value before merging it into
+ * a template.
+ *
+ * <p></p>
+ *
+ * <strong>Subclasses must be stateless.</strong>
*
* @author Igor Polevoy on 1/15/15.
*/
|
#<I> Implement a built-in function mechanism for MergeTag
|
diff --git a/django_extensions/management/commands/admin_generator.py b/django_extensions/management/commands/admin_generator.py
index <HASH>..<HASH> 100644
--- a/django_extensions/management/commands/admin_generator.py
+++ b/django_extensions/management/commands/admin_generator.py
@@ -166,7 +166,8 @@ class AdminModel(UnicodeMixin):
def _process_many_to_many(self, meta):
raw_id_threshold = self.raw_id_threshold
for field in meta.local_many_to_many:
- related_objects = field.related.parent_model.objects.all()
+ related_model = getattr(field.related, 'related_model', field.related.model)
+ related_objects = related_model.objects.all()
if(related_objects[:raw_id_threshold].count() < raw_id_threshold):
yield field.name
@@ -181,7 +182,8 @@ class AdminModel(UnicodeMixin):
raw_id_threshold = self.raw_id_threshold
list_filter_threshold = self.list_filter_threshold
max_count = max(list_filter_threshold, raw_id_threshold)
- related_count = field.related.parent_model.objects.all()
+ related_model = getattr(field.related, 'related_model', field.related.model)
+ related_count = related_model.objects.all()
related_count = related_count[:max_count].count()
if related_count >= raw_id_threshold:
|
Fixed issue with Django <I>
|
diff --git a/public/javascripts/administration.js b/public/javascripts/administration.js
index <HASH>..<HASH> 100644
--- a/public/javascripts/administration.js
+++ b/public/javascripts/administration.js
@@ -331,7 +331,6 @@ function edSpell(which) {
function edToolbar(which) {
document.write('<div id="ed_toolbar_' + which + '" class="btn-toolbar">');
- document.write('<div class="btn-group">');
for (i = 0; i < extendedStart; i++) {
edShowButton(which, edButtons[i], i);
}
@@ -351,7 +350,7 @@ function edToolbar(which) {
edShowButton(which, edButtons[i], i);
}
// edShowLinks();
- document.write('</div></div>');
+ document.write('</div>');
edOpenTags[which] = new Array();
}
|
Fixes issue #<I>. Used to be visually nicer but I can't do anything else yet. Will come back when we redesign the editor
|
diff --git a/spec/refile/test_app.rb b/spec/refile/test_app.rb
index <HASH>..<HASH> 100644
--- a/spec/refile/test_app.rb
+++ b/spec/refile/test_app.rb
@@ -28,7 +28,6 @@ require "capybara/rails"
require "capybara/rspec"
require "refile/spec_helper"
require "refile/active_record_helper"
-require "refile/image_processing"
require "capybara/poltergeist"
if ENV["SAUCE_BROWSER"]
|
Don’t require image processing in tests
|
diff --git a/mirrormaker/mirror_maker.go b/mirrormaker/mirror_maker.go
index <HASH>..<HASH> 100644
--- a/mirrormaker/mirror_maker.go
+++ b/mirrormaker/mirror_maker.go
@@ -91,7 +91,7 @@ func parseAndValidateArgs() *kafka.MirrorMakerConfig {
config.KeyDecoder = kafka.NewKafkaAvroDecoder(*schemaRegistryUrl)
config.ValueDecoder = kafka.NewKafkaAvroDecoder(*schemaRegistryUrl)
}
- config.Timings = *timingsProducerConfig
+ config.TimingsProducerConfig = *timingsProducerConfig
return config
}
|
re #<I> added separate producer for timings, added timings producer parameter
|
diff --git a/rb/spec/integration/selenium/client/api/screenshot_spec.rb b/rb/spec/integration/selenium/client/api/screenshot_spec.rb
index <HASH>..<HASH> 100644
--- a/rb/spec/integration/selenium/client/api/screenshot_spec.rb
+++ b/rb/spec/integration/selenium/client/api/screenshot_spec.rb
@@ -13,7 +13,7 @@ describe "Screenshot" do
page.capture_screenshot tempfile
File.exists?(tempfile).should be_true
- File.open(tempfile, "r") do |io|
+ File.open(tempfile, "rb") do |io|
magic = io.read(4)
magic.should == "\211PNG"
end
|
Encoding fix for RC screenshot spec for Ruby <I>
|
diff --git a/parser.go b/parser.go
index <HASH>..<HASH> 100644
--- a/parser.go
+++ b/parser.go
@@ -146,6 +146,8 @@ func (p *Parser) ParseArgs(args []string) ([]string, error) {
}
if !argumentIsOption(arg) {
+ // Note: this also sets s.err, so we can just check for
+ // nil here and use s.err later
if p.parseNonOption(s) != nil {
break
}
|
Added clarifying comment for parseNonOption
|
diff --git a/ipyrad/analysis/vcf_to_hdf5.py b/ipyrad/analysis/vcf_to_hdf5.py
index <HASH>..<HASH> 100644
--- a/ipyrad/analysis/vcf_to_hdf5.py
+++ b/ipyrad/analysis/vcf_to_hdf5.py
@@ -75,7 +75,7 @@ class VCFtoHDF5(object):
self.build_chunked_matrix()
# report on new database
- with h5py.File(self.database) as io5:
+ with h5py.File(self.database, 'r') as io5:
self.nscaffolds = io5["snpsmap"][-1, 0]
# self.nlinkagegroups = io5["snpsmap"][-1, 3]
@@ -487,9 +487,9 @@ def get_genos(gstr):
def return_g(gstr, i):
"returns the genotype str from vcf at one position (0/1) -> 0"
gen = gstr.split(":")[0]
- if gen != ".":
- return int(gstr[i])
- else:
+ try:
+ return int(gen[i])
+ except:
return 9
|
Fix oops handling missing data in vcf to hdf5
|
diff --git a/lib/Condorcet/Condorcet.php b/lib/Condorcet/Condorcet.php
index <HASH>..<HASH> 100644
--- a/lib/Condorcet/Condorcet.php
+++ b/lib/Condorcet/Condorcet.php
@@ -739,9 +739,10 @@ class Condorcet
$vote_r['tag'][0] = $this->_nextVoteTag++ ;
// Vote identifiant
+ $tag = $this->tagsConvert($tag);
if ($tag !== null)
{
- $vote_r['tag'] = array_merge($vote_r['tag'], $this->tagsConvert($tag)) ;
+ $vote_r['tag'] = array_merge($vote_r['tag'], $tag) ;
}
|
Bugfix with custom tag from last commit
|
diff --git a/python/ccxt/base/exchange.py b/python/ccxt/base/exchange.py
index <HASH>..<HASH> 100644
--- a/python/ccxt/base/exchange.py
+++ b/python/ccxt/base/exchange.py
@@ -876,8 +876,8 @@ class Exchange(object):
return _urlencode.unquote(Exchange.urlencode(params))
@staticmethod
- def encode_uri_component(uri):
- return _urlencode.quote(uri, safe="~()*!.'")
+ def encode_uri_component(uri, safe="~()*!.'"):
+ return _urlencode.quote(uri, safe=safe)
@staticmethod
def omit(d, *args):
|
exchange.py encode_uri_component safe symbols made configurable #<I>
|
diff --git a/src/tad/scripts/request-script-bootstrap.php b/src/tad/scripts/request-script-bootstrap.php
index <HASH>..<HASH> 100644
--- a/src/tad/scripts/request-script-bootstrap.php
+++ b/src/tad/scripts/request-script-bootstrap.php
@@ -5,6 +5,8 @@ include __DIR__ . '/support-functions.php';
include __DIR__ . '/filters.php';
include __DIR__ . '/pluggable-functions-override.php';
+global $argv;
+
$indexFile = $argv[1];
$env = unserialize(base64_decode($argv[2]));
|
fix(scripts) explicitly define $argv as global
|
diff --git a/daemon/cluster/controllers/plugin/controller.go b/daemon/cluster/controllers/plugin/controller.go
index <HASH>..<HASH> 100644
--- a/daemon/cluster/controllers/plugin/controller.go
+++ b/daemon/cluster/controllers/plugin/controller.go
@@ -34,7 +34,6 @@ type Controller struct {
pluginID string
serviceID string
- taskID string
// hook used to signal tests that `Wait()` is actually ready and waiting
signalWaitReady func()
|
cluster/controllers/plugin: remove unused Controller.taskID (unused)
```
daemon/cluster/controllers/plugin/controller.go:<I>:2: U<I>: field `taskID` is unused (unused)
```
|
diff --git a/test/bson/test_helper.rb b/test/bson/test_helper.rb
index <HASH>..<HASH> 100644
--- a/test/bson/test_helper.rb
+++ b/test/bson/test_helper.rb
@@ -1,5 +1,6 @@
require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'bson')
require 'rubygems' if RUBY_VERSION < '1.9.0' && ENV['C_EXT']
+gem 'test-unit' if RUBY_VERSION > '1.9.0'
require 'test/unit'
def silently
diff --git a/test/test_helper.rb b/test/test_helper.rb
index <HASH>..<HASH> 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,7 @@
$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
require 'rubygems' if RUBY_VERSION < '1.9.0' && ENV['C_EXT']
require 'mongo'
+gem 'test-unit' if RUBY_VERSION > '1.9.0'
require 'test/unit'
def silently
|
minor: tests now prefer test-unit gem in ruby <I>.x
|
diff --git a/src/picker.js b/src/picker.js
index <HASH>..<HASH> 100644
--- a/src/picker.js
+++ b/src/picker.js
@@ -221,7 +221,7 @@ angular.module("ion-datetime-picker", ["ionic"])
} else
if ($scope.onlyValid.before){
- var beforeDate = createDate($scope.onlyValid.after);
+ var beforeDate = createDate($scope.onlyValid.before);
if ($scope.onlyValid.inclusive) {
isValid = currentDate <= beforeDate;
|
Fix unable to select before date.
|
diff --git a/packages/core/parcel-bundler/src/builtins/hmr-runtime.js b/packages/core/parcel-bundler/src/builtins/hmr-runtime.js
index <HASH>..<HASH> 100644
--- a/packages/core/parcel-bundler/src/builtins/hmr-runtime.js
+++ b/packages/core/parcel-bundler/src/builtins/hmr-runtime.js
@@ -17,7 +17,7 @@ module.bundle.Module = Module;
var parent = module.bundle.parent;
if ((!parent || !parent.isParcelRequire) && typeof WebSocket !== 'undefined') {
var hostname = process.env.HMR_HOSTNAME || location.hostname;
- var protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
+ var protocol = location.protocol === 'https:' ? 'wss' : 'ws';
var ws = new WebSocket(protocol + '://' + hostname + ':' + process.env.HMR_PORT + '/');
ws.onmessage = function(event) {
var data = JSON.parse(event.data);
|
remove call to window.location (fix #<I>) (#<I>)
Removed call to window.location
|
diff --git a/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java b/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
index <HASH>..<HASH> 100644
--- a/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
+++ b/languagetool-core/src/main/java/org/languagetool/JLanguageTool.java
@@ -421,9 +421,7 @@ public class JLanguageTool {
* @param ruleId the id of the rule to enable
*/
public void enableRule(String ruleId) {
- if (disabledRules.contains(ruleId)) {
- disabledRules.remove(ruleId);
- }
+ disabledRules.remove(ruleId);
}
/**
@@ -434,9 +432,7 @@ public class JLanguageTool {
* @since 3.3
*/
public void enableRuleCategory(CategoryId id) {
- if (disabledRuleCategories.contains(id)) {
- disabledRuleCategories.remove(id);
- }
+ disabledRuleCategories.remove(id);
}
/**
|
minor code refactoring
Remove unnecessary check.
|
diff --git a/src/Yaml.php b/src/Yaml.php
index <HASH>..<HASH> 100644
--- a/src/Yaml.php
+++ b/src/Yaml.php
@@ -42,8 +42,6 @@ class Yaml
self::addConfig($content, $resource);
}
-
- //self::$parameters->resolve();
}
}
@@ -95,10 +93,6 @@ class Yaml
protected function addConfig($content, $resource)
{
- if (self::$slim === null) {
- self::$slim = Slim::getInstance();
- }
-
foreach ($content as $key => $value) {
$value = self::$parameters[$resource]->resolveValue($value);
@@ -133,7 +127,10 @@ class Yaml
return $content;
}
- private function __construct() { }
+ private function __construct() {
+ self::$slim = Slim::getInstance();
+ }
+
private function __clone(){}
private function __wakeup(){}
}
|
Cleaned up code, we now get the Slim instance on construct
|
diff --git a/extensions/src/main/java/io/wcm/caconfig/extensions/persistence/impl/PersistenceUtils.java b/extensions/src/main/java/io/wcm/caconfig/extensions/persistence/impl/PersistenceUtils.java
index <HASH>..<HASH> 100644
--- a/extensions/src/main/java/io/wcm/caconfig/extensions/persistence/impl/PersistenceUtils.java
+++ b/extensions/src/main/java/io/wcm/caconfig/extensions/persistence/impl/PersistenceUtils.java
@@ -84,7 +84,6 @@ final class PersistenceUtils {
Resource pageResource = resolver.create(parentResource, pageName, props);
props = new HashMap<String, Object>();
props.put(JcrConstants.JCR_PRIMARYTYPE, "cq:PageContent");
- props.put(JcrConstants.JCR_TITLE, pageName);
resolver.create(pageResource, JcrConstants.JCR_CONTENT, props);
}
catch (PersistenceException ex) {
|
do not store jcr:title for page
|
diff --git a/src/host/browser.js b/src/host/browser.js
index <HASH>..<HASH> 100644
--- a/src/host/browser.js
+++ b/src/host/browser.js
@@ -3,7 +3,6 @@
/*global _GPF_HOST_BROWSER*/ // gpf.HOST_BROWSER
/*global _gpfHost*/ // Host type
/*global _gpfExit:true*/ // Exit function
-/*global _gpfMainContext:true*/ // Main context object
/*global _gpfInBrowser:true*/ // The current host is a browser like
/*#endif*/
@@ -12,7 +11,6 @@
if (_GPF_HOST_BROWSER === _gpfHost) {
- _gpfMainContext = window;
_gpfInBrowser = true;
_gpfExit = function (code) {
window.location = "https://arnaudbuchholz.github.io/gpf/exit.html?" + (code || 0);
|
Appears to be useless (done in boot)
|
diff --git a/app/assets/javascripts/sufia/batch_select_all.js b/app/assets/javascripts/sufia/batch_select_all.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/sufia/batch_select_all.js
+++ b/app/assets/javascripts/sufia/batch_select_all.js
@@ -5,10 +5,10 @@
var n = $(".batch_toggle:checked").length;
if ((n>0) || (forceOn)) {
$('.batch-select-all').show();
- $('.button_to').show();
+ $('#batch-edit').show();
} else if ( otherPage){
$('.batch-select-all').hide();
- $('.button_to').hide();
+ $('#batch-edit').hide();
}
$("body").css("cursor", "auto");
}
|
Changing to not use .button_to to hide show the batch edit button so that other button_to will still show
|
diff --git a/src/modal/modal.js b/src/modal/modal.js
index <HASH>..<HASH> 100644
--- a/src/modal/modal.js
+++ b/src/modal/modal.js
@@ -275,7 +275,7 @@ function Modal(api)
}
// Undelegate focus handler
- docBody.undelegate('*', 'focusin'+namespace);
+ docBody.unbind('focusin'+namespace);
}
// Remove bound events
|
fixed issue with modal stealing input even after it is destroyed
|
diff --git a/dist.py b/dist.py
index <HASH>..<HASH> 100644
--- a/dist.py
+++ b/dist.py
@@ -16,6 +16,7 @@ from distutils.errors import *
from distutils.fancy_getopt import FancyGetopt, translate_longopt
from distutils.util import check_environ, strtobool, rfc822_escape
from distutils import log
+from distutils.core import DEBUG
# Regex to define acceptable Distutils command names. This is not *quite*
# the same as a Python NAME -- I don't allow leading underscores. The fact
@@ -305,7 +306,6 @@ class Distribution:
def parse_config_files (self, filenames=None):
from ConfigParser import ConfigParser
- from distutils.core import DEBUG
if filenames is None:
filenames = self.find_config_files()
@@ -771,7 +771,6 @@ class Distribution:
object for 'command' is in the cache, then we either create and
return it (if 'create' is true) or return None.
"""
- from distutils.core import DEBUG
cmd_obj = self.command_obj.get(command)
if not cmd_obj and create:
if DEBUG:
@@ -802,8 +801,6 @@ class Distribution:
supplied, uses the standard option dictionary for this command
(from 'self.command_options').
"""
- from distutils.core import DEBUG
-
command_name = command_obj.get_command_name()
if option_dict is None:
option_dict = self.get_option_dict(command_name)
|
Use module-level import of DEBUG instead of many function-level imports.
|
diff --git a/core.js b/core.js
index <HASH>..<HASH> 100644
--- a/core.js
+++ b/core.js
@@ -73,6 +73,9 @@ var ffi = require('node-ffi')
})
, msgSendCache = {}
+// export core to the struct module
+require('./struct')._core = exports;
+
exports.__proto__ = objc;
// Expose `node-ffi` stuff so we don't have to require node-ffi elsewhere
|
Export core.js to the Struct module.
|
diff --git a/db/seeds/main.go b/db/seeds/main.go
index <HASH>..<HASH> 100644
--- a/db/seeds/main.go
+++ b/db/seeds/main.go
@@ -59,6 +59,7 @@ var (
&models.Setting{},
&adminseo.MySEOSetting{},
&models.Article{},
+ &models.MediaLibrary{},
&asset_manager.AssetManager{},
&i18n_database.Translation{},
|
seed: auto migrate media_library tables
|
diff --git a/js/ftx.js b/js/ftx.js
index <HASH>..<HASH> 100644
--- a/js/ftx.js
+++ b/js/ftx.js
@@ -1514,9 +1514,6 @@ module.exports = class ftx extends Exchange {
if (marketId !== undefined) {
request['market'] = marketId;
}
- if (limit !== undefined) {
- request['limit'] = limit;
- }
if (since !== undefined) {
request['start_time'] = parseInt (since / 1000);
request['end_time'] = this.seconds ();
|
ftx fetchMyTrades removed limit from the query fix #<I>
|
diff --git a/setuptools_rust/tomlgen.py b/setuptools_rust/tomlgen.py
index <HASH>..<HASH> 100644
--- a/setuptools_rust/tomlgen.py
+++ b/setuptools_rust/tomlgen.py
@@ -128,6 +128,11 @@ class tomlgen_rust(setuptools.Command):
# The directory where the extension's manifest is located
tomldir = os.path.dirname(ext.path)
+ # If the RustExtension was not created by `find_rust_extensions`
+ # the `lib.rs` file is expected to be located near `Cargo.toml`
+ if not hasattr(ext, 'libfile'):
+ ext.libfile = ext.path.replace('Cargo.toml', 'lib.rs')
+
# Create a small package section
toml.add_section("package")
toml.set("package", "name", quote(ext.name))
|
Make sure `tomlgen_rust` works for manually defined extensions
|
diff --git a/lib/Doctrine/DBAL/Schema/Visitor/CreateSchemaSqlCollector.php b/lib/Doctrine/DBAL/Schema/Visitor/CreateSchemaSqlCollector.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/DBAL/Schema/Visitor/CreateSchemaSqlCollector.php
+++ b/lib/Doctrine/DBAL/Schema/Visitor/CreateSchemaSqlCollector.php
@@ -142,7 +142,7 @@ class CreateSchemaSqlCollector extends AbstractVisitor
foreach (array_keys($this->createTableQueries) as $namespace) {
if ($this->platform->supportsSchemas() && $this->platform->schemaNeedsCreation($namespace)) {
$query = $this->platform->getCreateSchemaSQL($namespace);
- array_push($sql, $query);
+ $sql[] = $query;
}
}
|
Remove instance of array_push()
|
diff --git a/art/decor_dic.py b/art/decor_dic.py
index <HASH>..<HASH> 100644
--- a/art/decor_dic.py
+++ b/art/decor_dic.py
@@ -1,2 +1,5 @@
# -*- coding: utf-8 -*-
"""Decorations data."""
+wave1 = "▁ ▂ ▄ ▅ ▆ ▇ █"
+chess1 = "▀▄▀▄▀▄"
+barcode1 = "▌│█║▌║▌║ "
\ No newline at end of file
|
add : new decorations added to decor_dic.py
|
diff --git a/api/product_server.go b/api/product_server.go
index <HASH>..<HASH> 100644
--- a/api/product_server.go
+++ b/api/product_server.go
@@ -31,7 +31,7 @@ func (api *ProductServerAPI) GetBySpec(core, memGB int, gen sacloud.PlanGenerati
// GetBySpecCommitment 指定のコア数/メモリサイズ/世代のプランを取得
func (api *ProductServerAPI) GetBySpecCommitment(core, memGB int, gen sacloud.PlanGenerations, commitment sacloud.ECommitment) (*sacloud.ProductServer, error) {
- plans, err := api.Reset().Find()
+ plans, err := api.Reset().Limit(1000).Find()
if err != nil {
return nil, err
}
|
Fix GetBySpecCommitment - set search limit to <I>
|
diff --git a/bookshelf/api_v1.py b/bookshelf/api_v1.py
index <HASH>..<HASH> 100644
--- a/bookshelf/api_v1.py
+++ b/bookshelf/api_v1.py
@@ -1,4 +1,4 @@
-# vim: ai ts=4 sts=4 et sw=4 ft=python fdm=indent et foldlevel=0
+# vim: ai ts=4 sts=4 et sw=4 ft=python fdm=indent et
import boto.ec2
import json
|
don't autofold on vim
|
diff --git a/pkg/utils/hwaddr/hwaddr_test.go b/pkg/utils/hwaddr/hwaddr_test.go
index <HASH>..<HASH> 100644
--- a/pkg/utils/hwaddr/hwaddr_test.go
+++ b/pkg/utils/hwaddr/hwaddr_test.go
@@ -42,6 +42,10 @@ var _ = Describe("Hwaddr", func() {
ip: net.ParseIP("172.17.0.2"),
expectedMAC: (net.HardwareAddr)(append(hwaddr.PrivateMACPrefix, 0xac, 0x11, 0x00, 0x02)),
},
+ {
+ ip: net.IPv4(byte(172), byte(17), byte(0), byte(2)),
+ expectedMAC: (net.HardwareAddr)(append(hwaddr.PrivateMACPrefix, 0xac, 0x11, 0x00, 0x02)),
+ },
}
for _, tc := range testCases {
|
pkg/utils/hwaddr tests: cover v4 in v6 addr
|
diff --git a/runtests.py b/runtests.py
index <HASH>..<HASH> 100755
--- a/runtests.py
+++ b/runtests.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import os
import sys
+import warnings
import django
from django.conf import settings
@@ -47,6 +48,7 @@ def runtests():
MIDDLEWARE_CLASSES=(),
)
+ warnings.simplefilter('always', DeprecationWarning)
if django.VERSION >= (1, 7):
django.setup()
failures = call_command(
|
Added DeprecationWarning display.
|
diff --git a/tests/integration/shell/key.py b/tests/integration/shell/key.py
index <HASH>..<HASH> 100644
--- a/tests/integration/shell/key.py
+++ b/tests/integration/shell/key.py
@@ -33,16 +33,9 @@ class KeyTest(integration.ShellCase, integration.ShellCaseCommonTestsMixIn):
'''
data = self.run_key('-L --json-out')
expect = [
- '{',
- ' "unaccepted": [], ',
- ' "accepted": [',
- ' "minion", ',
- ' "sub_minion"',
- ' ], ',
- ' "rejected": []',
- '}',
+ '{"unaccepted": [], "accepted": ["minion", "sub_minion"], "rejected": []}',
''
- ]
+ ]
self.assertEqual(data, expect)
def test_list_yaml_out(self):
|
fix test that broke because of output changes
|
diff --git a/yoke/deploy.py b/yoke/deploy.py
index <HASH>..<HASH> 100644
--- a/yoke/deploy.py
+++ b/yoke/deploy.py
@@ -262,4 +262,7 @@ class Deployment(object):
def _format_vpc_config(self):
# todo(ryandub): Add VPC support
- return {}
+ return {
+ 'SecurityGroupIds': [],
+ 'SubnetIds': [],
+ }
|
Update VpcConfig format
AWS introduced a bug to the Lambda API that resulted in error messages
if VpcConfig was passed as an empty dict. Adding the SecurityGroupIds
and SubnetIds as empty arrays should workaround this bug. See
<URL>
|
diff --git a/test/gateway.go b/test/gateway.go
index <HASH>..<HASH> 100644
--- a/test/gateway.go
+++ b/test/gateway.go
@@ -5,27 +5,18 @@ package test
import jwt "github.com/dgrijalva/jwt-go"
-type location struct {
- Longitude float64 `json:"lng"`
- Latitude float64 `json:"lat"`
-}
-
// GatewayClaims creates a jwt.Claims that represents the gateway
-func GatewayClaims(id, frequencyPlan string, lat, lng float64, locationPublic, statusPublic bool) jwt.Claims {
+func GatewayClaims(id, locationPublic, statusPublic bool) jwt.Claims {
return jwt.MapClaims{
"iss": Issuer,
"sub": id,
- "frequency_plan": frequencyPlan,
+ "type": "gateway",
"location_public": locationPublic,
"status_public": statusPublic,
- "location": location{
- Longitude: lng,
- Latitude: lat,
- },
}
}
// GatewayToken creates a token that is singed by PrivateKey, and has the GatewayClaims
-func GatewayToken(id, frequencyPlan string, lat, lng float64, locationPublic, statusPublic bool) string {
- return TokenFromClaims(GatewayClaims(id, frequencyPlan, lat, lng, locationPublic, statusPublic))
+func GatewayToken(id, locationPublic, statusPublic bool) string {
+ return TokenFromClaims(GatewayClaims(id, locationPublic, statusPublic))
}
|
Reduce the number of things in gateway claims
|
diff --git a/src/main/java/org/primefaces/component/autocomplete/AutoCompleteRenderer.java b/src/main/java/org/primefaces/component/autocomplete/AutoCompleteRenderer.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/primefaces/component/autocomplete/AutoCompleteRenderer.java
+++ b/src/main/java/org/primefaces/component/autocomplete/AutoCompleteRenderer.java
@@ -366,8 +366,9 @@ public class AutoCompleteRenderer extends InputRenderer {
writer.writeAttribute("name", inputId, null);
writer.writeAttribute("autocomplete", "off", null);
if(disabled) writer.writeAttribute("disabled", "disabled", "disabled");
- if(tabindex != null) writer.writeAttribute("tabindex", tabindex, null);
- if(ac.getMaxlength() != Integer.MIN_VALUE)writer.writeAttribute("maxlength", ""+ac.getMaxlength(),null);
+
+ renderPassThruAttributes(context, ac, HTML.INPUT_TEXT_ATTRS_WITHOUT_EVENTS);
+ renderDomEvents(context, ac, HTML.INPUT_TEXT_EVENTS);
writer.endElement("input");
writer.endElement("li");
|
Added events and attributes to multi autocomplete
|
diff --git a/lib/ronin/cache/extension_cache.rb b/lib/ronin/cache/extension_cache.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/cache/extension_cache.rb
+++ b/lib/ronin/cache/extension_cache.rb
@@ -37,7 +37,7 @@ module Ronin
hash[name] = load_extension(key.to_s)
end
- catch('EXIT') do
+ at_exit do
each_extension { |ext| ext.perform_teardown }
end
|
Use at_exit instead of catch.
|
diff --git a/tasks/yabs.js b/tasks/yabs.js
index <HASH>..<HASH> 100644
--- a/tasks/yabs.js
+++ b/tasks/yabs.js
@@ -136,7 +136,7 @@ module.exports = function(grunt) {
grunt.verbose.writeln('Running: ' + cmd);
var result = shell.exec(cmd, {silent: silent});
if (extra.checkResultCode !== false && result.code !== 0) {
- grunt.fail.warn('Error (' + result.code + ') ' + result.output);
+ grunt.fail.warn('exec(' + cmd + ') failed with code ' + result.code + ':\n' + result.output);
}else{
return result;
}
|
Improve log for exec faults
|
diff --git a/examples/js/examples/basic-bars-stacked.js b/examples/js/examples/basic-bars-stacked.js
index <HASH>..<HASH> 100644
--- a/examples/js/examples/basic-bars-stacked.js
+++ b/examples/js/examples/basic-bars-stacked.js
@@ -10,7 +10,8 @@ Flotr.ExampleList.add({
key : 'basic-stacked-horizontal',
name : 'Stacked Horizontal Bars',
args : [true],
- callback : bars_stacked
+ callback : bars_stacked,
+ tolerance : 5
});
function bars_stacked (container, horizontal) {
diff --git a/examples/js/examples/basic-bars.js b/examples/js/examples/basic-bars.js
index <HASH>..<HASH> 100644
--- a/examples/js/examples/basic-bars.js
+++ b/examples/js/examples/basic-bars.js
@@ -10,7 +10,8 @@ Flotr.ExampleList.add({
key : 'basic-bars-horizontal',
name : 'Horizontal Bars',
args : [true],
- callback : basic_bars
+ callback : basic_bars,
+ tolerance : 5
});
function basic_bars (container, horizontal) {
|
Added small tolerance to bars to pass tests after transformations.
|
diff --git a/examples/using-jquery-for-ajax.js b/examples/using-jquery-for-ajax.js
index <HASH>..<HASH> 100644
--- a/examples/using-jquery-for-ajax.js
+++ b/examples/using-jquery-for-ajax.js
@@ -26,15 +26,6 @@ var v1 = new v1sdk.V1Meta({
headers: headerObj, // Include provided authorization headers { Authorization: 'Basic: .....' }
dataType: 'json' // SDK only supports JSON from the V1 Server
});
- },
- get: function (url, data) {
- return $.ajax({
- url: url,
- method: 'GET',
- data: data,
- dataType: 'json' // SDK only supports JSON from the V1 Server
-
- });
}
});
|
Update the documentation to reflect the changes in removing get param to the V1Meta constructor.
|
diff --git a/mlbgame/__init__.py b/mlbgame/__init__.py
index <HASH>..<HASH> 100644
--- a/mlbgame/__init__.py
+++ b/mlbgame/__init__.py
@@ -228,8 +228,9 @@ def game_events(game_id):
return [mlbgame.events.Inning(data[x], x) for x in data]
-def important_dates(year=datetime.now().year):
+def important_dates(year=None):
"""Return ImportantDates object that contains MLB important dates"""
+ year = datetime.now().year if not year else year
data = mlbgame.info.important_dates(year)
return mlbgame.info.ImportantDates(data)
|
Don't calculate year at import time
|
diff --git a/tests/test_web_websocket_functional.py b/tests/test_web_websocket_functional.py
index <HASH>..<HASH> 100644
--- a/tests/test_web_websocket_functional.py
+++ b/tests/test_web_websocket_functional.py
@@ -41,7 +41,7 @@ class TestWebWebSocketFunctional(unittest.TestCase):
return app, srv, url
@asyncio.coroutine
- def connect_ws(self, url, protocol='chat'):
+ def connect_ws(self, url, protocol=''):
sec_key = base64.b64encode(os.urandom(16))
conn = aiohttp.TCPConnector(loop=self.loop)
|
Cleanup tests: drop extra warning about chat websocket protocol
|
diff --git a/drools-core/src/main/java/org/drools/common/DefaultAgenda.java b/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
index <HASH>..<HASH> 100644
--- a/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
+++ b/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
@@ -1410,7 +1410,7 @@ public class DefaultAgenda
try {
this.knowledgeHelper.setActivation( activation );
- System.out.println( activation.getRule().getName() );
+ //System.out.println( activation.getRule().getName() );
activation.getConsequence().evaluate( this.knowledgeHelper,
this.workingMemory );
this.knowledgeHelper.cancelRemainingPreviousLogicalDependencies();
|
Removing spurious System.out
|
diff --git a/barf/barf/barf.py b/barf/barf/barf.py
index <HASH>..<HASH> 100644
--- a/barf/barf/barf.py
+++ b/barf/barf/barf.py
@@ -145,6 +145,7 @@ class BARF(object):
self.smt_translator = SmtTranslator(self.smt_solver, self.arch_info.address_size)
self.ir_emulator.set_arch_registers(self.arch_info.registers_gp_all)
+ self.ir_emulator.set_arch_flags(self.arch_info.registers_flags)
self.ir_emulator.set_arch_registers_size(self.arch_info.registers_size)
self.ir_emulator.set_arch_alias_mapper(self.arch_info.alias_mapper)
|
Fix missing emulator native flags set up.
|
diff --git a/libraries/TeamSpeak3/Node/Client.php b/libraries/TeamSpeak3/Node/Client.php
index <HASH>..<HASH> 100644
--- a/libraries/TeamSpeak3/Node/Client.php
+++ b/libraries/TeamSpeak3/Node/Client.php
@@ -324,6 +324,8 @@ class TeamSpeak3_Node_Client extends TeamSpeak3_Node_Abstract
$groups[] = $this->getParent()->serverGroupGetById($sgid);
}
+ uasort($groups, array(__CLASS__, "sortGroupList"));
+
return $groups;
}
|
sort client groups in memberOf()
|
diff --git a/dwave/system/package_info.py b/dwave/system/package_info.py
index <HASH>..<HASH> 100644
--- a/dwave/system/package_info.py
+++ b/dwave/system/package_info.py
@@ -14,7 +14,7 @@
__all__ = ['__version__', '__author__', '__authoremail__', '__description__']
-__version__ = '1.6.0.dev0'
+__version__ = '1.6.0'
__author__ = 'D-Wave Systems Inc.'
__authoremail__ = 'acondello@dwavesys.com'
__description__ = 'All things D-Wave System.'
|
Release <I>
Fixes
---
- Updated sphinx and docs conf (#<I>)
- Documented samplers async behavior (#<I>)
- Added more properties to `MockDWaveSampler` (#<I>)
- CI refactored; leaner integration tests (#<I>)
Changes
---
- Dropped Python <I> support (#<I>)
|
diff --git a/lib/dm-core/query.rb b/lib/dm-core/query.rb
index <HASH>..<HASH> 100644
--- a/lib/dm-core/query.rb
+++ b/lib/dm-core/query.rb
@@ -625,7 +625,9 @@ module DataMapper
properties = Set.new
each_comparison do |comparison|
- properties << comparison.subject if comparison.subject.kind_of?(Property)
+ next unless comparison.respond_to?(:subject)
+ subject = comparison.subject
+ properties << subject if subject.kind_of?(Property)
end
properties
|
Filter out non-comparison objects from Query#condition_properties
|
diff --git a/spec/mongoid/tree_spec.rb b/spec/mongoid/tree_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/mongoid/tree_spec.rb
+++ b/spec/mongoid/tree_spec.rb
@@ -32,7 +32,7 @@ describe Mongoid::Tree do
describe 'when new' do
it "should not require a saved parent when adding children" do
root = Node.new(:name => 'root'); child = Node.new(:name => 'child')
- expect { root.children << child; root.save! }.to_not raise_error(Mongoid::Errors::DocumentNotFound)
+ expect { root.children << child; root.save! }.to_not raise_error
child.should be_persisted
end
@@ -409,7 +409,7 @@ describe Mongoid::Tree do
it 'should not raise a NoMethodError' do
node = NodeWithEmbeddedDocument.new
document = node.build_embedded_document
- expect { node.save }.to_not raise_error NoMethodError
+ expect { node.save }.to_not raise_error
end
end
|
Removes specific error classes from .not_to raise_error expectations
|
diff --git a/experimental/plugins/Imexam.py b/experimental/plugins/Imexam.py
index <HASH>..<HASH> 100644
--- a/experimental/plugins/Imexam.py
+++ b/experimental/plugins/Imexam.py
@@ -154,8 +154,6 @@ class Imexam(GingaPlugin.LocalPlugin):
hbox.add_widget(Widgets.Label(''), stretch=1)
top.add_widget(hbox, stretch=0)
- top.add_widget(hbox, stretch=0)
-
hbox = Widgets.HBox()
lbl = Widgets.Label("Keys active:")
hbox.add_widget(lbl)
@@ -237,7 +235,6 @@ class Imexam(GingaPlugin.LocalPlugin):
def start(self):
self.instructions()
- # start ruler drawing operation
p_canvas = self.fitsimage.get_canvas()
if not p_canvas.has_object(self.canvas):
p_canvas.add(self.canvas, tag=self.layertag)
|
Fixed an issue with adding a widget twice into a container
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup
setup(name='botometer',
- version='1.4',
+ version='1.5',
description='Check Twitter accounts for bot behavior',
url='https://github.com/IUNetSci/botometer-python',
download_url='https://github.com/IUNetSci/botometer-python/archive/1.0.zip',
|
Bump botometer-python version
|
diff --git a/werkzeug/wrappers.py b/werkzeug/wrappers.py
index <HASH>..<HASH> 100644
--- a/werkzeug/wrappers.py
+++ b/werkzeug/wrappers.py
@@ -550,7 +550,7 @@ class BaseRequest(object):
@cached_property
def url(self):
- """The reconstructed current URL"""
+ """The reconstructed current URL as IRI."""
return get_current_url(self.environ,
trusted_hosts=self.trusted_hosts)
@@ -562,13 +562,15 @@ class BaseRequest(object):
@cached_property
def url_root(self):
- """The full URL root (with hostname), this is the application root."""
+ """The full URL root (with hostname), this is the application
+ root as IRI.
+ """
return get_current_url(self.environ, True,
trusted_hosts=self.trusted_hosts)
@cached_property
def host_url(self):
- """Just the host with scheme."""
+ """Just the host with scheme as IRI."""
return get_current_url(self.environ, host_only=True,
trusted_hosts=self.trusted_hosts)
|
Documented URLs being IRIs in wrappers.
|
diff --git a/scripts/release.js b/scripts/release.js
index <HASH>..<HASH> 100644
--- a/scripts/release.js
+++ b/scripts/release.js
@@ -115,10 +115,8 @@ const release = async () => {
'--dist-tag',
distTag
]
- // keep packages' minor version in sync
- if (releaseType !== 'patch') {
- lernaArgs.push('--force-publish')
- }
+ // keep all packages' versions in sync
+ lernaArgs.push('--force-publish')
if (cliOptions['local-registry']) {
lernaArgs.push('--no-git-tag-version', '--no-commit-hooks', '--no-push', '--yes')
|
workflow: keep all packages' versions in sync to reduce cognitive load
|
diff --git a/avatar/views.py b/avatar/views.py
index <HASH>..<HASH> 100644
--- a/avatar/views.py
+++ b/avatar/views.py
@@ -95,6 +95,7 @@ def img(request, email_hash, resize_method=Image.ANTIALIAS):
def change(request, extra_context={}, next_override=None):
if request.method == "POST":
dirname = os.path.join(settings.MEDIA_ROOT, 'avatars')
+ os.makedirs(dirname)
filename = "%s.jpg" % request.user.avatar.email_hash
full_filename = os.path.join(dirname, filename)
(destination, destination_path) = tempfile.mkstemp()
|
Make sure to make the directories before uploading, too.
git-svn-id: <URL>
|
diff --git a/archivex.go b/archivex.go
index <HASH>..<HASH> 100644
--- a/archivex.go
+++ b/archivex.go
@@ -296,18 +296,18 @@ func (t *TarFile) AddAll(dir string, includeCurrentFolder bool) error {
// Close the file Tar
func (t *TarFile) Close() error {
+ err := t.Writer.Close()
+ if err != nil {
+ return err
+ }
+
if t.Compressed {
- err := t.GzWriter.Close()
+ err = t.GzWriter.Close()
if err != nil {
return err
}
}
- err := t.Writer.Close()
- if err != nil {
- return err
- }
-
return err
}
|
the file was being closed in the wrong order
|
diff --git a/memcache/memcache_test.go b/memcache/memcache_test.go
index <HASH>..<HASH> 100644
--- a/memcache/memcache_test.go
+++ b/memcache/memcache_test.go
@@ -113,6 +113,12 @@ func testWithClient(t *testing.T, c *Client) {
t.Errorf("get(foo) Flags = %v, want 123", it.Flags)
}
+ // Get non-existant
+ _, err = c.Get("not-exists")
+ if err != ErrCacheMiss {
+ t.Errorf("get(not-exists): expecting %v, got %v instead", ErrCacheMiss, err)
+ }
+
// Add
bar := &Item{Key: "bar", Value: []byte("barval")}
err = c.Add(bar)
|
In tests, check that getting a non-existant key works
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -26,11 +26,12 @@ module.exports = function (onSelect) {
})
if(''+sel === ''+selection) return
d.selected = selection = sel
+ if(onSelect) onSelect(selection)
return sel
}
var d = h('div.hypertabs.column', Menu(content, function () {
- getSelection() && onSelect && onSelect(selection)
+ getSelection()
}), h('div.column', content))
var selection = d.selected = []
@@ -92,3 +93,4 @@ module.exports = function (onSelect) {
+
|
always call onSelect when the selection changes
|
diff --git a/js/browser.js b/js/browser.js
index <HASH>..<HASH> 100644
--- a/js/browser.js
+++ b/js/browser.js
@@ -1738,6 +1738,7 @@ Browser.prototype.realMakeTier = function(source) {
this.tierHolder.appendChild(viewport);
this.tiers.push(tier); // NB this currently tells any extant knownSpace about the new tier.
this.refreshTier(tier);
+ this.arrangeTiers();
}
Browser.prototype.removeTier = function(tier) {
diff --git a/js/tier.js b/js/tier.js
index <HASH>..<HASH> 100644
--- a/js/tier.js
+++ b/js/tier.js
@@ -19,7 +19,7 @@ function DasTier(browser, source, viewport, background)
this.viewport = viewport;
this.background = background;
this.req = null;
- this.layoutHeight = 50;
+ this.layoutHeight = 25;
this.bumped = true;
if (this.dasSource.collapseSuperGroups) {
this.bumped = false;
|
Ensure newly-added tiers show up even if it takes a while for the data to arrive.
|
diff --git a/src/api/http/api.go b/src/api/http/api.go
index <HASH>..<HASH> 100644
--- a/src/api/http/api.go
+++ b/src/api/http/api.go
@@ -89,7 +89,7 @@ func (self *HttpServer) registerEndpoint(p *pat.PatternServeMux, method string,
version := self.clusterConfig.GetLocalConfiguration().Version
switch method {
case "get":
- p.Get(pattern, HeaderHandler(f, version))
+ p.Get(pattern, CompressionHeaderHandler(f, version))
case "post":
p.Post(pattern, HeaderHandler(f, version))
case "del":
|
Enable compression on all GET requests
|
diff --git a/util.go b/util.go
index <HASH>..<HASH> 100644
--- a/util.go
+++ b/util.go
@@ -335,8 +335,7 @@ func CheckSha256(filePath, expectedSha256 string) error {
}
func downloadFile(url, destFile string) error {
- client := &http.Client{Transport: &http.Transport{Proxy: http.ProxyFromEnvironment}}
- resp, err := client.Get(url)
+ resp, err := http.Get(url)
if err != nil {
return err
}
|
Revert to using http.Get whose default client respects proxy settings
|
diff --git a/lib/qunited/runner.rb b/lib/qunited/runner.rb
index <HASH>..<HASH> 100644
--- a/lib/qunited/runner.rb
+++ b/lib/qunited/runner.rb
@@ -1,9 +1,12 @@
module QUnited
class Runner
+
+ # The drivers in order of which to use first when not otherwise specified
+ DRIVERS = [:PhantomJs, :Rhino].map { |driver| ::QUnited::Driver.const_get(driver) }.freeze
+
def self.run(js_source_files, js_test_files)
- js_runner_klass = self.js_runner
- # TODO: test that this JsRunner can run with current environment
- runner = js_runner_klass.new(js_source_files, js_test_files)
+ driver_class = self.best_available_driver
+ runner = driver_class.new(js_source_files, js_test_files)
puts "\n# Running JavaScript tests with #{runner.name}:\n\n"
@@ -13,11 +16,8 @@ module QUnited
end
# Get the runner that we will be using to run the JavaScript tests.
- #
- # Right now we only have one JavaScript runner, but when we have multiple we will have to
- # determine which one we will used unless explicitly configured.
- def self.js_runner
- ::QUnited::JsRunner::Rhino
+ def self.best_available_driver
+ DRIVERS.find { |driver| driver.available? }
end
end
end
|
Added PhantomJS as a priority driver over Rhino
|
diff --git a/troposphere/cloudwatch.py b/troposphere/cloudwatch.py
index <HASH>..<HASH> 100644
--- a/troposphere/cloudwatch.py
+++ b/troposphere/cloudwatch.py
@@ -3,7 +3,7 @@
#
# See LICENSE file for full license.
-from . import AWSObject, AWSProperty
+from . import AWSObject, AWSProperty, Tags
from .validators import (boolean, double, exactly_one, json_checker,
positive_integer, integer)
@@ -156,6 +156,7 @@ class InsightRule(AWSObject):
'RuleBody': (basestring, True),
'RuleName': (basestring, True),
'RuleState': (basestring, True),
+ 'Tags': (Tags, False),
}
|
Adding AWS::CloudWatch::InsightRule props, per April 2, <I> update
|
diff --git a/juju/osenv/home.go b/juju/osenv/home.go
index <HASH>..<HASH> 100644
--- a/juju/osenv/home.go
+++ b/juju/osenv/home.go
@@ -49,15 +49,15 @@ func JujuHomePath(names ...string) string {
// JujuHome returns the directory where juju should store application-specific files
func JujuHomeDir() string {
- JujuHomeEnvKey := os.Getenv(JujuHomeEnvKey)
- if JujuHomeEnvKey == "" {
+ JujuHomeDir := os.Getenv(JujuHomeEnvKey)
+ if JujuHomeDir == "" {
if runtime.GOOS == "windows" {
- JujuHomeEnvKey = jujuHomeWin()
+ JujuHomeDir = jujuHomeWin()
} else {
- JujuHomeEnvKey = jujuHomeLinux()
+ JujuHomeDir = jujuHomeLinux()
}
}
- return JujuHomeEnvKey
+ return JujuHomeDir
}
// jujuHomeLinux returns the directory where juju should store application-specific files on Linux.
diff --git a/utils/apt.go b/utils/apt.go
index <HASH>..<HASH> 100644
--- a/utils/apt.go
+++ b/utils/apt.go
@@ -11,8 +11,9 @@ import (
"regexp"
"strings"
- "launchpad.net/juju-core/juju/osenv"
"launchpad.net/loggo"
+
+ "launchpad.net/juju-core/juju/osenv"
)
var (
|
Made changes from axw's review.
|
diff --git a/lib/open_namespace/open_namespace.rb b/lib/open_namespace/open_namespace.rb
index <HASH>..<HASH> 100644
--- a/lib/open_namespace/open_namespace.rb
+++ b/lib/open_namespace/open_namespace.rb
@@ -17,7 +17,7 @@ module OpenNamespace
# @since 0.3.0
#
def OpenNamespace.constant_path(name)
- path = name.to_s
+ path = name.to_s.dup
# back-ported from extlib's String#to_const_path
path.gsub!(/::/,'/')
@@ -27,8 +27,8 @@ module OpenNamespace
path.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
path.gsub!(/([a-z])([A-Z])/, '\1_\2')
end
- path.downcase!
+ path.downcase!
return path
end
end
|
Prevent the constant name from being modified when constructing the path.
|
diff --git a/src/lib/cloud.js b/src/lib/cloud.js
index <HASH>..<HASH> 100644
--- a/src/lib/cloud.js
+++ b/src/lib/cloud.js
@@ -47,8 +47,8 @@ export default {
return devices.filter(d => d.connected);
case (filter === 'offline'):
return devices.filter(d => !d.connected);
- case (Object.keys(platformsByName).indexOf(filter) >= 0):
- return devices.filter(d => d.platform_id === platformsByName[filter]);
+ case (Object.keys(platformsByName).indexOf(filter.toLowerCase()) >= 0):
+ return devices.filter(d => d.platform_id === platformsByName[filter.toLowerCase()]);
default:
return devices.filter(d => d.name === filter || d.id === filter);
}
|
case-insensitive match to platforms for list filter
|
diff --git a/src/HtmlPageCrawler.php b/src/HtmlPageCrawler.php
index <HASH>..<HASH> 100644
--- a/src/HtmlPageCrawler.php
+++ b/src/HtmlPageCrawler.php
@@ -808,7 +808,7 @@ class HtmlPageCrawler extends Crawler
/** @var \DOMNode $newnode */
$newnode = static::importNewnode($newnode, $parent);
- $parent->appendChild($newnode);
+ $newnode = $parent->insertBefore($newnode,$this->getNode(0));
$content->clear();
$content->add($newnode);
|
Wrapped nodes retains position of first node in list
|
diff --git a/cake/libs/model/behaviors/translate.php b/cake/libs/model/behaviors/translate.php
index <HASH>..<HASH> 100644
--- a/cake/libs/model/behaviors/translate.php
+++ b/cake/libs/model/behaviors/translate.php
@@ -229,8 +229,6 @@ class TranslateBehavior extends ModelBehavior {
if(isset($model->data[$model->name][$field])) {
$tempData[$field] = $model->data[$model->name][$field];
unset($model->data[$model->name][$field]);
- } else {
- $tempData[$field] = '';
}
}
$this->runtime[$model->name]['beforeSave'] = $tempData;
|
Adding patch from Ticket #<I>, fixes TranslateBehavior doesn't work with Model::saveField()
git-svn-id: <URL>
|
diff --git a/src/LogEvent.php b/src/LogEvent.php
index <HASH>..<HASH> 100644
--- a/src/LogEvent.php
+++ b/src/LogEvent.php
@@ -141,21 +141,8 @@ class LogEvent extends \ArrayObject implements ILogger
$context['time'] = microtime(true);
}
- // Set formatted UTC timestamp (Seriously PHP?)
- $timeParts = explode('.', $context['time']);
-
- // If you're lucky and PHP returns the exact second...
- if (count($timeParts) === 1) {
- $timeParts[1] = '0000';
- }
-
- // Add some padding if needed
- $timeParts[1] = str_pad($timeParts[1], 4, '0');
-
- $datetime = new \DateTime();
- $datetime->setTimezone(new \DateTimeZone('UTC'));
- $datetime->setTimestamp($timeParts[0]);
- return $datetime->format('Y-m-d\TH:i:s.') . $timeParts[1] . 'Z';
+ $datetime = \DateTime::createFromFormat('U.u', sprintf('%.4F', $context['time']), new \DateTimeZone('UTC'));
+ return $datetime->format('Y-m-d\TH:i:s.') . substr($datetime->format('u'), 0, 4) . 'Z';
}
/**
|
Made the timestamp creation a bit easier
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.