diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/tests/unit/models/physics/HydraulicConductanceTest.py b/tests/unit/models/physics/HydraulicConductanceTest.py
index <HASH>..<HASH> 100644
--- a/tests/unit/models/physics/HydraulicConductanceTest.py
+++ b/tests/unit/models/physics/HydraulicConductanceTest.py
@@ -46,7 +46,12 @@ class HydraulicConductanceTest:
assert _sp.allclose(a=self.phys['throat.conductance'][0],
b=1330.68207684)
- def test_valvatne_blunte(self):
+ def test_valvatne_blunt(self):
+ self.phase = op.phases.GenericPhase(network=self.net)
+ self.phase['pore.viscosity'] = 1e-5
+ self.phys = op.physics.GenericPhysics(network=self.net,
+ phase=self.phase,
+ geometry=self.geo)
mod = op.models.physics.hydraulic_conductance.valvatne_blunt
sf = np.sqrt(3)/36.0
self.geo['pore.shape_factor'] = np.ones(self.geo.Np)*sf
|
removing bug from test valvatne model.
|
diff --git a/webpack.demo.config.js b/webpack.demo.config.js
index <HASH>..<HASH> 100644
--- a/webpack.demo.config.js
+++ b/webpack.demo.config.js
@@ -28,7 +28,7 @@ module.exports = function(directory) {
rules: [
{
test: /\.jsx?$/,
- exclude: 'node-modules/',
+ exclude: /node_modules/,
use: [
{ loader: 'babel-loader' },
{ loader: path.resolve(__dirname, './scripts/html-pre-tag-loader') }
|
fix exclude in webpack demo config
|
diff --git a/consolemenu/menu_component.py b/consolemenu/menu_component.py
index <HASH>..<HASH> 100644
--- a/consolemenu/menu_component.py
+++ b/consolemenu/menu_component.py
@@ -192,7 +192,7 @@ class MenuComponent(object):
# apply indentation to any lines after the first that were split by a users newline
line = indent + line
# apply any wrapping and indentation if the line is still too long
- wrapped = textwrap.wrap(line, width=self.calculate_content_width(), subsequent_indent=indent)
+ wrapped = ansiwrap.wrap(line, width=self.calculate_content_width(), subsequent_indent=indent)
for wrapline in wrapped:
# Finally, this adds the borders and things to the string
# TODO: check compatability on super() calls
@@ -270,8 +270,7 @@ class MenuTextSection(MenuComponent):
for x in range(0, self.padding.top):
yield self.row()
if self.text is not None and self.text != '':
- for line in ansiwrap.wrap(self.text, width=self.calculate_content_width()):
- yield self.row(content=line, align=self.text_align)
+ yield self.row(content=self.text, align=self.text_align)
for x in range(0, self.padding.bottom):
yield self.row()
if self.show_bottom_border:
|
text wrapping and ascii handling is now handled within the row function
|
diff --git a/src/Cache/Pool.php b/src/Cache/Pool.php
index <HASH>..<HASH> 100644
--- a/src/Cache/Pool.php
+++ b/src/Cache/Pool.php
@@ -7,6 +7,7 @@ use Psr\Cache\CacheItemInterface;
use Dabble\Adapter\Sqlite;
use Dabble\Query\Exception;
use Dabble\Query\DeleteException;
+use ErrorException;
/**
* A simple cache pool for Gentry.
@@ -35,13 +36,23 @@ class Pool implements CacheItemPoolInterface
{
$this->client = getenv("GENTRY_CLIENT");
if (!isset(self::$db)) {
- self::$db = new Sqlite(getenv("GENTRY_VENDOR").'/gentry.sq3');
+ $path = sys_get_temp_dir().'/'.getenv("GENTRY_CLIENT").'.sq3';
+ self::$db = new Sqlite($path);
self::$db->exec("CREATE TABLE IF NOT EXISTS items (
pool VARCHAR(6),
keyname VARCHAR(32),
value TEXT,
PRIMARY KEY(pool, keyname)
)");
+ chmod($path, 0666);
+ }
+ }
+
+ public function __destruct()
+ {
+ try {
+ @unlink(sys_get_temp_dir().'/'.getenv("GENTRY_CLIENT").'.sq3');
+ } catch (ErrorException $e) {
}
}
|
place temp sqlite db in /tmp, and delete when done
|
diff --git a/src/map/parser.js b/src/map/parser.js
index <HASH>..<HASH> 100644
--- a/src/map/parser.js
+++ b/src/map/parser.js
@@ -141,6 +141,9 @@ export default class MapParser extends EventEmitter {
* @private
*/
_parseChunk (id, size) {
+ // Clear Lookback
+ this.parser.resetLookBackStrings();
+
switch (id) {
// ======== HEADER =========
case '50606082': // 0x03043002
diff --git a/src/util/parser-extensions.js b/src/util/parser-extensions.js
index <HASH>..<HASH> 100644
--- a/src/util/parser-extensions.js
+++ b/src/util/parser-extensions.js
@@ -47,3 +47,10 @@ BufferReader.prototype.nextLookBackString = function () { // Lookback Baguette
}
return this.lookbackStore[inp-1];
};
+
+BufferReader.prototype.resetLookBackStrings = function () {
+ if (this.lookbackSeen) {
+ this.lookbackStore = [];
+ this.lookbackSeen = false;
+ }
+};
|
Fix, reset lookback after each chunk.
|
diff --git a/contrib/mesos/pkg/executor/service/service.go b/contrib/mesos/pkg/executor/service/service.go
index <HASH>..<HASH> 100644
--- a/contrib/mesos/pkg/executor/service/service.go
+++ b/contrib/mesos/pkg/executor/service/service.go
@@ -99,6 +99,12 @@ func NewKubeletExecutorServer() *KubeletExecutorServer {
k.Address = net.ParseIP(defaultBindingAddress())
k.ShutdownFD = -1 // indicates unspecified FD
+ // empty string for all containers (= cgroup paths) which stop the kubelet
+ // from taking any control over the cgroups of itself and other system processes.
+ k.SystemContainer = ""
+ k.ResourceContainer = ""
+ k.DockerDaemonContainer = ""
+
return k
}
@@ -134,8 +140,6 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {
// derive the executor cgroup and use it as docker cgroup root
mesosCgroup := findMesosCgroup(s.cgroupPrefix)
s.cgroupRoot = mesosCgroup
- s.SystemContainer = mesosCgroup
- s.ResourceContainer = mesosCgroup
log.V(2).Infof("passing cgroup %q to the kubelet as cgroup root", s.CgroupRoot)
// create apiserver client
|
Stop the kubelet from taking control over cgroups and other processes
|
diff --git a/sos/plugins/as7.py b/sos/plugins/as7.py
index <HASH>..<HASH> 100644
--- a/sos/plugins/as7.py
+++ b/sos/plugins/as7.py
@@ -2,6 +2,7 @@ import os
import re
import zipfile
import urllib2
+import tempfile
try:
import json
@@ -282,6 +283,23 @@ class AS7(Plugin, IndependentPlugin):
self.getOption("logsize"),
sub=(self.__jbossHome, 'JBOSSHOME'))
+ for deployment in find("*", os.path.join(path, "deployments")):
+ self._get_tree_from_deployment(deployment)
+
+
+ def _get_tree_from_deployment(self, path):
+ tmp_dir = tempfile.mkdtemp()
+ try:
+ zf = zipfile.ZipFile(path)
+ zf.extractall(path=tmp_dir)
+ zf.close()
+ tree = DirTree(tmp_dir).as_string()
+ self.addStringAsFile(tree, "%s.tree.txt" % os.path.basename(path))
+ except zipfile.BadZipfile:
+ pass
+ os.rmdir(tmp_dir)
+
+
def setup(self):
## We need to know where JBoss is installed and if we can't find it we
|
adding a tree of all zipped deployments
|
diff --git a/src/Annotator/EntityAnnotator.php b/src/Annotator/EntityAnnotator.php
index <HASH>..<HASH> 100644
--- a/src/Annotator/EntityAnnotator.php
+++ b/src/Annotator/EntityAnnotator.php
@@ -28,6 +28,7 @@ class EntityAnnotator extends AbstractAnnotator {
'longtext' => 'string',
'array' => 'array',
'json' => 'array',
+ 'binaryuuid' => 'string',
];
/**
|
Make binaryuuid annotate as string.
|
diff --git a/test/functional/ft_14_re_apply.rb b/test/functional/ft_14_re_apply.rb
index <HASH>..<HASH> 100644
--- a/test/functional/ft_14_re_apply.rb
+++ b/test/functional/ft_14_re_apply.rb
@@ -115,6 +115,7 @@ class FtReApplyTest < Test::Unit::TestCase
stalled_exp.tree = [
'participant', { 'ref' => 'alpha', 'activity' => 'mow lawn' }, [] ]
+ stalled_exp.persist
@engine.re_apply(stalled_exp.fei)
|
when there is no caching, persisting the modified exp before re_applying is necessary
|
diff --git a/ginga/version.py b/ginga/version.py
index <HASH>..<HASH> 100644
--- a/ginga/version.py
+++ b/ginga/version.py
@@ -1,7 +1,7 @@
# this file was automatically generated
major = 2
minor = 0
-release = 20131222233539
+release = 20131224023332
version = '%d.%d.%d' % (major, minor, release)
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ setup(
# Matplotlib version
'ginga.mplw',
# Common stuff
- 'ginga.misc', 'ginga.misc.plugins',
+ 'ginga.misc', 'ginga.misc.plugins', 'ginga.base',
# Misc
'ginga.util', 'ginga.icons', 'ginga.doc'
],
|
Fix for setup.py
bumped release
|
diff --git a/features/step_definitions/steps.js b/features/step_definitions/steps.js
index <HASH>..<HASH> 100644
--- a/features/step_definitions/steps.js
+++ b/features/step_definitions/steps.js
@@ -47,11 +47,11 @@ defineSupportCode(function ({ Given, When, Then }) {
return this.assertOutputIncludes(expectedOutput)
})
- Then('stdout should include {arg1:stringInDoubleQuotes}', function (expectedOutput) {
+ Then('stdout should include {expectedOutput:stringInDoubleQuotes}', function (expectedOutput) {
return this.assertStdoutIncludes(expectedOutput)
})
- Then('stderr should include {arg1:stringInDoubleQuotes}', function (expectedOutput) {
+ Then('stderr should include {expectedOutput:stringInDoubleQuotes}', function (expectedOutput) {
return this.assertStderrIncludes(expectedOutput)
})
})
|
Sane param names in step defs
|
diff --git a/config/addresses.go b/config/addresses.go
index <HASH>..<HASH> 100644
--- a/config/addresses.go
+++ b/config/addresses.go
@@ -2,7 +2,9 @@ package config
// Addresses stores the (string) multiaddr addresses for the node.
type Addresses struct {
- Swarm []string // addresses for the swarm network
- API string // address for the local API (RPC)
- Gateway string // address to listen on for IPFS HTTP object gateway
+ Swarm []string // addresses for the swarm to listen on
+ Announce []string // swarm addresses to announce to the network
+ NoAnnounce []string // swarm addresses not to announce to the network
+ API string // address for the local API (RPC)
+ Gateway string // address to listen on for IPFS HTTP object gateway
}
diff --git a/config/init.go b/config/init.go
index <HASH>..<HASH> 100644
--- a/config/init.go
+++ b/config/init.go
@@ -36,8 +36,10 @@ func Init(out io.Writer, nBitsForKeypair int) (*Config, error) {
// "/ip4/0.0.0.0/udp/4002/utp", // disabled for now.
"/ip6/::/tcp/4001",
},
- API: "/ip4/127.0.0.1/tcp/5001",
- Gateway: "/ip4/127.0.0.1/tcp/8080",
+ Announce: []string{},
+ NoAnnounce: []string{},
+ API: "/ip4/127.0.0.1/tcp/5001",
+ Gateway: "/ip4/127.0.0.1/tcp/8080",
},
Datastore: datastore,
|
go-ipfs-config: core: make announced swarm addresses configurable
License: MIT
|
diff --git a/lnd.go b/lnd.go
index <HASH>..<HASH> 100644
--- a/lnd.go
+++ b/lnd.go
@@ -224,6 +224,7 @@ func Main(lisCfg ListenerCfg) error {
// Open the channeldb, which is dedicated to storing channel, and
// network related metadata.
+ ltndLog.Infof("Opening the channeldb, might take a few minutes")
chanDB, err := channeldb.Open(
graphDir,
channeldb.OptionSetRejectCacheSize(cfg.Caches.RejectCacheSize),
|
Update channeldb opening log
It might take a few minutes and it should therefore state it...
|
diff --git a/lib/discordrb/data.rb b/lib/discordrb/data.rb
index <HASH>..<HASH> 100644
--- a/lib/discordrb/data.rb
+++ b/lib/discordrb/data.rb
@@ -121,6 +121,14 @@ module Discordrb
@bot.add_await(key, Discordrb::Events::MessageEvent, { from: @id }.merge(attributes), &block)
end
+ # Gets the member this user is on a server
+ # @param server [Server] The server to get the member for
+ # @return [Member] this user as a member on a particular server
+ def on(server)
+ id = server.resolve_id
+ @bot.server(id).member(@id)
+ end
+
# Is the user the bot?
# @return [true, false] whether this user is the bot
def bot?
|
Create a method to get a user as a member on a particular server
|
diff --git a/utp.go b/utp.go
index <HASH>..<HASH> 100644
--- a/utp.go
+++ b/utp.go
@@ -674,8 +674,14 @@ func (s *Socket) LocalAddr() net.Addr {
return s.pc.LocalAddr()
}
-func (s *Socket) ReadFrom([]byte) (int, net.Addr, error) {
- return 0, nil, nil
+func (s *Socket) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
+ read, ok := <-s.unusedReads
+ if !ok {
+ err = io.EOF
+ }
+ n = copy(p, read.data)
+ addr = read.from
+ return
}
func (s *Socket) SetDeadline(time.Time) error {
@@ -690,8 +696,8 @@ func (s *Socket) SetWriteDeadline(time.Time) error {
return nil
}
-func (s *Socket) WriteTo([]byte, net.Addr) (int, error) {
- return 0, nil
+func (s *Socket) WriteTo(b []byte, addr net.Addr) (int, error) {
+ return s.pc.WriteTo(b, addr)
}
func (c *Conn) finish() {
|
Implement some net.Conn functions on Socket
|
diff --git a/tests/test_oauth.py b/tests/test_oauth.py
index <HASH>..<HASH> 100644
--- a/tests/test_oauth.py
+++ b/tests/test_oauth.py
@@ -397,8 +397,18 @@ class TestRequest(unittest.TestCase):
del foo["oauth_signature"]
self.assertEqual(urllib.urlencode(sorted(foo.items())), res)
-
-
+ def test_get_normalized_string_escapes_spaces_properly(self):
+ url = "http://sp.example.com/"
+ params = {
+ "some_random_data": random.randint(100, 1000),
+ "data": "This data with a random number (%d) has spaces!" % random.randint(1000, 2000),
+ }
+
+ req = oauth.Request("GET", url, params)
+ res = req.get_normalized_parameters()
+ expected = urllib.urlencode(sorted(params.items())).replace('+', '%20')
+ self.assertEqual(expected, res)
+
def test_sign_request(self):
url = "http://sp.example.com/"
|
Add a test to prove the code...
|
diff --git a/tool.py b/tool.py
index <HASH>..<HASH> 100755
--- a/tool.py
+++ b/tool.py
@@ -754,6 +754,7 @@ class IANA(object):
'athleta': 'whois.nic.athleta',
'audible': 'whois.nic.audible',
'author': 'whois.nic.author',
+ 'aws': 'whois.nic.aws',
'bm': 'whois.afilias-srs.net',
'bz': 'whois.afilias-grs.net',
'buzz': 'whois.nic.buzz',
@@ -1172,7 +1173,7 @@ if __name__ == '__main__':
'-v',
'--version',
action='version',
- version='%(prog)s 0.9.1-beta'
+ version='%(prog)s 0.9.2-beta'
)
ARGS = PARSER.parse_args()
|
Introduction of `aws` whois server
cf: Whois lookup to whois.nic.aws
|
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index <HASH>..<HASH> 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -292,6 +292,32 @@ class Controller extends Object {
*/
var $methods = array();
/**
+ * This controller's primary model class name, the Inflector::classify()'ed verision of
+ * the controller's $name property.
+ *
+ * Example: For a controller named 'Comments', the modelClass would be 'Comment'
+ *
+ * @var string
+ * @access public
+ */
+ var $modelClass = null;
+/**
+ * This controller's model key name, an underscored version of the controller's $modelClass property.
+ *
+ * Example: For a controller named 'ArticleComments', the modelKey would be 'article_comment'
+ *
+ * @var string
+ * @access public
+ */
+ var $modelKey = null;
+/**
+ * Holds any validation errors produced by the last call of the validateErrors() method/
+ *
+ * @var array Validation errors, or false if none
+ * @access public
+ */
+ var $validationErrors = null;
+/**
* Constructor.
*
*/
|
Adding doc blocks for properties that previously had no documentation. Closes #<I>
git-svn-id: <URL>
|
diff --git a/src/vue-data-scooper.js b/src/vue-data-scooper.js
index <HASH>..<HASH> 100644
--- a/src/vue-data-scooper.js
+++ b/src/vue-data-scooper.js
@@ -46,12 +46,6 @@ export const getInitialData = function(doc) {
const obj = {}
const inputs = doc.querySelectorAll("[v-model]")
- if (doc.dataset) {
- for (let key in doc.dataset) {
- obj[key] = JSON.parse(doc.dataset[key])
- }
- }
-
for (let i = 0; i < inputs.length; i++) {
scoop(doc, inputs[i], obj)
}
|
Do not initialize data from data-* attribute of root
|
diff --git a/tests/automated/eventLimit-popover.js b/tests/automated/eventLimit-popover.js
index <HASH>..<HASH> 100644
--- a/tests/automated/eventLimit-popover.js
+++ b/tests/automated/eventLimit-popover.js
@@ -79,6 +79,17 @@ describe('eventLimit popover', function() {
expect($('.fc-more-popover .fc-event').length).toBeGreaterThan(1);
expect($('.fc-more-popover .fc-bgevent').length).toBe(0);
});
+
+ it('works with events that have invalid end times', function() {
+ options.events = [
+ { title: 'event1', start: '2014-07-29', end: '2014-07-29' },
+ { title: 'event2', start: '2014-07-29', end: '2014-07-28' },
+ { title: 'event3', start: '2014-07-29T00:00:00', end: '2014-07-29T00:00:00' },
+ { title: 'event4', start: '2014-07-29T00:00:00', end: '2014-07-28T23:00:00' }
+ ];
+ init();
+ expect($('.fc-more-popover .fc-event').length).toBe(4);
+ });
});
[ 'basicWeek', 'agendaWeek' ].forEach(function(viewName) {
|
automated test for issue <I>
|
diff --git a/model/MediaSource.php b/model/MediaSource.php
index <HASH>..<HASH> 100644
--- a/model/MediaSource.php
+++ b/model/MediaSource.php
@@ -180,10 +180,7 @@ class MediaSource extends ConfigurableService implements MediaManagement, Proces
return $file;
}
- /**
- * @return FileReferenceSerializer
- */
- private function getFileRefSerializer()
+ private function getFileRefSerializer(): FileReferenceSerializer
{
return $this->getServiceLocator()->get(FileReferenceSerializer::SERVICE_ID);
}
diff --git a/model/sharedStimulus/repository/SharedStimulusRepository.php b/model/sharedStimulus/repository/SharedStimulusRepository.php
index <HASH>..<HASH> 100644
--- a/model/sharedStimulus/repository/SharedStimulusRepository.php
+++ b/model/sharedStimulus/repository/SharedStimulusRepository.php
@@ -59,10 +59,8 @@ class SharedStimulusRepository extends ConfigurableService implements SharedStim
private function getContent(core_kernel_classes_Resource $resource): string
{
$link = $this->getPropertyValue($resource, MediaService::PROPERTY_LINK);
-
- if (is_string($link)) {
- $link = $this->getMediaSource()->unserializeAndRemovePrefixForAssets($link);
- }
+ //fixing the asset path
+ $link = $this->getMediaSource()->unserializeAndRemovePrefixForAssets($link);
return (string)$this->getFileManagement()->getFileStream($link);
}
|
Cr fix , added return type and removed is string check
|
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index <HASH>..<HASH> 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -2,15 +2,18 @@ require "cases/helper"
require 'models/post'
require 'models/person'
require 'models/reader'
+require 'models/comment'
class HasManyThroughAssociationsTest < ActiveRecord::TestCase
- fixtures :posts, :readers, :people
+ fixtures :posts, :readers, :people, :comments
def test_associate_existing
assert_queries(2) { posts(:thinking);people(:david) }
-
+
+ posts(:thinking).people
+
assert_queries(1) do
- posts(:thinking).people << people(:david)
+ posts(:thinking).people << people(:david)
end
assert_queries(1) do
|
Fix HasManyThroughAssociationsTest tests. [#<I> state:resolved]
|
diff --git a/src/feat/database/conflicts.py b/src/feat/database/conflicts.py
index <HASH>..<HASH> 100644
--- a/src/feat/database/conflicts.py
+++ b/src/feat/database/conflicts.py
@@ -431,13 +431,22 @@ def cleanup_logs(connection, rconnection):
continue
in_conflict, raw_doc = yield _check_conflict(connection, owner_id)
last_rev = entries[-1][0]
- if not in_conflict and last_rev <= raw_doc['_rev']:
+ if (not in_conflict and
+ parse_rev(last_rev) <= parse_rev(raw_doc['_rev'])):
for (rev, doc_id) in entries:
deletes_count += 1
yield _cleanup_update_log(connection, doc_id)
defer.returnValue(deletes_count)
+def parse_rev(rev):
+ if '-' not in rev:
+ raise ValueError("%r doesn't seem to be a rev" % (rev, ))
+ seq, tag = rev.split('-', 1)
+ seq = int(seq)
+ return seq, tag
+
+
@defer.inlineCallbacks
def _check_conflict(connection, doc_id):
raw_doc = yield connection.get_document(doc_id, raw=True, conflicts=True)
|
Fix condition on when can we cleanup the update logs imported from the
external database.
|
diff --git a/adapters/http/adapter_test.go b/adapters/http/adapter_test.go
index <HASH>..<HASH> 100644
--- a/adapters/http/adapter_test.go
+++ b/adapters/http/adapter_test.go
@@ -39,7 +39,7 @@ func TestSend(t *testing.T) {
}
s := genMockServer(3100)
- adapter, err := NewAdapter(log.TestLogger{Tag: "BRK_HDL_ADAPTER", T: t})
+ adapter, err := NewAdapter(log.TestLogger{Tag: "Adapter", T: t})
if err != nil {
panic(err)
}
diff --git a/adapters/http/registrations/registrations_test.go b/adapters/http/registrations/registrations_test.go
index <HASH>..<HASH> 100644
--- a/adapters/http/registrations/registrations_test.go
+++ b/adapters/http/registrations/registrations_test.go
@@ -59,7 +59,7 @@ func TestNextRegistration(t *testing.T) {
},
}
- adapter, err := NewAdapter(3001, HandlerParser{}, log.TestLogger{Tag: "BRK_HDL_ADAPTER", T: t})
+ adapter, err := NewAdapter(3001, HandlerParser{}, log.TestLogger{Tag: "Adapter", T: t})
client := &client{adapter: "0.0.0.0:3001"}
<-time.After(time.Millisecond * 200)
if err != nil {
|
[broker] Change logger tag in adapters test
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -33,7 +33,7 @@ extensions = [
'sphinx.ext.intersphinx',
'sphinx.ext.viewcode',
'sphinxcontrib.napoleon',
- 'sphinxcontrib.aafig',
+ 'sphinx.ext.aafig',
]
# Add any paths that contain templates here, relative to this directory.
|
switch from sphinxcontrib to sphinx.ext
|
diff --git a/lib/node_modules/@stdlib/utils/is-node/test/test.is_node.js b/lib/node_modules/@stdlib/utils/is-node/test/test.is_node.js
index <HASH>..<HASH> 100644
--- a/lib/node_modules/@stdlib/utils/is-node/test/test.is_node.js
+++ b/lib/node_modules/@stdlib/utils/is-node/test/test.is_node.js
@@ -238,7 +238,8 @@ tape( 'the function returns `false` if runtime is not Node.js (`process.release`
isString.isPrimitive = alwaysTrue;
function isObject( val ) {
- if ( val === process.release ) {
+ // `process.release` was added in Node v3.0.0
+ if ( process.release && val === process.release ) {
return false;
}
return ( typeof val === 'object' );
@@ -272,7 +273,8 @@ tape( 'the function returns `false` if runtime is not Node.js (`process.release.
isString.isPrimitive = isPrimitive;
function isPrimitive( val ) {
- if ( val === process.release.name ) {
+ // `process.release` was added in Node v3.0.0
+ if ( process.release && val === process.release.name ) {
return false;
}
return ( typeof val === 'string' );
|
Add test support for Node <<I>
|
diff --git a/parser/pigeon.go b/parser/pigeon.go
index <HASH>..<HASH> 100644
--- a/parser/pigeon.go
+++ b/parser/pigeon.go
@@ -1135,7 +1135,7 @@ func (p *parser) addErrAt(err error, pos position) {
buf.WriteString("rule " + rule.name)
}
}
- pe := &parserError{Inner: err, prefix: buf.String()}
+ pe := &parserError{Inner: err, pos: pos, prefix: buf.String()}
p.errs.add(pe)
}
@@ -1152,7 +1152,7 @@ func (p *parser) read() {
}
if rn == utf8.RuneError {
- if n > 0 {
+ if n == 1 {
p.addErr(errInvalidEncoding)
}
}
|
Minor update to generated pigeon.go
|
diff --git a/deployutils/mixins.py b/deployutils/mixins.py
index <HASH>..<HASH> 100644
--- a/deployutils/mixins.py
+++ b/deployutils/mixins.py
@@ -122,7 +122,7 @@ class AccountMixin(object):
def get_context_data(self, *args, **kwargs):
context = super(AccountMixin, self).get_context_data(*args, **kwargs)
- context.update({'account': self.account})
+ context.update({self.account_url_kwarg: self.account})
return context
def get_url_kwargs(self):
|
uses account_url_kwarg as key
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ os.environ['DJANGO_SETTINGS_MODULE'] = 'django_mailbox.tests.settings'
from django.core import management
-if sys.argv[-1] == 'test':
+if len(sys.argv) > 1 and sys.argv[1] == 'test':
management.execute_from_command_line()
sys.exit()
|
Add support to args in tests
|
diff --git a/internal/service/autoscaling/group.go b/internal/service/autoscaling/group.go
index <HASH>..<HASH> 100644
--- a/internal/service/autoscaling/group.go
+++ b/internal/service/autoscaling/group.go
@@ -1,6 +1,6 @@
package autoscaling
-import ( // nosemgrep: aws-sdk-go-multiple-service-imports
+import (
"bytes"
"context"
"fmt"
diff --git a/internal/service/autoscaling/group_waiting.go b/internal/service/autoscaling/group_waiting.go
index <HASH>..<HASH> 100644
--- a/internal/service/autoscaling/group_waiting.go
+++ b/internal/service/autoscaling/group_waiting.go
@@ -1,6 +1,6 @@
package autoscaling
-import (
+import ( // nosemgrep: aws-sdk-go-multiple-service-imports
"fmt"
"log"
"strconv"
|
Fix semgrep 'aws-sdk-go-multiple-service-imports' errors.
|
diff --git a/controller/Results.php b/controller/Results.php
index <HASH>..<HASH> 100644
--- a/controller/Results.php
+++ b/controller/Results.php
@@ -357,9 +357,9 @@ class Results extends \tao_actions_CommonModule
// quick hack to gain performance: caching the entire result page if it is cacheable
// "gzencode" is used to reduce the size of the string to be cached
ob_start(function($buffer) use($resultId, $cacheKey) {
- if ($this->isCacheable($resultId)) {
+ if ($this->isCacheable($resultId)
+ && $this->getResultsService()->setCacheValue($resultId, $cacheKey, gzencode($buffer, 9))) {
\common_Logger::d('Result page cache set for "'. $cacheKey .'"');
- $this->getResultsService()->setCacheValue($resultId, $cacheKey, gzencode($buffer, 9));
}
return $buffer;
|
TAO-<I> Check if cache has been created before log message filed
|
diff --git a/mozilla/gcli/ui/tooltip.js b/mozilla/gcli/ui/tooltip.js
index <HASH>..<HASH> 100644
--- a/mozilla/gcli/ui/tooltip.js
+++ b/mozilla/gcli/ui/tooltip.js
@@ -21,7 +21,7 @@ var domtemplate = require('../util/domtemplate');
var host = require('../util/host');
var CommandAssignment = require('../cli').CommandAssignment;
-var fields = require('../fields/fields'');
+var fields = require('../fields/fields');
var tooltipCssPromise = host.staticRequire(module, './tooltip.css');
var tooltipHtmlPromise = host.staticRequire(module, './tooltip.html');
|
refactor-<I>: Fix nasty typo
Some automatic search and replace left us with an extra '
|
diff --git a/src/render.js b/src/render.js
index <HASH>..<HASH> 100644
--- a/src/render.js
+++ b/src/render.js
@@ -324,5 +324,12 @@ function _render(callback) {
graphvizInstance._dispatch.call('renderEnd', graphvizInstance);
+ if (transitionInstance == null) {
+ this._dispatch.call('end', this);
+ if (callback) {
+ callback.call(this);
+ }
+ }
+
return this;
};
|
Fire callback and end event even when transition is not used
Fixes <URL>
|
diff --git a/tests/_processors/test_when.py b/tests/_processors/test_when.py
index <HASH>..<HASH> 100644
--- a/tests/_processors/test_when.py
+++ b/tests/_processors/test_when.py
@@ -156,7 +156,7 @@ def test_item_many_eggs(testapp):
[r"item.author == 'yoda'", "item.source.suffix == '.md'"],
id="two-conditions",
),
- pytest.param([r"item.source | match('.*\.md')"], id="match-md"),
+ pytest.param([r"item.source | match('.*\\.md')"], id="match-md"),
pytest.param([r"item.source | match('^about.*')"], id="match-about"),
],
)
@@ -202,7 +202,7 @@ def test_args_condition(testapp, cond):
[r"item.author == 'yoda'", "item.source.suffix == '.md'"],
id="two-conditions",
),
- pytest.param([r"item.source | match('.*\.md')"], id="match-md"),
+ pytest.param([r"item.source | match('.*\\.md')"], id="match-md"),
pytest.param([r"item.source | match('^about.*')"], id="match-about"),
],
)
|
Fix deprecation warnings in tests
|
diff --git a/lib/polyfill/fullscreen.js b/lib/polyfill/fullscreen.js
index <HASH>..<HASH> 100644
--- a/lib/polyfill/fullscreen.js
+++ b/lib/polyfill/fullscreen.js
@@ -59,6 +59,13 @@ shaka.polyfill.Fullscreen.install = function() {
document.webkitFullscreenElement;
}
});
+ Object.defineProperty(document, 'fullscreenEnabled', {
+ get: function() {
+ return document.mozFullScreenEnabled ||
+ document.msFullscreenEnabled ||
+ document.webkitFullscreenEnabled;
+ }
+ });
}
var proxy = shaka.polyfill.Fullscreen.proxyEvent_;
|
Expanded the fullscreen polyfill.
Now it includes fullscreenEnabled.
Closes #<I>
Change-Id: I7df3c<I>ecc<I>a<I>ba<I>ac<I>aae2bc9b<I>d5
|
diff --git a/bean-validation/src/test/java/com/kumuluz/ee/beanvalidation/test/HibernateValidatorTest.java b/bean-validation/src/test/java/com/kumuluz/ee/beanvalidation/test/HibernateValidatorTest.java
index <HASH>..<HASH> 100644
--- a/bean-validation/src/test/java/com/kumuluz/ee/beanvalidation/test/HibernateValidatorTest.java
+++ b/bean-validation/src/test/java/com/kumuluz/ee/beanvalidation/test/HibernateValidatorTest.java
@@ -52,6 +52,7 @@ public class HibernateValidatorTest {
Set<ConstraintViolation<User>> constraintViolations =
validator.validate(u1);
+ Assert.assertNotNull(constraintViolations);
Assert.assertEquals(0, constraintViolations.size());
}
@@ -77,6 +78,7 @@ public class HibernateValidatorTest {
Set<ConstraintViolation<User>> constraintViolations =
validator.validate(u1);
+ Assert.assertNotNull(constraintViolations);
Assert.assertEquals(3, constraintViolations.size());
}
}
|
Added additional tests to bean-validation
|
diff --git a/lib/lockup.rb b/lib/lockup.rb
index <HASH>..<HASH> 100644
--- a/lib/lockup.rb
+++ b/lib/lockup.rb
@@ -9,10 +9,10 @@ module Lockup
if cookies[:lockup] == ENV["LOCKUP_CODEWORD"].to_s.downcase
return
else
- redirect_to :controller => 'lockup', :action => 'unlock', :return_to => request.fullpath.split('?lockup_codeword')[0], :lockup_codeword => params[:lockup_codeword]
+ redirect_to :controller => '/lockup', :action => 'unlock', :return_to => request.fullpath.split('?lockup_codeword')[0], :lockup_codeword => params[:lockup_codeword]
end
else
- redirect_to :controller => 'lockup', :action => 'unlock', :return_to => request.fullpath.split('?lockup_codeword')[0], :lockup_codeword => params[:lockup_codeword]
+ redirect_to :controller => '/lockup', :action => 'unlock', :return_to => request.fullpath.split('?lockup_codeword')[0], :lockup_codeword => params[:lockup_codeword]
end
end
end
|
routing - force lockup at root
|
diff --git a/examples/tprattribute/sleeper_event_handler.go b/examples/tprattribute/sleeper_event_handler.go
index <HASH>..<HASH> 100644
--- a/examples/tprattribute/sleeper_event_handler.go
+++ b/examples/tprattribute/sleeper_event_handler.go
@@ -49,6 +49,7 @@ func (h *SleeperEventHandler) handle(obj interface{}) {
Into(in)
if err != nil {
log.Printf("[Sleeper] Status update for %s/%s failed: %v", in.Namespace, in.Name, err)
+ return
}
go func() {
select {
|
Do not start sleeping if failed to update status
|
diff --git a/_example/main.go b/_example/main.go
index <HASH>..<HASH> 100644
--- a/_example/main.go
+++ b/_example/main.go
@@ -1,5 +1,6 @@
// Example application that uses all of the available API options.
package main
+
import (
"log"
"time"
diff --git a/spinner.go b/spinner.go
index <HASH>..<HASH> 100644
--- a/spinner.go
+++ b/spinner.go
@@ -14,6 +14,7 @@
package spinner
import (
+ "encoding/hex"
"errors"
"fmt"
"io"
@@ -21,7 +22,6 @@ import (
"sync"
"time"
"unicode/utf8"
- "encoding/hex"
"github.com/fatih/color"
)
@@ -299,7 +299,12 @@ func (s *Spinner) UpdateCharSet(cs []string) {
func (s *Spinner) erase() {
n := utf8.RuneCountInString(s.lastOutput)
del, _ := hex.DecodeString("7f")
- for _, c := range []string{"\b", string(del), "\b"} {
+ for _, c := range []string{
+ "\b",
+ string(del),
+ "\b",
+ "\033[K", // for macOS Terminal
+ } {
for i := 0; i < n; i++ {
fmt.Fprintf(s.Writer, c)
}
|
properly remove previous line for macOS Terminal
|
diff --git a/src/ConfigCommand/CreateConfigEvent.php b/src/ConfigCommand/CreateConfigEvent.php
index <HASH>..<HASH> 100644
--- a/src/ConfigCommand/CreateConfigEvent.php
+++ b/src/ConfigCommand/CreateConfigEvent.php
@@ -19,6 +19,8 @@ class CreateConfigEvent implements
IOInterface,
StoppableEventInterface
{
+ use IOTrait;
+
/** @var null|string */
private $customChangelog;
|
fixup: compose IOTrait into CreateConfigEvent
|
diff --git a/lib/vagrant/util/platform.rb b/lib/vagrant/util/platform.rb
index <HASH>..<HASH> 100644
--- a/lib/vagrant/util/platform.rb
+++ b/lib/vagrant/util/platform.rb
@@ -1,4 +1,5 @@
require 'rbconfig'
+require 'shellwords'
require 'tmpdir'
require "vagrant/util/subprocess"
@@ -67,7 +68,7 @@ module Vagrant
"bash",
"--noprofile",
"--norc",
- "-c", "cd #{path} && pwd")
+ "-c", "cd #{Shellwords.escape(path)} && pwd")
return process.stdout.chomp
end
end
|
Properly escape path in cygwin bash check
Quick attempt at properly fixing #<I>
|
diff --git a/gcs/bucket.go b/gcs/bucket.go
index <HASH>..<HASH> 100644
--- a/gcs/bucket.go
+++ b/gcs/bucket.go
@@ -97,7 +97,32 @@ func toRawAcls(in []storage.ACLRule) []*storagev1.ObjectAccessControl {
return out
}
-func fromRawObject(*storagev1.Object) *storage.Object
+func fromRawAcls(in []*storagev1.ObjectAccessControl) []storage.ACLRule
+
+func fromRawObject(bucketName string, in *storagev1.Object) *storage.Object {
+ out := &storage.Object{
+ Bucket: bucketName,
+ Name: in.Name,
+ ContentType: in.ContentType,
+ ContentLanguage: in.ContentLanguage,
+ CacheControl: in.CacheControl,
+ ACL: fromRawAcls(in.Acl),
+ Owner: in.Owner,
+ ContentEncoding: in.ContentEncoding,
+ Size: in.Size,
+ MD5: in.MD5,
+ CRC32C: in.CRC32C,
+ MediaLink: in.MediaLink,
+ Metadata: in.Metadata,
+ Generation: in.Generation,
+ MetaGeneration: in.MetaGeneration,
+ StorageClass: in.StorageClass,
+ Deleted: in.TimeDeleted,
+ Updated: in.Updated,
+ }
+
+ return out
+}
func getRawService(authContext context.Context) *storagev1.Service
@@ -139,7 +164,7 @@ func (b *bucket) CreateObject(
}
// Convert the returned object.
- o = fromRawObject(rawObject)
+ o = fromRawObject(b.Name(), rawObject)
return
}
|
Partially implemented fromRawObject.
|
diff --git a/docs/src/ComponentsPage.js b/docs/src/ComponentsPage.js
index <HASH>..<HASH> 100644
--- a/docs/src/ComponentsPage.js
+++ b/docs/src/ComponentsPage.js
@@ -317,8 +317,6 @@ const ComponentsPage = React.createClass({
<h4><Anchor id='modals-props-modal-footer'>Modal.Footer</Anchor></h4>
<PropTable component='ModalFooter'/>
-
- <h4>ModalTrigger <strong className='text-danger'>Deprecated: use the Modal directly to manage it's visibility</strong></h4>
</div>
|
Remove leftover for 'ModalTrigger' from docs.
|
diff --git a/tests/django_settings.py b/tests/django_settings.py
index <HASH>..<HASH> 100644
--- a/tests/django_settings.py
+++ b/tests/django_settings.py
@@ -4,7 +4,8 @@
import warnings
from django.utils import deprecation # NOQA
warnings.filterwarnings('error', category=deprecation.RemovedInNextVersionWarning) # NOQA
-warnings.filterwarnings('always', category=deprecation.RemovedInDjango30Warning) # NOQA
+if hasattr(deprecation, 'RemovedInDjango30Warning'):
+ warnings.filterwarnings('always', category=deprecation.RemovedInDjango30Warning) # NOQA
DEBUG = True
SECRET_KEY = 'dummy'
|
only add RemovedInDjango<I>Warning if present)
|
diff --git a/spec/features/renalware/set_default_days_pd_regime_bag_spec.rb b/spec/features/renalware/set_default_days_pd_regime_bag_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/features/renalware/set_default_days_pd_regime_bag_spec.rb
+++ b/spec/features/renalware/set_default_days_pd_regime_bag_spec.rb
@@ -41,7 +41,7 @@ module Renalware
select 'Star Brand, Lucky Brand Green–2.34', from: 'Bag Type'
- fill_in 'Volume', with: '230'
+ select '2500', from: 'Volume (ml)'
uncheck 'Tuesday'
|
Updated feature spec tests for 'set_default_days_pd_regime_bag' to work with changed pd regime bag volume input - now fixed options.
|
diff --git a/py_linq/py_linq.py b/py_linq/py_linq.py
index <HASH>..<HASH> 100644
--- a/py_linq/py_linq.py
+++ b/py_linq/py_linq.py
@@ -1106,11 +1106,11 @@ class SortedEnumerable(Enumerable):
def __iter__(self):
for o in reversed(self._key_funcs):
self._data = sorted(self._data, key=o.key, reverse=o.descending)
- cache=[]
+ cache = []
for d in self._data:
cache.append(d)
yield d
- self._data=cache
+ self._data = cache
def then_by(self, func):
"""
diff --git a/tests/test_functions.py b/tests/test_functions.py
index <HASH>..<HASH> 100644
--- a/tests/test_functions.py
+++ b/tests/test_functions.py
@@ -797,4 +797,3 @@ class TestFunctions(TestCase):
],
u"then_by_descending ordering is not correct"
)
-
|
PEP8 failures fixed from previous commit
|
diff --git a/tests/test_qrcode.py b/tests/test_qrcode.py
index <HASH>..<HASH> 100644
--- a/tests/test_qrcode.py
+++ b/tests/test_qrcode.py
@@ -64,7 +64,7 @@ def test_invalid_mode_provided():
def test_binary_data():
- qr = pyqrcode.create('Märchenbuch'.encode('utf-8'))
+ qr = pyqrcode.create('Märchenbuch'.encode('utf-8'), encoding='utf-8')
eq_('Märchenbuch', qr.data)
eq_('binary', qr.mode)
|
Fixed binary data test to use utf-8 encoding
|
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/VisualizerContext.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/VisualizerContext.java
index <HASH>..<HASH> 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/VisualizerContext.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/VisualizerContext.java
@@ -156,7 +156,7 @@ public class VisualizerContext extends AnyMap<String> {
*/
public Clustering<Model> getOrCreateDefaultClustering() {
Clustering<Model> c = getGenerics(CLUSTERING, Clustering.class);
- if(c == null) {
+ if(c == null || c.getAllClusters().size() <= 0) {
c = getGenerics(CLUSTERING_FALLBACK, Clustering.class);
}
if(c == null) {
|
Make more robust by doing more fallback to label clustering...
|
diff --git a/core/src/playn/core/Layer.java b/core/src/playn/core/Layer.java
index <HASH>..<HASH> 100644
--- a/core/src/playn/core/Layer.java
+++ b/core/src/playn/core/Layer.java
@@ -178,13 +178,14 @@ public interface Layer {
Layer setOrigin(float x, float y);
/**
- * Sets the depth of this layer. Within a single {@link GroupLayer}, layers are rendered from
- * lowest depth to highest depth.
+ * Returns this layer's current depth.
*/
float depth();
/**
- * Updates this layer's depth.
+ * Sets the depth of this layer.
+ * <p>
+ * Within a single {@link GroupLayer}, layers are rendered from lowest depth to highest depth.
*
* @return a reference to this layer for call chaining.
*/
|
Fixed the Javadoc for Layer's depth() and setDepth() methods.
|
diff --git a/cmd/gmq-cli/command_conn.go b/cmd/gmq-cli/command_conn.go
index <HASH>..<HASH> 100644
--- a/cmd/gmq-cli/command_conn.go
+++ b/cmd/gmq-cli/command_conn.go
@@ -135,7 +135,7 @@ func newCommandConn(args []string, ctx *context) (*commandConn, error) {
host := flg.String("h", defaultHost, "host name of the Server to connect to")
port := flg.Uint("p", defaultPort, "port number of the Server to connect to")
connackTimeout := flg.Uint(
- "act",
+ "ackt",
defaultCONNACKTimeout,
"Timeout in seconds for the Client to wait receiving the CONNACK Packet after sending the CONNECT Packet",
)
diff --git a/cmd/gmq-cli/main.go b/cmd/gmq-cli/main.go
index <HASH>..<HASH> 100644
--- a/cmd/gmq-cli/main.go
+++ b/cmd/gmq-cli/main.go
@@ -38,6 +38,15 @@ func main() {
// Create a context.
ctx := newContext()
+ // Launch a goroutine which handles an error.
+ go func() {
+ for err := range ctx.errc {
+ os.Stderr.WriteString("\n")
+ printError(err)
+ printHeader()
+ }
+ }()
+
// Create a scanner which reads lines from standard input.
scanner := bufio.NewScanner(stdin)
|
Update cmd/gmq-cli/command_conn.go
|
diff --git a/linkcheck/gui/options.py b/linkcheck/gui/options.py
index <HASH>..<HASH> 100644
--- a/linkcheck/gui/options.py
+++ b/linkcheck/gui/options.py
@@ -37,19 +37,16 @@ class LinkCheckerOptions (QtGui.QDialog, Ui_Options):
def reset (self):
"""Reset GUI and config options."""
- config = configuration.Configuration()
files = configuration.get_standard_config_files()
self.sys_config, self.user_config = files
- config.read(files)
- self.reset_gui_options(config)
+ self.reset_gui_options()
self.reset_config_options()
- def reset_gui_options (self, config):
- """Reset GUI options to default values from config."""
- self.recursionlevel.setValue(config["recursionlevel"])
- self.verbose.setChecked(config["verbose"])
+ def reset_gui_options (self):
+ """Reset GUI options to default values."""
+ self.recursionlevel.setValue(-1)
+ self.verbose.setChecked(False)
self.debug.setChecked(False)
- del config
def reset_config_options (self):
"""Reset configuration file edit buttons."""
|
Do not use configuration file options for GUI defaults.
|
diff --git a/src/test/java/org/scribe/examples/FacebookExample.java b/src/test/java/org/scribe/examples/FacebookExample.java
index <HASH>..<HASH> 100644
--- a/src/test/java/org/scribe/examples/FacebookExample.java
+++ b/src/test/java/org/scribe/examples/FacebookExample.java
@@ -16,10 +16,13 @@ public class FacebookExample
public static void main(String[] args)
{
+ // Replace these with your own api key and secret
+ String apiKey = "your_api_key";
+ String apiSecret = "your_api_secret";
OAuthService service = new ServiceBuilder()
.provider(FacebookApi.class)
- .apiKey("anonymous")
- .apiSecret("anonymous")
+ .apiKey(apiKey)
+ .apiSecret(apiSecret)
.callback("http://www.example.com/oauth_callback/")
.build();
Scanner in = new Scanner(System.in);
|
Explicited that you need a personal pair of keys to use Facebook's example
|
diff --git a/lib/geminabox_client.rb b/lib/geminabox_client.rb
index <HASH>..<HASH> 100644
--- a/lib/geminabox_client.rb
+++ b/lib/geminabox_client.rb
@@ -10,6 +10,7 @@ class GeminaboxClient
@http_client.set_auth(url_for(:upload), @username, @password) if @username or @password
@http_client.www_auth.basic_auth.challenge(url_for(:upload)) # Workaround: https://github.com/nahi/httpclient/issues/63
@http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+ @http_client.send_timeout = 600
end
def extract_username_and_password_from_url!(url)
|
Establish a larger send timeout.
resolves #<I>
|
diff --git a/aiohue/config.py b/aiohue/config.py
index <HASH>..<HASH> 100644
--- a/aiohue/config.py
+++ b/aiohue/config.py
@@ -14,6 +14,16 @@ class Config:
return self.raw['name']
@property
+ def swversion(self):
+ """Software version of the bridge."""
+ return self.raw['swversion']
+
+ @property
+ def modelid(self):
+ """Model ID of the bridge."""
+ return self.raw['modelid']
+
+ @property
def bridgeid(self):
"""ID of the bridge."""
return self.raw['bridgeid']
diff --git a/aiohue/lights.py b/aiohue/lights.py
index <HASH>..<HASH> 100644
--- a/aiohue/lights.py
+++ b/aiohue/lights.py
@@ -47,6 +47,11 @@ class Light:
def type(self):
return self.raw['type']
+ @property
+ def swversion(self):
+ """Software version of the light."""
+ return self.raw['swversion']
+
async def set_state(self, on=None, bri=None, hue=None, sat=None, xy=None,
ct=None, alert=None, effect=None, transitiontime=None,
bri_inc=None, sat_inc=None, hue_inc=None, ct_inc=None,
|
Add swversion, modelid bridge (#<I>)
|
diff --git a/tests/unit/router-test.js b/tests/unit/router-test.js
index <HASH>..<HASH> 100644
--- a/tests/unit/router-test.js
+++ b/tests/unit/router-test.js
@@ -6,8 +6,13 @@ var container, registry, router, originalTitle;
module('router:main', {
beforeEach: function() {
originalTitle = document.title;
- container = new Ember.Container();
- registry = container._registry || container;
+
+ if (Ember.Registry) {
+ registry = new Ember.Registry();
+ container = registry.container();
+ } else {
+ registry = container = new Ember.Container();
+ }
registry.register('location:none', Ember.NoneLocation);
|
Fix tests using `container._registry`.
`container._registry` has been removed in <I>.
|
diff --git a/test/common/base/index.js b/test/common/base/index.js
index <HASH>..<HASH> 100755
--- a/test/common/base/index.js
+++ b/test/common/base/index.js
@@ -274,6 +274,12 @@ describe('base', function () {
})
})
+ it('should be able to differentiate an empty array from an empty object', function () {
+ var one = new Base({})
+ var two = new Base([])
+ expect(one).not.deep.equal(two)
+ })
+
require('./output.js')
require('./property.js')
})
|
Added test to demonstrate issue #<I>
|
diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js
index <HASH>..<HASH> 100644
--- a/src/nls/zh-cn/strings.js
+++ b/src/nls/zh-cn/strings.js
@@ -327,7 +327,7 @@ define({
"CMD_PREV_DOC" : "上一个文件",
"CMD_SHOW_IN_TREE" : "在侧边栏显示",
"CMD_SHOW_IN_EXPLORER" : "在资源管理器中显示",
- "CMD_SHOW_IN_FINDER" : "在查找中显示",
+ "CMD_SHOW_IN_FINDER" : "在 Finder 中显示",
"CMD_SHOW_IN_OS" : "打开文件所在目录",
// Help menu commands
@@ -361,7 +361,7 @@ define({
"UPDATE_AVAILABLE_TITLE" : "可用的更新",
"UPDATE_MESSAGE" : "有一个新版本的 {APP_NAME}. 增加了一些功能:",
"GET_IT_NOW" : "马上获取!",
- "PROJECT_SETTINGS_TITLE" : "Project Settings for: {0}",
+ "PROJECT_SETTINGS_TITLE" : "项目设置: {0}",
"PROJECT_SETTING_BASE_URL" : "实时预览的根目录地址",
"PROJECT_SETTING_BASE_URL_HINT" : "使用本地服务器, 并指定一个URL. 例如: http://localhost:8000/",
"BASEURL_ERROR_INVALID_PROTOCOL" : "实时预览不支持此协议 {0} —请使用 http: 或 https: .",
|
Update zh-cn translation.
1. No translation for 'Finder'.
2. Translate also 'Project Setting for...'.
|
diff --git a/lib/rest_pki/rest_pki_client.rb b/lib/rest_pki/rest_pki_client.rb
index <HASH>..<HASH> 100644
--- a/lib/rest_pki/rest_pki_client.rb
+++ b/lib/rest_pki/rest_pki_client.rb
@@ -31,7 +31,7 @@ module RestPki
response = nil
begin
- response = RestPki::Request.execute params
+ response = RestClient::Request.execute params
rescue RestClient::Exception => ex
raise RestUnreachableError.new(verb, url, ex.message)
end
|
Fixed request method call on post request;
|
diff --git a/wafer/talks/models.py b/wafer/talks/models.py
index <HASH>..<HASH> 100644
--- a/wafer/talks/models.py
+++ b/wafer/talks/models.py
@@ -113,9 +113,9 @@ class Talk(models.Model):
talk_id = models.AutoField(primary_key=True)
talk_type = models.ForeignKey(
- TalkType, null=True, blank=True, on_delete=models.CASCADE)
+ TalkType, null=True, blank=True, on_delete=models.SET_NULL)
track = models.ForeignKey(
- Track, null=True, blank=True, on_delete=models.CASCADE)
+ Track, null=True, blank=True, on_delete=models.SET_NULL)
title = models.CharField(max_length=1024)
|
Use SET_NULL for Talk.talk_type and Talk.track so that talks are retained when these are deleted.
|
diff --git a/Tank/stepper/missile.py b/Tank/stepper/missile.py
index <HASH>..<HASH> 100644
--- a/Tank/stepper/missile.py
+++ b/Tank/stepper/missile.py
@@ -127,7 +127,8 @@ class AmmoFileReader(object):
fields = chunk_header.split()
chunk_size = int(fields[0])
if chunk_size == 0:
- self.log.info('Zero-sized chunk in ammo file at %s. Starting over.' % ammo_file.tell())
+ if info.status.loop_count == 0:
+ self.log.info('Zero-sized chunk in ammo file at %s. Starting over.' % ammo_file.tell())
ammo_file.seek(0)
info.status.inc_loop_count()
chunk_header = read_chunk_header(ammo_file)
|
inform about zero-sized chunk only once
|
diff --git a/jones/web.py b/jones/web.py
index <HASH>..<HASH> 100644
--- a/jones/web.py
+++ b/jones/web.py
@@ -94,7 +94,7 @@ def service_create(env, jones):
env = None
return redirect(url_for(
- 'service', service=jones.service, env=env))
+ 'services', service=jones.service, env=env))
def service_update(env, jones):
@@ -127,7 +127,7 @@ def service_get(env, jones):
try:
version, config = jones.get_config_by_env(env)
except NoNodeException:
- return redirect(url_for('service', service=jones.service))
+ return redirect(url_for('services', service=jones.service))
childs = imap(dict, izip(
izip(repeat('env'), imap(Env, children)),
|
update "url_for" references.
|
diff --git a/src/index.js b/src/index.js
index <HASH>..<HASH> 100644
--- a/src/index.js
+++ b/src/index.js
@@ -30,7 +30,11 @@ function parsePath (filePath) {
function attachReporter (reporterFilePath) {
// Assign the reporter if it's directly passed as an argument
try {
- reporter = require(reporterFilePath || defaultReporter)(runner);
+ if (reporterFilePath && typeof reporterFilePath !== 'string') {
+ reporter = reporterFilePath(runner);
+ } else {
+ reporter = require(reporterFilePath || defaultReporter)(runner);
+ }
} catch (err) {
console.log(chalk.bgRed.bold.white(' No reporter ! ') +
' [' + chalk.dim.red(err) + ']');
|
feat: accept reporters not only as filepath but as objects also
|
diff --git a/lib/airbrake-ruby/truncator.rb b/lib/airbrake-ruby/truncator.rb
index <HASH>..<HASH> 100644
--- a/lib/airbrake-ruby/truncator.rb
+++ b/lib/airbrake-ruby/truncator.rb
@@ -25,11 +25,9 @@ module Airbrake
# Performs deep truncation of arrays, hashes and sets. Uses a
# placeholder for recursive objects (`[Circular]`).
#
- # @param [Hash,Array] object The object to truncate
+ # @param [Hash,Array,Set] object The object to truncate
# @param [Hash] seen The hash that helps to detect recursion
# @return [void]
- # @note This method is public to simplify testing. You probably want to use
- # {truncate_notice} instead
def truncate_object(object, seen = {})
return seen[object] if seen[object]
|
truncator: update comments for #truncate_object
As pointed out by
<URL>
|
diff --git a/pydle/utils/irccat.py b/pydle/utils/irccat.py
index <HASH>..<HASH> 100644
--- a/pydle/utils/irccat.py
+++ b/pydle/utils/irccat.py
@@ -5,14 +5,11 @@ import sys
import threading
import logging
-from .. import features
-from .. import protocol
-
-from .. import featurize, __version__
+from .. import Client, __version__
from . import _args
-class IRCCat(featurize(*features.ALL)):
+class IRCCat(Client):
""" irccat. Takes raw messages on stdin, dumps raw messages to stdout. Life has never been easier. """
def _get_message(self, types=None):
""" Get message and print it to stdout. """
@@ -41,6 +38,7 @@ class IRCCat(featurize(*features.ALL)):
def main():
+ # Setup logging.
logging.basicConfig(format='!! %(levelname)s: %(message)s')
# Create client.
|
Clean up irccat code a bit.
|
diff --git a/bin/whistle.js b/bin/whistle.js
index <HASH>..<HASH> 100755
--- a/bin/whistle.js
+++ b/bin/whistle.js
@@ -105,7 +105,7 @@ program.setConfig({
program
.option('-d, --debug', 'debug mode')
- .option('-A, --ATS', 'generate iOS ATS Root CA')
+ .option('-A, --ATS', 'generate Root CA for iOS ATS (Node >= 6 is required)')
.option('-z, --certDir [directory]', 'custom certificate path', String, undefined)
.option('-l, --localUIHost [hostname]', 'local ui host(' + config.localUIHost + ' by default)', String, undefined)
.option('-n, --username [username]', 'login username', String, undefined)
|
refactor: Refine cmd tips
|
diff --git a/modules/backend/database/migrations/2016_10_01_000009_Db_Backend_Timestamp_Fix.php b/modules/backend/database/migrations/2016_10_01_000009_Db_Backend_Timestamp_Fix.php
index <HASH>..<HASH> 100644
--- a/modules/backend/database/migrations/2016_10_01_000009_Db_Backend_Timestamp_Fix.php
+++ b/modules/backend/database/migrations/2016_10_01_000009_Db_Backend_Timestamp_Fix.php
@@ -1,6 +1,8 @@
<?php
use October\Rain\Database\Updates\Migration;
+use Backend\Models\Preference as PreferenceModel;
+use Backend\Models\BrandSetting as BrandSettingModel;
/**
* This migration addresses a MySQL specific issue around STRICT MODE.
@@ -23,6 +25,10 @@ class DbBackendTimestampFix extends Migration
foreach ($this->backendTables as $table) {
DbDongle::convertTimestamps($table);
}
+
+ // Use this opportunity to reset backend preferences and styles for stable
+ PreferenceModel::instance()->resetDefault();
+ BrandSettingModel::instance()->resetDefault();
}
public function down()
|
Stable prep: Reset the brand settings and backend prefs
These have been restructured since RC version and so should be reset to avoid common bugs
|
diff --git a/config/application.php b/config/application.php
index <HASH>..<HASH> 100644
--- a/config/application.php
+++ b/config/application.php
@@ -15,11 +15,7 @@ return array(
* Session component
*/
'session' => array(
- 'handler' => 'sql',
- 'options' => array(
- 'connection' => 'mysql',
- 'table' => 'sessions'
- ),
+ 'handler' => 'native',
'cookie_params' => array(
// Session cookie parameters can be set set
)
|
Replaced handler db to native one
|
diff --git a/xlog_examples_test.go b/xlog_examples_test.go
index <HASH>..<HASH> 100644
--- a/xlog_examples_test.go
+++ b/xlog_examples_test.go
@@ -1,3 +1,5 @@
+// +build go1.7
+
package xlog_test
import (
|
Make example compile with go <I> only
|
diff --git a/jre_emul/android/libcore/luni/src/main/java/java/lang/ClassLoader.java b/jre_emul/android/libcore/luni/src/main/java/java/lang/ClassLoader.java
index <HASH>..<HASH> 100644
--- a/jre_emul/android/libcore/luni/src/main/java/java/lang/ClassLoader.java
+++ b/jre_emul/android/libcore/luni/src/main/java/java/lang/ClassLoader.java
@@ -717,6 +717,12 @@ class SystemClassLoader extends ClassLoader {
[urls addWithId:JavaNetNetFactory_newURLWithNSString_([nativeURL description])];
}
}
+ for (NSBundle *bundle in [NSBundle allFrameworks]) {
+ NSURL *nativeURL = [bundle URLForResource:name withExtension:nil];
+ if (nativeURL) {
+ [urls addWithId:JavaNetNetFactory_newURLWithNSString_([nativeURL description])];
+ }
+ }
return JavaUtilCollections_enumerationWithJavaUtilCollection_(urls);
]-*/;
|
Search for resource in [NSBundle allFrameworks]
Previously ClassLoader.findResources finds resource in
[NSBundle allBundles], which are non-framework bundles. With
-allFrameworks we enable the use of dynamic frameworks.
|
diff --git a/tests/test_corpus.py b/tests/test_corpus.py
index <HASH>..<HASH> 100644
--- a/tests/test_corpus.py
+++ b/tests/test_corpus.py
@@ -1349,7 +1349,7 @@ def test_dtm(corpora_en_serial_and_parallel_module, select, as_table, dtype, ret
assert dtm.iloc[expected_labels.index('small1'), expected_vocab.index('the')] == 1
else:
assert isinstance(dtm, csr_matrix)
- assert dtm.dtype is np.dtype(dtype or 'int32')
+ assert dtm.dtype == np.dtype(dtype or 'int32')
if len(corp) > 0 and select is None:
assert np.sum(dtm[expected_labels.index('empty'), :]) == 0
|
fixed problem in test_dtm
|
diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py
index <HASH>..<HASH> 100644
--- a/astroid/scoped_nodes.py
+++ b/astroid/scoped_nodes.py
@@ -452,19 +452,6 @@ class Module(LocalsDictNodeNG):
It doesn't include the '__builtins__' name which is added by the
current CPython implementation of wildcard imports.
"""
- # take advantage of a living module if it exists
- try:
- living = sys.modules[self.name]
- except KeyError:
- pass
- else:
- try:
- return living.__all__
- except AttributeError:
- return [name for name in living.__dict__.keys()
- if not name.startswith('_')]
- # else lookup the astroid
- #
# We separate the different steps of lookup in try/excepts
# to avoid catching too many Exceptions
default = [name for name in self.keys() if not name.startswith('_')]
|
Drop code that inspects sys.modules unconditionally, since it breaks the expectancy of a static analysis tool.
|
diff --git a/etcdserver/api/v2store/store.go b/etcdserver/api/v2store/store.go
index <HASH>..<HASH> 100644
--- a/etcdserver/api/v2store/store.go
+++ b/etcdserver/api/v2store/store.go
@@ -747,7 +747,7 @@ func (s *store) SaveNoCopy() ([]byte, error) {
}
func (s *store) Clone() Store {
- s.worldLock.Lock()
+ s.worldLock.RLock()
clonedStore := newStore()
clonedStore.CurrentIndex = s.CurrentIndex
@@ -756,7 +756,7 @@ func (s *store) Clone() Store {
clonedStore.Stats = s.Stats.clone()
clonedStore.CurrentVersion = s.CurrentVersion
- s.worldLock.Unlock()
+ s.worldLock.RUnlock()
return clonedStore
}
|
etcdserver: take read lock when cloning store
|
diff --git a/cutil/signals/signals.go b/cutil/signals/signals.go
index <HASH>..<HASH> 100644
--- a/cutil/signals/signals.go
+++ b/cutil/signals/signals.go
@@ -70,9 +70,7 @@ func (h *Handler) GetState() int {
}
func (h *Handler) Reset() {
- if !h.timer.Stop() {
- <-h.timer.C
- }
+ h.timer.Stop()
}
// Register starts handling signals.
|
Bugfix - Remove not needed channel drain
|
diff --git a/lib/helper.js b/lib/helper.js
index <HASH>..<HASH> 100644
--- a/lib/helper.js
+++ b/lib/helper.js
@@ -16,7 +16,7 @@ var delegate = require('dom-delegate');
*/
module.exports = function(view) {
- view.on('initialize', function() {
+ view.on('before initialize', function() {
this.delegate = delegate();
});
|
Hook into `before initialize` event so that the delegate is available during `initialize` callback
|
diff --git a/django_afip/apps.py b/django_afip/apps.py
index <HASH>..<HASH> 100644
--- a/django_afip/apps.py
+++ b/django_afip/apps.py
@@ -5,6 +5,7 @@ class AfipConfig(AppConfig):
name = "django_afip"
label = "afip"
verbose_name = "AFIP"
+ default_auto_field = "django.db.models.AutoField"
def ready(self):
# Register app signals:
|
Avoid primary key issues in future Djangos
|
diff --git a/doc.go b/doc.go
index <HASH>..<HASH> 100644
--- a/doc.go
+++ b/doc.go
@@ -27,15 +27,15 @@ Thus, to get a User with id 2:
Key Specifications
-src must be a S or *S for some struct type S. The key is extracted based on
-various fields of S. If a field of type int64 or string has a struct tag
-named goon with value "id", it is used as the key's id. If a field of type
-*datastore.Key has a struct tag named goon with value "parent", it is used
-as the key's parent. If a field of type string has a struct tag named goon
-with value "kind", it is used as the key's kind. The "kind" field supports
-an optional second parameter which is the default kind name. If no kind
-field exists, the struct's name is used. These fields should all have
-their datastore field marked as "-".
+For both the Key and KeyError functions, src must be a S or *S for some
+struct type S. The key is extracted based on various fields of S. If a field
+of type int64 or string has a struct tag named goon with value "id", it is
+used as the key's id. If a field of type *datastore.Key has a struct tag
+named goon with value "parent", it is used as the key's parent. If a field
+of type string has a struct tag named goon with value "kind", it is used
+as the key's kind. The "kind" field supports an optional second parameter
+which is the default kind name. If no kind field exists, the struct's name
+is used. These fields should all have their datastore field marked as "-".
Example, with kind User:
type User struct {
|
Describe where keys are used since it's no longer clear
|
diff --git a/prometheus/registry.go b/prometheus/registry.go
index <HASH>..<HASH> 100644
--- a/prometheus/registry.go
+++ b/prometheus/registry.go
@@ -266,7 +266,7 @@ func (r *Registry) Register(c Collector) error {
descChan = make(chan *Desc, capDescChan)
newDescIDs = map[uint64]struct{}{}
newDimHashesByName = map[string]uint64{}
- collectorID uint64 // Just a sum of all desc IDs.
+ collectorID uint64 // All desc IDs XOR'd together.
duplicateDescErr error
)
go func() {
@@ -293,12 +293,12 @@ func (r *Registry) Register(c Collector) error {
if _, exists := r.descIDs[desc.id]; exists {
duplicateDescErr = fmt.Errorf("descriptor %s already exists with the same fully-qualified name and const label values", desc)
}
- // If it is not a duplicate desc in this collector, add it to
+ // If it is not a duplicate desc in this collector, XOR it to
// the collectorID. (We allow duplicate descs within the same
// collector, but their existence must be a no-op.)
if _, exists := newDescIDs[desc.id]; !exists {
newDescIDs[desc.id] = struct{}{}
- collectorID += desc.id
+ collectorID ^= desc.id
}
// Are all the label names and the help string consistent with
|
Minimal “fix” for hash collisions
This makes the collisions a bit less likely by XOR'ing descIDs rather
than adding them up for the collectorID.
|
diff --git a/contrib/mergeBenchmarkSets.py b/contrib/mergeBenchmarkSets.py
index <HASH>..<HASH> 100755
--- a/contrib/mergeBenchmarkSets.py
+++ b/contrib/mergeBenchmarkSets.py
@@ -142,12 +142,13 @@ def main(argv=None):
result.append(newColumn)
witnessSet.pop(run)
statusWitNew, categoryWitNew = getWitnessResult(witness, expected_result)
- if expected_result == False:
- if statusWitNew.startswith('false(') or statusWit is None:
- statusWit, categoryWit = (statusWitNew, categoryWitNew)
- if expected_result == True:
- if statusWitNew.startswith('true') or statusWit is None:
- statusWit, categoryWit = (statusWitNew, categoryWitNew)
+ if (
+ (expected_result == False and statusWitNew.startswith('false(')) or
+ (expected_result == True and statusWitNew.startswith('true')) or
+ (categoryWit == 'error' and categoryWitNew == 'unknown') or
+ (statusWit is None)
+ ):
+ statusWit, categoryWit = (statusWitNew, categoryWitNew)
# Overwrite status with status from witness
if isOverwrite and statusWit is not None and categoryWit is not None:
result.findall('column[@title="status"]')[0].set('value', statusWit)
|
Refactor control flow for setting new status according to witness; prefer unknown result over error result
|
diff --git a/notes/edit.php b/notes/edit.php
index <HASH>..<HASH> 100644
--- a/notes/edit.php
+++ b/notes/edit.php
@@ -22,7 +22,7 @@ if ($noteid) {
$userid = required_param('userid', PARAM_INT);
$state = optional_param('publishstate', NOTES_STATE_PUBLIC, PARAM_ALPHA);
- $note = new object();
+ $note = new stdClass();
$note->courseid = $courseid;
$note->userid = $userid;
$note->publishstate = $state;
diff --git a/notes/lib.php b/notes/lib.php
index <HASH>..<HASH> 100644
--- a/notes/lib.php
+++ b/notes/lib.php
@@ -173,7 +173,7 @@ function note_print($note, $detail = NOTES_SHOW_FULL) {
$context = get_context_instance(CONTEXT_COURSE, $note->courseid);
$systemcontext = get_context_instance(CONTEXT_SYSTEM);
- $authoring = new object();
+ $authoring = new stdClass();
$authoring->name = '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$author->id.'&course='.$note->courseid.'">'.fullname($author).'</a>';
$authoring->date = userdate($note->lastmodified);
|
MDL-<I> switching to stdClass in /notes/
|
diff --git a/peer/peer.go b/peer/peer.go
index <HASH>..<HASH> 100644
--- a/peer/peer.go
+++ b/peer/peer.go
@@ -5,6 +5,7 @@ import (
"encoding/hex"
"encoding/json"
"fmt"
+ "strings"
b58 "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-base58"
ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
@@ -38,12 +39,18 @@ func (id ID) Loggable() map[string]interface{} {
// codebase is known to be correct.
func (id ID) String() string {
pid := id.Pretty()
+
+ //All sha256 nodes start with Qm
+ //We can skip the Qm to make the peer.ID more useful
+ if strings.HasPrefix(pid, "Qm") {
+ pid = pid[2:]
+ }
+
maxRunes := 6
- skip := 2 //Added to skip past Qm which is identical for all SHA256 nodes
- if len(pid) < maxRunes + skip {
- maxRunes = len(pid) - skip
+ if len(pid) < maxRunes {
+ maxRunes = len(pid)
}
- return fmt.Sprintf("<peer.ID %s>", pid[skip:maxRunes + skip])
+ return fmt.Sprintf("<peer.ID %s>", pid[:maxRunes])
}
// MatchesPrivateKey tests whether this ID was derived from sk
|
Implemented @jbenet's suggestion to avoid panics if peerID is of length 0.
|
diff --git a/vendors.php b/vendors.php
index <HASH>..<HASH> 100755
--- a/vendors.php
+++ b/vendors.php
@@ -40,8 +40,8 @@ foreach ($deps as $dep) {
$installDir = $vendorDir.'/'.$name;
if (!is_dir($installDir)) {
- system(sprintf('git clone %s "%s"', $url, $installDir));
+ system(sprintf('git clone %s %s', $url, escapeshellarg($installDir)));
}
- system(sprintf('cd "%s" && git fetch origin && git reset --hard %s', $installDir, $rev));
+ system(sprintf('cd %s && git fetch origin && git reset --hard %s', escapeshellarg($installDir), $rev));
}
|
Using escapeshellarg() instead of quotes
|
diff --git a/src/main/java/org/jfrog/hudson/release/scm/perforce/PerforceCoordinator.java b/src/main/java/org/jfrog/hudson/release/scm/perforce/PerforceCoordinator.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jfrog/hudson/release/scm/perforce/PerforceCoordinator.java
+++ b/src/main/java/org/jfrog/hudson/release/scm/perforce/PerforceCoordinator.java
@@ -57,10 +57,9 @@ public class PerforceCoordinator extends AbstractScmCoordinator {
}
public void afterSuccessfulReleaseVersionBuild() throws InterruptedException, IOException {
- String labelChangeListId = ExtractorUtils.getVcsRevision(build.getEnvironment(listener));
if (modifiedFilesForReleaseVersion) {
log("Submitting release version changes");
- labelChangeListId = currentChangeListId + "";
+ String labelChangeListId = currentChangeListId + "";
if (releaseAction.isCreateVcsTag()) {
log("Creating label: '" + releaseAction.getTagUrl() + "' with change list id: " + labelChangeListId);
perforce.createTag(releaseAction.getTagUrl(), releaseAction.getTagComment(), labelChangeListId);
|
HAP-<I> - Support Perforce in release management
|
diff --git a/src/js/components/Select/Select.js b/src/js/components/Select/Select.js
index <HASH>..<HASH> 100644
--- a/src/js/components/Select/Select.js
+++ b/src/js/components/Select/Select.js
@@ -83,7 +83,7 @@ const Select = forwardRef(
const inputRef = useRef();
const formContext = useContext(FormContext);
- const [value] = formContext.useFormContext(name, valueProp);
+ const [value, setValue] = formContext.useFormContext(name, valueProp);
const [open, setOpen] = useState(propOpen);
useEffect(() => {
@@ -106,6 +106,7 @@ const Select = forwardRef(
const onSelectChange = (event, ...args) => {
if (closeOnChange) onRequestClose();
+ setValue(event.value);
if (onChange) onChange({ ...event, target: inputRef.current }, ...args);
};
|
Changed Select to fix an issue with setting value with FormContext (#<I>)
|
diff --git a/lib/bud/viz.rb b/lib/bud/viz.rb
index <HASH>..<HASH> 100644
--- a/lib/bud/viz.rb
+++ b/lib/bud/viz.rb
@@ -6,7 +6,7 @@ require 'set'
class VizOnline #:nodoc: all
attr_reader :logtab
- META_TABLES = %w[t_cycle t_depends t_provides t_rules
+ META_TABLES = %w[t_cycle t_depends t_depends_tc t_provides t_rules
t_stratum t_table_info t_table_schema].to_set
def initialize(bud_instance)
|
On second thought, reinstitute depends_tc.
When the dependency analysis code is loaded, it is effectively a builtin table.
|
diff --git a/gyp/pylib/gyp/generator/make.py b/gyp/pylib/gyp/generator/make.py
index <HASH>..<HASH> 100644
--- a/gyp/pylib/gyp/generator/make.py
+++ b/gyp/pylib/gyp/generator/make.py
@@ -1883,11 +1883,13 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)/%%%s FORCE_DO_CMD
"""Returns the location of the final output for an installable target."""
# Xcode puts shared_library results into PRODUCT_DIR, and some gyp files
# rely on this. Emulate this behavior for mac.
- if (self.type == 'shared_library' and
- (self.flavor != 'mac' or self.toolset != 'target')):
- # Install all shared libs into a common directory (per toolset) for
- # convenient access with LD_LIBRARY_PATH.
- return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias)
+
+ # XXX(TooTallNate): disabling this code since we don't want this behavior...
+ #if (self.type == 'shared_library' and
+ # (self.flavor != 'mac' or self.toolset != 'target')):
+ # # Install all shared libs into a common directory (per toolset) for
+ # # convenient access with LD_LIBRARY_PATH.
+ # return '$(builddir)/lib.%s/%s' % (self.toolset, self.alias)
return '$(builddir)/' + self.alias
|
gyp: always install into $PRODUCT_DIR
|
diff --git a/lib/bud/rewrite.rb b/lib/bud/rewrite.rb
index <HASH>..<HASH> 100644
--- a/lib/bud/rewrite.rb
+++ b/lib/bud/rewrite.rb
@@ -647,7 +647,7 @@ module ModuleRewriter # :nodoc: all
def self.get_raw_parse_tree(klass)
pt = RawParseTree.new(false)
klassname = klass.name
- klassname = klass.to_s if klassname.empty? #("anon_" + Process.pid.to_s + "_" + klass.object_id.to_s) if klassname.empty
+ klassname = klass.to_s if klassname.empty?
klassname = klassname.to_sym
code = if Class === klass then
|
Tweak comment.
Commented-out code should generally be avoided.
|
diff --git a/testing/test_git.py b/testing/test_git.py
index <HASH>..<HASH> 100644
--- a/testing/test_git.py
+++ b/testing/test_git.py
@@ -414,7 +414,8 @@ def signed_commit_wd(tmp_path, monkeypatch, wd):
"""\
%no-protection
%transient-key
-Key-Type: default
+Key-Type: RSA
+Key-Length: 2048
Name-Real: a test
Name-Email: test@example.com
Expire-Date: 0
|
Pick and configure an explicit `Key-Type`
If the default `Key-Type` happens to be an ECC, then `Key-Curve` would be a required parameter, so let's just pick RSA<I> and be done with it.
|
diff --git a/Reminders/PasswordBroker.php b/Reminders/PasswordBroker.php
index <HASH>..<HASH> 100755
--- a/Reminders/PasswordBroker.php
+++ b/Reminders/PasswordBroker.php
@@ -259,4 +259,14 @@ class PasswordBroker {
return $this->getRequest()->input('password_confirmation');
}
+ /**
+ * Get the password reminder repository implementation.
+ *
+ * @return \Illuminate\Auth\Reminders\ReminderRepositoryInterface
+ */
+ protected function getRepository()
+ {
+ return $this->reminders;
+ }
+
}
|
Added getRepository method to password broker.
|
diff --git a/UI/src/components/widgets/codeanalysis/view.js b/UI/src/components/widgets/codeanalysis/view.js
index <HASH>..<HASH> 100644
--- a/UI/src/components/widgets/codeanalysis/view.js
+++ b/UI/src/components/widgets/codeanalysis/view.js
@@ -87,7 +87,7 @@
ctrl.securityIssues = [
getMetric(saData.metrics, 'blocker', 'Blocker'),
- getMetric(saData.metrics, 'crtical', 'Critical'),
+ getMetric(saData.metrics, 'critical', 'Critical'),
getMetric(saData.metrics, 'major', 'Major'),
getMetric(saData.metrics, 'minor', 'Minor')
];
|
String spelling correction - "critcal" vs "critical"
|
diff --git a/chickpea/static/chickpea/js/leaflet.chickpea.features.js b/chickpea/static/chickpea/js/leaflet.chickpea.features.js
index <HASH>..<HASH> 100644
--- a/chickpea/static/chickpea/js/leaflet.chickpea.features.js
+++ b/chickpea/static/chickpea/js/leaflet.chickpea.features.js
@@ -153,7 +153,7 @@ L.ChickpeaMarker = L.Marker.extend({
},
changeOverlay: function(layer) {
- L.Mixin.ChickpeaFeature.prototype.changeOverlay.call(this, layer);
+ L.Mixin.ChickpeaFeature.changeOverlay.call(this, layer);
// Icon look depends on overlay
this._redrawIcon();
},
|
ChickpeaFeature has no prototype...
|
diff --git a/Entity/Translation.php b/Entity/Translation.php
index <HASH>..<HASH> 100644
--- a/Entity/Translation.php
+++ b/Entity/Translation.php
@@ -6,9 +6,15 @@ namespace Bundle\DoctrineExtensionsBundle\Entity;
* Bundle\DoctrineExtensionsBundle\Entity\Translation
*
* @orm:Entity(repositoryClass="Gedmo\Translatable\Repository\TranslationRepository")
- * @orm:Table(name="ext_translation", indexes={
- * @orm:index(name="lookup_idx", columns={"locale", "entity", "foreign_key", "field"})
- * })
+ * @orm:Table(
+ * name="ext_translations",
+ * indexes={@orm:index(name="translations_lookup_idx", columns={
+ * "locale", "entity", "foreign_key"
+ * })},
+ * uniqueConstraints={@orm:UniqueConstraint(name="lookup_unique_idx", columns={
+ * "locale", "entity", "foreign_key", "field"
+ * })}
+ * )
*/
class Translation extends AbstractTranslation
{
|
Updated indexes to match the latest update of the vendor
|
diff --git a/lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java b/lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java
index <HASH>..<HASH> 100644
--- a/lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java
+++ b/lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java
@@ -710,6 +710,10 @@ public class HttpRequest {
}
}
+ public String toString() {
+ return connection.getRequestMethod() + " " + connection.getURL();
+ }
+
/**
* Get underlying connection
*
|
Add toString implementation that includes URL and method
|
diff --git a/eZ/Publish/API/Repository/Values/Content/URLWildcard.php b/eZ/Publish/API/Repository/Values/Content/URLWildcard.php
index <HASH>..<HASH> 100644
--- a/eZ/Publish/API/Repository/Values/Content/URLWildcard.php
+++ b/eZ/Publish/API/Repository/Values/Content/URLWildcard.php
@@ -22,7 +22,7 @@ use eZ\Publish\API\Repository\Values\ValueObject;
class URLWildcard extends ValueObject
{
- /**
+ /**
*
* The unique id
*
@@ -38,11 +38,11 @@ class URLWildcard extends ValueObject
protected $sourceUrl;
/**
- * The destiantion url containing placeholders e.g. /destination/{1}
+ * The destination url containing placeholders e.g. /destination/{1}
*
* @var string
*/
- protected $destiantionUrl;
+ protected $destinationUrl;
/**
* indicates if the url is redirected or not
|
Fixed: Typo in property name.
|
diff --git a/app/controllers/neighborly/balanced/bankaccount/accounts_controller.rb b/app/controllers/neighborly/balanced/bankaccount/accounts_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/neighborly/balanced/bankaccount/accounts_controller.rb
+++ b/app/controllers/neighborly/balanced/bankaccount/accounts_controller.rb
@@ -1,7 +1,8 @@
module Neighborly::Balanced::Bankaccount
class AccountsController < ActionController::Base
def new
- prepare_new_view
+ @balanced_marketplace_id = ::Configuration.fetch(:balanced_marketplace_id)
+ @bank_account = customer.bank_accounts.try(:last)
end
def create
@@ -28,11 +29,6 @@ module Neighborly::Balanced::Bankaccount
user: {})
end
- def prepare_new_view
- @balanced_marketplace_id = ::Configuration.fetch(:balanced_marketplace_id)
- @bank_account = customer.bank_accounts.try(:last)
- end
-
def customer
@customer ||= Neighborly::Balanced::Customer.new(current_user, params).fetch
end
|
Move prepare_new_view to new method
|
diff --git a/nameko/testing/services.py b/nameko/testing/services.py
index <HASH>..<HASH> 100644
--- a/nameko/testing/services.py
+++ b/nameko/testing/services.py
@@ -7,7 +7,7 @@ from contextlib import contextmanager
import inspect
from eventlet import event
-from mock import Mock
+from mock import MagicMock
from nameko.dependencies import (
DependencyFactory, InjectionProvider, EntrypointProvider, entrypoint)
@@ -115,7 +115,7 @@ def instance_factory(service_cls, **injections):
try:
injection = injections[name]
except KeyError:
- injection = Mock()
+ injection = MagicMock()
setattr(service, name, injection)
return service
@@ -123,7 +123,7 @@ def instance_factory(service_cls, **injections):
class MockInjection(InjectionProvider):
def __init__(self, name):
self.name = name
- self.injection = Mock()
+ self.injection = MagicMock()
def acquire_injection(self, worker_ctx):
return self.injection
|
use magicmocks for replacement injections
|
diff --git a/src/CustomElements.php b/src/CustomElements.php
index <HASH>..<HASH> 100644
--- a/src/CustomElements.php
+++ b/src/CustomElements.php
@@ -642,6 +642,12 @@ class CustomElements
}
}
+ if ($fieldConfig['inputType'] === 'pageTree' || $fieldConfig['inputType'] === 'fileTree') {
+ if (!isset($fieldConfig['eval']['fieldType'])) {
+ $fieldConfig['eval']['fieldType'] = 'radio';
+ }
+ }
+
$GLOBALS['TL_DCA'][$dc->table]['fields'][$fieldPrefix . $fieldName] = $fieldConfig;
$GLOBALS['TL_DCA'][$dc->table]['fields'][$fieldPrefix . $fieldName]['eval']['alwaysSave'] = true;
$GLOBALS['TL_DCA'][$dc->table]['fields'][$fieldPrefix . $fieldName]['eval']['doNotSaveEmpty'] = true;
|
Fixed bug with missing fieldType for pageTree
|
diff --git a/docs/source/conf.py b/docs/source/conf.py
index <HASH>..<HASH> 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -14,16 +14,12 @@
import os
import sys
-import unittest.mock
-
-MOCK_MODULES = ['lxml']
-for mod_name in MOCK_MODULES:
- sys.modules[mod_name] = unittest.mock.Mock()
-
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+sys.path.insert(0, os.path.abspath('../..'))
+
+autodoc_mock_imports = ['colorlog', 'lxml', 'pandas']
# -- General configuration -----------------------------------------------------
|
Reworked doc generation to fix newly occurring autodoc problem.
|
diff --git a/converters/toZigbee.js b/converters/toZigbee.js
index <HASH>..<HASH> 100644
--- a/converters/toZigbee.js
+++ b/converters/toZigbee.js
@@ -859,6 +859,7 @@ const converters = {
state = meta.message.state = brightness === 0 ? 'off' : 'on';
}
+ let publishBrightness = brightness !== undefined;
const targetState = state === 'toggle' ? (meta.state.state === 'ON' ? 'off' : 'on') : state;
if (targetState === 'off') {
// Simulate 'Off' with transition via 'MoveToLevelWithOnOff', otherwise just use 'Off'.
@@ -896,6 +897,8 @@ const converters = {
} catch (e) {
// OnLevel not supported
}
+ // Published state might have gotten clobbered by reporting.
+ publishBrightness = true;
}
}
@@ -927,7 +930,7 @@ const converters = {
);
const result = {state: {}, readAfterWriteTime: transition.time * 100};
- if (brightness !== 0) {
+ if (publishBrightness) {
result.state.brightness = Number(brightness);
}
if (state !== null) {
|
Publish brightness 0 when explicitly requested (#<I>)
Not sure this is even technically a valid value but whatever.
Koenkk/zigbee2mqtt#<I>
|
diff --git a/tools/docker/phd_base_tf_cpu/tests/tf_test.py b/tools/docker/phd_base_tf_cpu/tests/tf_test.py
index <HASH>..<HASH> 100644
--- a/tools/docker/phd_base_tf_cpu/tests/tf_test.py
+++ b/tools/docker/phd_base_tf_cpu/tests/tf_test.py
@@ -1,4 +1,5 @@
"""Test that Tensorflow works."""
+import site
import sys
from labm8.py import test
@@ -9,6 +10,7 @@ FLAGS = test.FLAGS
def test_import_tensorflow():
print("Python executable:", sys.executable)
print("Python version:", sys.version)
+ print("Python site packages:", site.getsitepackages())
from third_party.py.tensorflow import tf as tensorflow
|
Fix Tensorflow support in docker images.
Signed-off-by: format <I> <github.com/ChrisCummins/format>
|
diff --git a/lib/rapns.rb b/lib/rapns.rb
index <HASH>..<HASH> 100644
--- a/lib/rapns.rb
+++ b/lib/rapns.rb
@@ -17,7 +17,6 @@ require 'rapns/upgraded'
require 'rapns/apns/binary_notification_validator'
require 'rapns/apns/device_token_format_validator'
-require 'rapns/apns/required_fields_validator'
require 'rapns/apns/notification'
require 'rapns/apns/feedback'
require 'rapns/apns/app'
|
don't require a deleted file (ileitch/rapns#<I>)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.