diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/packages/generator/app/templates/postcss.config.js b/packages/generator/app/templates/postcss.config.js
index <HASH>..<HASH> 100644
--- a/packages/generator/app/templates/postcss.config.js
+++ b/packages/generator/app/templates/postcss.config.js
@@ -1,5 +1,6 @@
module.exports = ctx => ({
plugins: [
+ require('postcss-modules-values-replace')({}),
require('postcss-cssnext')({
features: {
calc: {
|
RG-<I> return 'postcss-modules-values-replace' plugin back to generator since we still use "unit"
|
diff --git a/timepiece/views.py b/timepiece/views.py
index <HASH>..<HASH> 100644
--- a/timepiece/views.py
+++ b/timepiece/views.py
@@ -1112,17 +1112,9 @@ def payroll_summary(request, form, from_date, to_date, status, activity):
).order_by('user__last_name')
for rp in rps:
rp.user.summary = rp.summary(from_date, to_date)
- cals = []
- date = from_date - relativedelta(months=1)
- end_date = from_date + relativedelta(months=1)
- html_cal = calendar.HTMLCalendar(calendar.SUNDAY)
- while date < end_date:
- cals.append(html_cal.formatmonth(date.year, date.month))
- date += relativedelta(months=1)
return {
'form': form,
'all_weeks': all_weeks,
- 'cals': cals,
'periods': rps,
'to_date': to_date,
'from_date': from_date,
|
[#<I>] Removed uneeded cal code in payroll report
|
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/type.rb
+++ b/lib/puppet/type.rb
@@ -2232,6 +2232,7 @@ require 'puppet/type/symlink'
require 'puppet/type/user'
require 'puppet/type/tidy'
require 'puppet/type/parsedtype'
-require 'puppet/type/yumrepo'
+#This needs some more work before it is ready for primetime
+#require 'puppet/type/yumrepo'
# $Id$
|
Disable yumrepo type since it won't work with the FC5 repo files
git-svn-id: <URL>
|
diff --git a/py/h2o.py b/py/h2o.py
index <HASH>..<HASH> 100644
--- a/py/h2o.py
+++ b/py/h2o.py
@@ -520,7 +520,8 @@ def check_sandbox_for_errors(sandbox_ignore_errors=False):
# don't detect these class loader info messags as errors
#[Loaded java.lang.Error from /usr/lib/jvm/java-7-oracle/jre/lib/rt.jar]
foundBad = regex1.search(line) and not (
- ('error rate' in line) or ('[Loaded ' in line) or ('[WARN]' in line))
+ ('error rate' in line) or ('[Loaded ' in line) or
+ ('[WARN]' in line) or ('CalcSquareErrorsTasks' in line))
if (printing==0 and foundBad):
printing = 1
|
Log line containg reference to the class CalcSquareErrorsTasks causes
false test fail.
|
diff --git a/morpfw/crud/app.py b/morpfw/crud/app.py
index <HASH>..<HASH> 100644
--- a/morpfw/crud/app.py
+++ b/morpfw/crud/app.py
@@ -128,6 +128,12 @@ class App(JsonSchemaApp, signals.SignalApp):
def get_statemachine(self, context):
raise NotImplementedError
+ @reg.dispatch_method(reg.match_class("model"))
+ def get_statemachine_factory(self, model):
+ return None
+
+
+
@reg.dispatch_method(reg.match_instance("model", lambda self, context: context))
def get_searchprovider(self, context):
raise NotImplementedError
diff --git a/morpfw/crud/component.py b/morpfw/crud/component.py
index <HASH>..<HASH> 100644
--- a/morpfw/crud/component.py
+++ b/morpfw/crud/component.py
@@ -162,6 +162,13 @@ class StateMachineAction(dectate.Action):
def perform(self, obj, app_class):
app_class.get_statemachine.register(reg.methodify(obj), model=self.model)
+ def factory(model):
+ return obj
+
+ app_class.get_statemachine_factory.register(
+ reg.methodify(factory), model=self.model
+ )
+
class SearchProviderAction(dectate.Action):
|
allow querying for statemachine factory for model
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -70,7 +70,7 @@ module.exports = function(entry, opts) {
if (ev === 'change' || ev === 'add')
emitter.reload(file)
})
- .on('update', function(file) {
+ .on('pending', function(file) {
//bundle.js changes
emitter.reload(file)
})
diff --git a/lib/budo.js b/lib/budo.js
index <HASH>..<HASH> 100644
--- a/lib/budo.js
+++ b/lib/budo.js
@@ -167,6 +167,7 @@ module.exports = function() {
server.update(contents)
emitter.emit('update', serveAs, contents)
})
+ .on('pending', emitter.emit.bind(emitter, 'pending'))
.on('error', emitter.emit.bind(emitter, 'error'))
}
|
for faster UX, trigger reload on pending
|
diff --git a/src/Entity/Abstraction/AbstractEntity.php b/src/Entity/Abstraction/AbstractEntity.php
index <HASH>..<HASH> 100644
--- a/src/Entity/Abstraction/AbstractEntity.php
+++ b/src/Entity/Abstraction/AbstractEntity.php
@@ -386,7 +386,13 @@ abstract class AbstractEntity implements EntityInterface, SortableInterface
public function toArray($recursive = true)
{
if (!$recursive) {
- return $this->properties;
+ $copy = array();
+
+ foreach ($this->properties as $key => $value) {
+ $copy[$key] = $this->$key;
+ }
+
+ return $copy;
}
return $this->convert(new PhpArray());
|
Ensure property values go though the get method before exporting
|
diff --git a/build/extract-css.js b/build/extract-css.js
index <HASH>..<HASH> 100644
--- a/build/extract-css.js
+++ b/build/extract-css.js
@@ -11,7 +11,7 @@ files.forEach((file) => {
sass.render({
file: `./src/css/${file}.scss`,
outputStyle: 'compressed',
- importer: tildeImporter,
+ importer: tildeImporter(),
}, function(err, result) {
if (err) {
console.log(chalk.red('error!', err));
|
fix(css): fix utilities and reset build
this file previously used `node-sass-tilde-importer`, which was
passed in like `importer: tildeImporter`.
during the winter release, that package was replaced with
`node-sass-package-importer` which must be invoked like
this `importer: tildeImporter()`
|
diff --git a/server/memcached/src/main/java/org/infinispan/server/memcached/commands/TextCommandHandler.java b/server/memcached/src/main/java/org/infinispan/server/memcached/commands/TextCommandHandler.java
index <HASH>..<HASH> 100644
--- a/server/memcached/src/main/java/org/infinispan/server/memcached/commands/TextCommandHandler.java
+++ b/server/memcached/src/main/java/org/infinispan/server/memcached/commands/TextCommandHandler.java
@@ -34,7 +34,7 @@ import org.infinispan.server.core.InterceptorChain;
* @author Galder Zamarreño
* @since 4.0
*/
-class TextCommandHandler implements CommandHandler {
+public class TextCommandHandler implements CommandHandler {
final Cache cache;
final InterceptorChain chain;
|
[ISPN-<I>] (Build memcached server module) Fix compilation issue.
|
diff --git a/src/toil/fileStores/abstractFileStore.py b/src/toil/fileStores/abstractFileStore.py
index <HASH>..<HASH> 100644
--- a/src/toil/fileStores/abstractFileStore.py
+++ b/src/toil/fileStores/abstractFileStore.py
@@ -303,7 +303,7 @@ class AbstractFileStore(with_metaclass(ABCMeta, object)):
if size is None:
# It fell off
# Someone is mixing FileStore and JobStore file APIs, or serializing FileIDs as strings.
- size = self.jobStore.getGlobalFileSize(fileStoreID)
+ size = self.jobStore.getFileSize(fileStoreID)
return size
|
Actually call the implemented size polling method (#<I>)
|
diff --git a/config/software/bookshelf.rb b/config/software/bookshelf.rb
index <HASH>..<HASH> 100644
--- a/config/software/bookshelf.rb
+++ b/config/software/bookshelf.rb
@@ -20,8 +20,7 @@ version "master"
dependencies ["erlang", "rebar", "rsync"]
-# TODO: use the public git:// uri once this repo is public
-source :git => "git@github.com:opscode/bookshelf.git"
+source :git => "git://github.com/opscode/bookshelf.git"
relative_path "bookshelf"
|
update bookshelf software definition to use public git uri
|
diff --git a/ioc_writer/ioc_api.py b/ioc_writer/ioc_api.py
index <HASH>..<HASH> 100644
--- a/ioc_writer/ioc_api.py
+++ b/ioc_writer/ioc_api.py
@@ -632,6 +632,14 @@ class IOC():
'''
return write_ioc(self.root, output_dir)
+ def write_ioc_to_string(self):
+ '''
+ Writes the IOC to a string.
+
+ output: returns a string, which is the XML representation of the IOC.
+ '''
+ return write_ioc_string(self.root)
+
def make_Indicator_node(operator, id = None):
'''
This makes a Indicator node element. These allow the construction of a
|
Add a wrapper to the write_ioc_string function to the IOC class
|
diff --git a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
index <HASH>..<HASH> 100644
--- a/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
+++ b/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb
@@ -660,7 +660,13 @@ module ActiveRecord
def insert_fixture(fixture, table_name) #:nodoc:
super
- klass = fixture.class_name.constantize rescue nil
+ if ActiveRecord::Base.pluralize_table_names
+ klass = table_name.singularize.camelize
+ else
+ klass = table_name.camelize
+ end
+
+ klass = klass.constantize rescue nil
if klass.respond_to?(:ancestors) && klass.ancestors.include?(ActiveRecord::Base)
write_lobs(table_name, klass, fixture)
end
|
derive the AR class name from the table name
|
diff --git a/comparison/src/test/java/io/wcm/caravan/hal/comparison/impl/properties/PropertyDiffDetectorTest.java b/comparison/src/test/java/io/wcm/caravan/hal/comparison/impl/properties/PropertyDiffDetectorTest.java
index <HASH>..<HASH> 100644
--- a/comparison/src/test/java/io/wcm/caravan/hal/comparison/impl/properties/PropertyDiffDetectorTest.java
+++ b/comparison/src/test/java/io/wcm/caravan/hal/comparison/impl/properties/PropertyDiffDetectorTest.java
@@ -84,6 +84,7 @@ public class PropertyDiffDetectorTest {
List<HalDifference> diffs = processor.process(context, expected, actual);
assertThat(diffs, hasSize(1));
assertEquals("/", diffs.get(0).getHalContext().toString());
+ assertEquals("", diffs.get(0).getHalContext().getLastRelation());
assertEquals(asString(expected), diffs.get(0).getExpectedJson());
assertEquals(asString(actual), diffs.get(0).getActualJson());
}
|
verify that HalResourceContet#getLastRelation can be called for the entry point resource
|
diff --git a/examples/with-razzle/src/index.js b/examples/with-razzle/src/index.js
index <HASH>..<HASH> 100644
--- a/examples/with-razzle/src/index.js
+++ b/examples/with-razzle/src/index.js
@@ -2,14 +2,17 @@ import http from 'http'
import app from './server'
const server = http.createServer(app.render)
+const PORT = process.env.PORT || 3000
let currentApp = app
-server.listen(process.env.PORT || 3000, error => {
- if (error) {
- console.log(error)
- }
+server.listen(PORT, error => {
+ if (error) console.log(error)
+ require('child_process').exec(`${
+ process.platform == 'darwin' ? 'open' : process.platform == 'win32' ? 'start' : 'xdg-open'
+ } http://localhost:${PORT}`)
+
console.log('🚀 started')
})
@@ -23,4 +26,4 @@ if (module.hot) {
server.on('request', newApp.render)
currentApp = newApp
})
-}
\ No newline at end of file
+}
|
Open in the browser when initialized
closes #<I>
|
diff --git a/src/renderSchema.js b/src/renderSchema.js
index <HASH>..<HASH> 100644
--- a/src/renderSchema.js
+++ b/src/renderSchema.js
@@ -7,15 +7,20 @@ const marked = require('marked')
// an HTML tag. So in some places (like descriptions of the types themselves) we
// just output the raw description. In other places, like table cells, we need
// to output pre-rendered Markdown, otherwise GitHub won't interpret it.
-marked.setOptions({
- breaks: false
-})
+marked.setOptions({ gfm: true })
function markdown (markup) {
- return marked(markup || '')
- .replace(/<\/p>\s*<p>/g, '<br><br>')
- .replace(/<\/?p>/g, '')
+ let output = marked(markup || '')
+ // Join lines, unless the next line starts with a tag.
+ .replace(/\n(?!<)/g, ' ')
+ // Wrap after 80 characters.
+ .replace(/([^\n]{80,}?) /g, '$1\n')
.trim()
+ // If there's only one paragraph, unwrap it.
+ if (output.lastIndexOf('<p>') === 0 && output.endsWith('</p>')) {
+ output = output.slice(3, -4)
+ }
+ return output
}
function sortBy (arr, property) {
|
Update Markdown rendering to look better on GitHub (#2)
|
diff --git a/packages/material-ui/src/FilledInput/FilledInput.js b/packages/material-ui/src/FilledInput/FilledInput.js
index <HASH>..<HASH> 100644
--- a/packages/material-ui/src/FilledInput/FilledInput.js
+++ b/packages/material-ui/src/FilledInput/FilledInput.js
@@ -77,7 +77,7 @@ export const styles = theme => {
borderBottom: `1px solid ${theme.palette.text.primary}`,
},
'&$disabled:before': {
- borderBottom: `1px dotted ${bottomLineColor}`,
+ borderBottomStyle: 'dotted',
},
},
/* Styles applied to the root element if the component is focused. */
|
[FilledInput] Simplify border overrides (#<I>)
Simple fix for #<I>. Just changed the disable css style to only specify the border bottom style, instead of the entire border property. This will make overrides a little simpler.
Thanks!
Closes #<I>.
|
diff --git a/lib/mongodb/db.js b/lib/mongodb/db.js
index <HASH>..<HASH> 100644
--- a/lib/mongodb/db.js
+++ b/lib/mongodb/db.js
@@ -895,7 +895,8 @@ Db.prototype.command = function(selector, options, callback) {
// Ensure only commands who support read Prefrences are exeuted otherwise override and use Primary
if(readPreference != false) {
if(selector['group'] || selector['aggregate'] || selector['collStats'] || selector['dbStats']
- || selector['count'] || selector['distinct'] || selector['geoNear'] || selector['geoSearch'] || selector['geoWalk']
+ || selector['count'] || selector['distinct'] || selector['geoNear'] || selector['geoSearch']
+ || selector['geoWalk'] || selector['text']
|| (selector['mapreduce'] && selector.out == 'inline')) {
// Set the read preference
cursor.setReadPreference(readPreference);
|
Added support for text command to use read preference #<I>
|
diff --git a/lib/vagrant/machine.rb b/lib/vagrant/machine.rb
index <HASH>..<HASH> 100644
--- a/lib/vagrant/machine.rb
+++ b/lib/vagrant/machine.rb
@@ -6,7 +6,6 @@ module Vagrant
# API for querying the state and making state changes to the machine, which
# is backed by any sort of provider (VirtualBox, VMware, etc.).
class Machine
- autoload :Client, "vagrant/machine/client"
autoload :Thick, "vagrant/machine/thick"
autoload :Thin, "vagrant/machine/thin"
|
Remove client autoload since it does not exist here
|
diff --git a/lib/cql/version.rb b/lib/cql/version.rb
index <HASH>..<HASH> 100644
--- a/lib/cql/version.rb
+++ b/lib/cql/version.rb
@@ -1,3 +1,3 @@
module CQL
- VERSION = '1.0.0'
+ VERSION = '1.0.1'
end
|
Version bump.
Incrementing the gem version to <I> in preparation for the upcoming
release.
|
diff --git a/dist/brewser.js b/dist/brewser.js
index <HASH>..<HASH> 100644
--- a/dist/brewser.js
+++ b/dist/brewser.js
@@ -2,7 +2,7 @@
'use strict';
- if(window.BREWSER) {
+ if(global.BREWSER || typeof window === 'undefined') {
return;
}
|
support for isomorphic commonjs import
ran into this issue when ES6-importing this node module during meteor <I> beta testing
|
diff --git a/lib/podio/middleware/error_response.rb b/lib/podio/middleware/error_response.rb
index <HASH>..<HASH> 100644
--- a/lib/podio/middleware/error_response.rb
+++ b/lib/podio/middleware/error_response.rb
@@ -12,10 +12,10 @@ module Podio
if finished_env[:body]['error_description'] =~ /expired_token/
raise Error::TokenExpired, finished_env[:body].inspect
else
- raise Error::AuthorizationError, finished_env[:body].inspect
+ raise Error::AuthorizationError, finished_env[:body]
end
when 403
- raise Error::AuthorizationError, finished_env[:body].inspect
+ raise Error::AuthorizationError, finished_env[:body]
when 404
raise Error::NotFoundError, "#{finished_env[:method].to_s.upcase} #{finished_env[:url]}"
when 410
|
Changed so error message on Auth erros from the API is passed along as a hash, rather than as a string
|
diff --git a/tlsobs/main.go b/tlsobs/main.go
index <HASH>..<HASH> 100644
--- a/tlsobs/main.go
+++ b/tlsobs/main.go
@@ -127,6 +127,7 @@ getresults:
fmt.Printf("\n")
if !results.Has_tls {
fmt.Printf("%s does not support SSL/TLS\n", target)
+ exitCode = 5
} else {
if *printRaw {
fmt.Printf("%s\n", body)
|
Exit with non zero code when target doesn't support TLS
|
diff --git a/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php b/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php
index <HASH>..<HASH> 100644
--- a/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php
+++ b/framework/core/src/Core/Handlers/Commands/UploadAvatarCommandHandler.php
@@ -47,7 +47,9 @@ class UploadAvatarCommandHandler
'target' => $this->uploadDir,
]);
- // @todo delete old avatar
+ if ($mount->has($file = "target://$user->avatar_path")) {
+ $mount->delete($file);
+ }
$user->changeAvatarPath($uploadName);
|
Delete previous avatar when uploading a new one
|
diff --git a/lib/gym/manager.rb b/lib/gym/manager.rb
index <HASH>..<HASH> 100644
--- a/lib/gym/manager.rb
+++ b/lib/gym/manager.rb
@@ -17,7 +17,8 @@ module Gym
rows << ["Workspace", config[:workspace]] if config[:workspace]
rows << ["Scheme", config[:scheme]] if config[:scheme]
rows << ["Configuration", config[:configuration]] if config[:configuration]
- rows << ["Xcode path", Gym.xcode_path]
+ rows << ["Platform", Gym.project.ios?? "iOS" : "Mac"]
+ rows << ["Xcode Path", Gym.xcode_path.gsub("/Contents/Developer", "")]
puts ""
puts Terminal::Table.new(
|
Added platform information to the summar & improved xcode path output
|
diff --git a/lib/connect-mongo.js b/lib/connect-mongo.js
index <HASH>..<HASH> 100755
--- a/lib/connect-mongo.js
+++ b/lib/connect-mongo.js
@@ -146,9 +146,13 @@ module.exports = function(connect) {
break;
case 'interval':
- setInterval(function () {
+ self.timer = setInterval(function () {
self.collection.remove({ expires: { $lt: new Date() } }, { w: 0 });
}, options.autoRemoveInterval * 1000 * 60);
+ // node <0.8 compatibility
+ if (typeof self.timer.unref === 'function') {
+ self.timer.unref();
+ }
changeState('connected');
break;
|
Exposing timer as self.timer. Added timer.unref()
|
diff --git a/charmhelpers/core/hookenv.py b/charmhelpers/core/hookenv.py
index <HASH>..<HASH> 100644
--- a/charmhelpers/core/hookenv.py
+++ b/charmhelpers/core/hookenv.py
@@ -67,7 +67,7 @@ def cached(func):
@wraps(func)
def wrapper(*args, **kwargs):
global cache
- key = str((func, args, kwargs))
+ key = json.dumps((str(func), args, kwargs), sort_keys=True)
try:
return cache[key]
except KeyError:
|
Ensure keys in cashed func args are sorted (#<I>)
Fixes #<I>
Supersedes #<I>
|
diff --git a/lib/modules/core/index.js b/lib/modules/core/index.js
index <HASH>..<HASH> 100644
--- a/lib/modules/core/index.js
+++ b/lib/modules/core/index.js
@@ -45,6 +45,7 @@ Archiver.prototype._abort = function() {
this._state.aborted = true;
this._queue.kill();
this._statQueue.kill();
+ this.end();
};
Archiver.prototype._append = function(filepath, data) {
|
core: end internal streams on abort.
|
diff --git a/includes/session.php b/includes/session.php
index <HASH>..<HASH> 100644
--- a/includes/session.php
+++ b/includes/session.php
@@ -72,6 +72,7 @@ define('WT_REGEX_UNSAFE', '[\x00-\xFF]*'); // Use with care and apply addition
define('WT_UTF8_BOM', "\xEF\xBB\xBF"); // U+FEFF
define('WT_UTF8_MALE', "\xE2\x99\x82"); // U+2642
define('WT_UTF8_FEMALE', "\xE2\x99\x80"); // U+2640
+define('WT_UTF8_NO_SEX', "\xE2\x9A\xAA"); // U+26AA
// UTF8 control codes affecting the BiDirectional algorithm (see http://www.unicode.org/reports/tr9/)
define('WT_UTF8_LRM', "\xE2\x80\x8E"); // U+200E (Left to Right mark: zero-width character with LTR directionality)
|
Add UTF8 symbol for "No sex", to complement the male/female symbols
|
diff --git a/ads/core.py b/ads/core.py
index <HASH>..<HASH> 100644
--- a/ads/core.py
+++ b/ads/core.py
@@ -204,16 +204,14 @@ class Article(object):
def _get_field(self, field):
"""
- Queries the api for a single field for the record by `id`. Intentionally
- does not update self.response. This method should only be called
- indirectly by cached properties.
+ Queries the api for a single field for the record by `id`.
+ This method should only be called indirectly by cached properties.
:param field: name of the record field to load
"""
if not hasattr(self, "id") or self.id is None:
raise SolrResponseError("Cannot query an article without an id")
- response = SolrResponse.load_http_response(BaseQuery().session.get(
- SEARCH_URL, params={"q": "id:{}".format(self.id), "fl": field}))
- value = response.docs[0][field]
+ sq = SearchQuery(q="id:{}".format(self.id), fl=field)
+ value = next(sq).__getattribute__(field)
self._raw[field] = value
return value
|
Article: use SearchQuery instead of BaseQuery for _get_field()
|
diff --git a/src/speech_rules/clearspeak_rules.js b/src/speech_rules/clearspeak_rules.js
index <HASH>..<HASH> 100644
--- a/src/speech_rules/clearspeak_rules.js
+++ b/src/speech_rules/clearspeak_rules.js
@@ -2250,8 +2250,9 @@ sre.ClearspeakRules.initClearspeakRules_ = function() {
'self::number', '@role="mixed"');
defineRule(
'number-with-chars', 'clearspeak.default',
- '[t] "number"; [m] CQFspaceoutNumber', 'self::number[@role!="protected"]',
- '"" != translate(text(), "0123456789.,", "")');
+ '[t] "number"; [m] CQFspaceoutNumber', 'self::number',
+ '"" != translate(text(), "0123456789.,", "")',
+ 'text() != translate(text(), "0123456789.,", "")');
// Decimal periods:
defineRule(
|
Fixes number rules to work with alpha mixed numbers.
|
diff --git a/spyderlib/widgets/dicteditor.py b/spyderlib/widgets/dicteditor.py
index <HASH>..<HASH> 100644
--- a/spyderlib/widgets/dicteditor.py
+++ b/spyderlib/widgets/dicteditor.py
@@ -757,7 +757,10 @@ class BaseTableView(QTableView):
"""Reimplement Qt method"""
index_clicked = self.indexAt(event.pos())
if index_clicked.isValid():
- self.edit_item()
+ row = index_clicked.row()
+ # TODO: Remove hard coded "Value" column number (3 here)
+ index_clicked = index_clicked.child(row, 3)
+ self.edit(index_clicked)
else:
event.accept()
|
Variable explorer: Make double clicks to edit values when pressed anywhere (and not just in the Value column)
|
diff --git a/chisel/request.py b/chisel/request.py
index <HASH>..<HASH> 100644
--- a/chisel/request.py
+++ b/chisel/request.py
@@ -23,7 +23,7 @@
from .compat import func_name, iteritems
import hashlib
-import os
+from pathlib import posixpath
from pkg_resources import resource_string
@@ -71,11 +71,11 @@ class StaticRequest(Request):
if name is None:
name = resource_name
if urls is None:
- urls = (('GET', '/' + resource_name),)
+ urls = (('GET', '/' + posixpath.join(*posixpath.split(resource_name)[1:])),)
if doc is None:
doc = ('The "{0}" package\'s static resource, "{1}".'.format(package, resource_name),)
if content_type is None:
- content_type = self.EXT_TO_CONTENT_TYPE.get(os.path.splitext(resource_name)[1].lower(), 'application/octet-stream')
+ content_type = self.EXT_TO_CONTENT_TYPE.get(posixpath.splitext(resource_name)[1].lower(), 'application/octet-stream')
Request.__init__(self, name=name, urls=urls, doc=doc)
|
use posixpath in StaticRequest
|
diff --git a/lib/commands/test.js b/lib/commands/test.js
index <HASH>..<HASH> 100644
--- a/lib/commands/test.js
+++ b/lib/commands/test.js
@@ -5,11 +5,18 @@ const doctap = require('../doctap'),
module.exports.command = 'test';
module.exports.description = 'Run all doctests'
-module.exports.builder = {};
+module.exports.builder = {
+ entrypoint: {
+ describe: 'entrypoint to api.js',
+ type: 'string',
+ default: '.'
+ }
+};
module.exports.handler = function test (argv) {
argv._handled = true;
- doctap(cwd('.', 'api.js'));
+ let entrypoint = argv.entrypoint;
+ doctap(cwd(entrypoint, 'api.js'));
// tap-parser --json=4 > doctest.json
console.log('Run Smappi Test Server...');
};
|
Added entrypoint for smappi test
|
diff --git a/rake/lib/rake/filelist.rb b/rake/lib/rake/filelist.rb
index <HASH>..<HASH> 100644
--- a/rake/lib/rake/filelist.rb
+++ b/rake/lib/rake/filelist.rb
@@ -6,8 +6,21 @@ module Rake
add_matching(pattern) if pattern
end
- def add_matching(pattern)
- Dir[pattern].each { |fn| self << fn } if pattern
+ def add(*filenames)
+ filenames.each do |fn|
+ case fn
+ when Array
+ fn.each { |f| self << f }
+ else
+ self << fn
+ end
+ end
+ end
+
+ def add_matching(*patterns)
+ patterns.each do |pattern|
+ Dir[pattern].each { |fn| self << fn } if pattern
+ end
end
def to_s
|
Added "add" function. Arrays and single file names are acceptable.
git-svn-id: svn+ssh://rubyforge.org/var/svn/rake/trunk@<I> 5af<I>f1-ac1a-<I>-<I>d6-<I>a<I>c<I>ef
|
diff --git a/angr/analyses/cgc.py b/angr/analyses/cgc.py
index <HASH>..<HASH> 100644
--- a/angr/analyses/cgc.py
+++ b/angr/analyses/cgc.py
@@ -50,7 +50,7 @@ class CGC(Analysis):
# make a CGC state
s = self._p.initial_state()
s.get_plugin('cgc')
- self.e = self._p.surveyors.Explorer(start=self._p.exit_to(self._p.entry, state=s), find=self.check_path)
+ self.e = self._p.surveyors.Explorer(start=self._p.exit_to(self._p.entry, state=s), find=self.check_for_eip_control, enable_veritesting=True)
self.e.run()
self.vuln_path = self.e.found[0]
|
merged cgc.py.
|
diff --git a/conn_test.go b/conn_test.go
index <HASH>..<HASH> 100644
--- a/conn_test.go
+++ b/conn_test.go
@@ -16,6 +16,29 @@ func TestSystemBus(t *testing.T) {
}
}
+func TestSend(t *testing.T) {
+ bus, err := SessionBus()
+ if err != nil {
+ t.Error(err)
+ }
+ ch := make(chan *Call, 1)
+ msg := &Message{
+ Type: TypeMethodCall,
+ Flags: 0,
+ Headers: map[HeaderField]Variant{
+ FieldDestination: MakeVariant(bus.Names()[0]),
+ FieldPath: MakeVariant(ObjectPath("/org/freedesktop/DBus")),
+ FieldInterface: MakeVariant("org.freedesktop.DBus.Peer"),
+ FieldMember: MakeVariant("Ping"),
+ },
+ }
+ call := bus.Send(msg, ch)
+ <-ch
+ if call.Err != nil {
+ t.Error(call.Err)
+ }
+}
+
type server struct{}
func (server) Double(i int64) (int64, *Error) {
|
Add test for Conn.Send()
|
diff --git a/addon/adapters/pouch.js b/addon/adapters/pouch.js
index <HASH>..<HASH> 100644
--- a/addon/adapters/pouch.js
+++ b/addon/adapters/pouch.js
@@ -133,8 +133,12 @@ export default DS.RESTAdapter.extend({
_recordToData: function (store, type, record) {
var data = {};
- var recordTypeName = this.getRecordTypeName(type);
- var serializer = store.serializerFor(recordTypeName);
+ // Though it would work to use the default recordTypeName for modelName &
+ // serializerKey here, these uses are conceptually distinct and may vary
+ // independently.
+ var modelName = type.modelName || type.typeKey;
+ var serializerKey = camelize(modelName);
+ var serializer = store.serializerFor(modelName);
var recordToStore = record;
// In Ember-Data beta.15, we need to take a snapshot. See issue #45.
@@ -152,7 +156,7 @@ export default DS.RESTAdapter.extend({
{includeId: true}
);
- data = data[recordTypeName];
+ data = data[serializerKey];
// ember sets it to null automatically. don't need it.
if (data.rev === null) {
|
Serializer keys are conceptually distinct from recordTypeName.
|
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index <HASH>..<HASH> 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -2902,7 +2902,7 @@ class Page
$case_insensitive = Grav::instance()['config']->get('system.force_lowercase_urls');
if ($case_insensitive) {
- return strtolower($route);
+ return mb_strtolower($route);
} else {
return $route;
}
|
Fix for URL encoding with Multibyte folders
|
diff --git a/src/model/Repositories/UserEmailConfirmationsRepository.php b/src/model/Repositories/UserEmailConfirmationsRepository.php
index <HASH>..<HASH> 100644
--- a/src/model/Repositories/UserEmailConfirmationsRepository.php
+++ b/src/model/Repositories/UserEmailConfirmationsRepository.php
@@ -21,7 +21,7 @@ class UserEmailConfirmationsRepository extends Repository
public function confirm(string $token): ?ActiveRow
{
- $emailConfirmationRow = $this->getTable()->where('token', $token)->fetch();
+ $emailConfirmationRow = $this->getTable()->where('token', $token)->order('id DESC')->fetch();
if (!$emailConfirmationRow) {
return null;
}
@@ -32,10 +32,14 @@ class UserEmailConfirmationsRepository extends Repository
return $emailConfirmationRow;
}
-
+
public function getToken(int $userId): ?string
{
- $token = $this->getTable()->where('user_id', $userId)->fetchField('token');
+ $token = $this->getTable()
+ ->where('user_id', $userId)
+ ->order('id DESC')
+ ->fetchField('token');
+
return $token ?: null;
}
}
|
Add automatic internal user confirmation
At this point we want to maintain backwards compatibility
and confirm every user. Once we start sending activation
links to the selected groups of users, we'll exclude
this groups from the automatic user confirmation.
remp/crm#<I>
|
diff --git a/tests/test_georaster_tiling.py b/tests/test_georaster_tiling.py
index <HASH>..<HASH> 100644
--- a/tests/test_georaster_tiling.py
+++ b/tests/test_georaster_tiling.py
@@ -157,9 +157,11 @@ class GeoRaster2TestGetTile(TestCase):
def test_get_tile_from_different_crs_tile_is_not_tilted_with_different_buffer(self):
for raster in [self.read_only_virtual_geo_raster_wgs84()]:
os.environ["TELLURIC_GET_TILE_BUFFER"] = "0"
- r = raster.get_tile(*tiles[18])
+ try:
+ r = raster.get_tile(*tiles[18])
+ except:
+ del os.environ["TELLURIC_GET_TILE_BUFFER"]
self.assertEqual(2, len(np.unique(r.image.mask)))
- del os.environ["TELLURIC_GET_TILE_BUFFER"]
def test_get_entire_all_raster(self):
vr = self.small_read_only_virtual_geo_raster()
|
makng environment setting on test safer
|
diff --git a/salt/renderers/stateconf.py b/salt/renderers/stateconf.py
index <HASH>..<HASH> 100644
--- a/salt/renderers/stateconf.py
+++ b/salt/renderers/stateconf.py
@@ -38,7 +38,7 @@ from cStringIO import StringIO
# Import salt libs
import salt.utils
from salt.exceptions import SaltRenderError
-import six
+import salt.utils.six as six
from six import string_types
__all__ = ['render']
|
Replaced import six in file /salt/renderers/stateconf.py
|
diff --git a/textdistance/algorithms/edit_based.py b/textdistance/algorithms/edit_based.py
index <HASH>..<HASH> 100644
--- a/textdistance/algorithms/edit_based.py
+++ b/textdistance/algorithms/edit_based.py
@@ -251,8 +251,9 @@ class JaroWinkler(_BaseSimilarity):
if not s1_len or not s2_len:
return 0.0
- min_len = max(s1_len, s2_len)
- search_range = (min_len // 2) - 1
+ min_len = min(s1_len, s2_len)
+ search_range = max(s1_len, s2_len)
+ search_range = (search_range // 2) - 1
if search_range < 0:
search_range = 0
@@ -294,7 +295,7 @@ class JaroWinkler(_BaseSimilarity):
# stop to boost if strings are not similar
if not self.winklerize:
return weight
- if weight <= 0.7 or s1_len <= 3 or s2_len <= 3:
+ if weight <= 0.7:
return weight
# winkler modification
|
Modify JaroWinkler boosting to match behaviour of jellyfish algorithm
|
diff --git a/spec/unit/provider/service/smf_spec.rb b/spec/unit/provider/service/smf_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/unit/provider/service/smf_spec.rb
+++ b/spec/unit/provider/service/smf_spec.rb
@@ -20,6 +20,8 @@ describe provider_class, :if => Puppet.features.posix? do
FileTest.stubs(:executable?).with('/usr/sbin/svcadm').returns true
FileTest.stubs(:file?).with('/usr/bin/svcs').returns true
FileTest.stubs(:executable?).with('/usr/bin/svcs').returns true
+ Facter.stubs(:value).with(:operatingsystem).returns('Solaris')
+ Facter.stubs(:value).with(:osfamily).returns('Solaris')
Facter.stubs(:value).with(:kernelrelease).returns '5.11'
end
|
(maint) Stub operatingsystem fact in SMF provider test
|
diff --git a/src/main/java/graphql/execution/TypeInfo.java b/src/main/java/graphql/execution/TypeInfo.java
index <HASH>..<HASH> 100644
--- a/src/main/java/graphql/execution/TypeInfo.java
+++ b/src/main/java/graphql/execution/TypeInfo.java
@@ -74,7 +74,7 @@ public class TypeInfo {
typeIsNonNull, type, parentType);
}
- static class Builder {
+ public static class Builder {
GraphQLType type;
TypeInfo parentType;
|
#<I> type info build is public
|
diff --git a/codec-dns/src/main/java/io/netty/handler/codec/dns/AbstractDnsMessage.java b/codec-dns/src/main/java/io/netty/handler/codec/dns/AbstractDnsMessage.java
index <HASH>..<HASH> 100644
--- a/codec-dns/src/main/java/io/netty/handler/codec/dns/AbstractDnsMessage.java
+++ b/codec-dns/src/main/java/io/netty/handler/codec/dns/AbstractDnsMessage.java
@@ -375,6 +375,11 @@ public abstract class AbstractDnsMessage extends AbstractReferenceCounted implem
@Override
protected void deallocate() {
clear();
+
+ final ResourceLeak leak = this.leak;
+ if (leak != null) {
+ leak.close();
+ }
}
@Override
|
Fix missing ResourceLeak.close() in AbstractDnsMessage
Motivation:
ResourceLeak.close() must be called when a reference-counted resource is
deallocated, but AbstractDnsMessage.deallocate() forgot to call it.
Modifications:
Call ResourceLeak.close() for the tracked AbstractDnsMessage instances
Result:
Fix the false resource leak warnings
|
diff --git a/src/Formatter/Result.php b/src/Formatter/Result.php
index <HASH>..<HASH> 100644
--- a/src/Formatter/Result.php
+++ b/src/Formatter/Result.php
@@ -168,13 +168,13 @@ class Result
$this->identifiers[$identifier][] = $value;
}
- public function get($identifier, $default = null)
+ public function get($identifier, $default = null, $singleAsArray = false)
{
if (!array_key_exists($identifier, $this->identifiers)) {
return $default;
}
- if (is_array($this->identifiers[$identifier]) && 1 === count($this->identifiers[$identifier])) {
+ if (is_array($this->identifiers[$identifier]) && 1 === count($this->identifiers[$identifier]) && $singleAsArray === false) {
return array_values($this->identifiers[$identifier])[0];
}
|
assume single as array for get default false
|
diff --git a/src/Zephyrus/Security/Authorization.php b/src/Zephyrus/Security/Authorization.php
index <HASH>..<HASH> 100644
--- a/src/Zephyrus/Security/Authorization.php
+++ b/src/Zephyrus/Security/Authorization.php
@@ -9,8 +9,9 @@ class Authorization
const GET = 1;
const POST = 2;
const PUT = 4;
- const DELETE = 8;
- const ALL = 15;
+ const PATCH = 8;
+ const DELETE = 16;
+ const ALL = 31;
const MODE_BLACKLIST = 0;
const MODE_WHITELIST = 1;
@@ -145,6 +146,9 @@ class Authorization
if ($httpMethod & self::PUT) {
$methods[] = 'PUT';
}
+ if ($httpMethod & self::PATCH) {
+ $methods[] = 'PATCH';
+ }
if ($httpMethod & self::DELETE) {
$methods[] = 'DELETE';
}
|
Added PATCH method to Authorization
|
diff --git a/src/main/java/org/jboss/pressgang/ccms/rest/v1/constants/RESTv1Constants.java b/src/main/java/org/jboss/pressgang/ccms/rest/v1/constants/RESTv1Constants.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jboss/pressgang/ccms/rest/v1/constants/RESTv1Constants.java
+++ b/src/main/java/org/jboss/pressgang/ccms/rest/v1/constants/RESTv1Constants.java
@@ -34,7 +34,7 @@ public class RESTv1Constants {
public static final String CONTENT_SPEC_EXPANSION_NAME = "contentSpecs";
public static final String CONTENT_SPEC_NODE_EXPANSION_NAME = "nodes";
- public static final String TRANSLATED_CONTENT_SPEC_EXPANSION_NAME = "translatedContentSpec";
+ public static final String TRANSLATED_CONTENT_SPEC_EXPANSION_NAME = "translatedContentSpecs";
public static final String CONTENT_SPEC_TRANSLATED_NODE_EXPANSION_NAME = "translatedNodes";
public static final String TOPIC_URL_NAME = "topic";
|
Minor fix to make a collection expand a plural.
|
diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index <HASH>..<HASH> 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -166,7 +166,7 @@ class UsersManager extends \Piwik\Plugin
*/
public static function checkPasswordHash($passwordHash, $exceptionMessage)
{
- if (strlen($passwordHash) !== strlen(static::getPasswordHash('teststring'))) {
+ if (strlen($passwordHash) != 32) { // MD5 hash length
throw new Exception($exceptionMessage);
}
}
|
Revert hash calculation on comparison
For performance reasons
|
diff --git a/svtplay_dl.py b/svtplay_dl.py
index <HASH>..<HASH> 100755
--- a/svtplay_dl.py
+++ b/svtplay_dl.py
@@ -1042,6 +1042,7 @@ class Tv4play():
options.live = True
streams = {}
+ subtitle = False
for i in sa:
if i.find("mediaFormat").text != "smi":
@@ -1049,6 +1050,8 @@ class Tv4play():
stream["uri"] = i.find("base").text
stream["path"] = i.find("url").text
streams[int(i.find("bitrate").text)] = stream
+ elif i.find("mediaFormat").text == "smi":
+ subtitle = i.find("url").text
if len(streams) == 1:
test = streams[list(streams.keys())[0]]
else:
@@ -1066,6 +1069,8 @@ class Tv4play():
sys.exit(2)
manifest = "%s?hdcore=2.8.0&g=hejsan" % test["path"]
download_hds(options, manifest, swf)
+ if options.subtitle and subtitle:
+ subtitle_smi(options, subtitle)
class Svtplay():
def handle(self, url):
|
tv4play: support for subtitle.
|
diff --git a/salt/minion.py b/salt/minion.py
index <HASH>..<HASH> 100644
--- a/salt/minion.py
+++ b/salt/minion.py
@@ -325,7 +325,8 @@ class Minion(object):
payload = {'enc': 'aes'}
if ret_cmd == '_syndic_return':
load = {'cmd': ret_cmd,
- 'jid': ret['jid']}
+ 'jid': ret['jid'],
+ 'id': self.opts['id']}
load['return'] = {}
for key, value in ret.items():
if key == 'jid' or key == 'fun':
|
Add passign master's id to syndic return
|
diff --git a/lib/flapjack/gateways/api.rb b/lib/flapjack/gateways/api.rb
index <HASH>..<HASH> 100644
--- a/lib/flapjack/gateways/api.rb
+++ b/lib/flapjack/gateways/api.rb
@@ -104,7 +104,11 @@ module Flapjack
end
after do
- logger.debug("Returning #{response.status} for #{request.request_method} #{request.path_info}#{request.query_string}")
+ if logger.debug?
+ logger.debug("Returning #{response.status} for #{request.request_method} #{request.path_info}#{request.query_string}, body: [#{response.body.join(', ')}]")
+ elsif logger.info?
+ logger.info("Returning #{response.status} for #{request.request_method} #{request.path_info}#{request.query_string}")
+ end
end
register Flapjack::Gateways::API::EntityMethods
|
log reponse body at debug level
|
diff --git a/lib/cache.js b/lib/cache.js
index <HASH>..<HASH> 100644
--- a/lib/cache.js
+++ b/lib/cache.js
@@ -47,11 +47,25 @@ var DCp = DiskCache.prototype;
DCp.setDefaultP = util.cachedMethod(function(key, toStringP, fromStringP) {
return this.cacheDirP.then(function(cacheDir) {
var file = path.join(cacheDir, key + ".js");
+
return util.openExclusiveP(file).then(function(fd) {
var stringP = Q.resolve(toStringP());
+
return stringP.then(function(string) {
return util.writeFdP(fd, string);
+
+ }, function(err) {
+ // Note that util.writeFdP closes the file descriptor
+ // under normal circumstances.
+ fs.closeSync(fd);
+
+ // If stringP resolved to an error, remove the cache file
+ // so we don't reuse it blindly in the future.
+ return util.unlinkP(file).then(function() {
+ throw err;
+ });
});
+
}, function(err) {
assert.strictEqual(err.code, "EEXIST"); // TODO
// TODO Deal with inter-process race condition!
|
Make sure to unlink cache files that fail to build successfully.
|
diff --git a/google-cloud-redis/lib/google/cloud/redis/v1/cloud_redis_pb.rb b/google-cloud-redis/lib/google/cloud/redis/v1/cloud_redis_pb.rb
index <HASH>..<HASH> 100644
--- a/google-cloud-redis/lib/google/cloud/redis/v1/cloud_redis_pb.rb
+++ b/google-cloud-redis/lib/google/cloud/redis/v1/cloud_redis_pb.rb
@@ -5,7 +5,6 @@
require 'google/protobuf'
require 'google/api/annotations_pb'
-require 'google/api/resource_pb'
require 'google/longrunning/operations_pb'
require 'google/protobuf/field_mask_pb'
require 'google/protobuf/timestamp_pb'
|
Remove resource_pb require (#<I>)
Temporarily remove the require to get the build to pass.
Awaiting a new googleapis-common-protos release for a proper fix .
|
diff --git a/ghost/admin/app/components/gh-member-settings-form-cp.js b/ghost/admin/app/components/gh-member-settings-form-cp.js
index <HASH>..<HASH> 100644
--- a/ghost/admin/app/components/gh-member-settings-form-cp.js
+++ b/ghost/admin/app/components/gh-member-settings-form-cp.js
@@ -80,8 +80,7 @@ export default class extends Component {
}
get isCreatingComplimentary() {
- const {comped} = this.member.changedAttributes() || {};
- return comped && comped[0] === false && comped[1] === true && this.args.isSaveRunning;
+ return this.args.isSaveRunning;
}
@action
|
Fixed loading indicator on comped subscription
no refs
|
diff --git a/Classes/Cundd/Noshi/Utilities/ObjectUtility.php b/Classes/Cundd/Noshi/Utilities/ObjectUtility.php
index <HASH>..<HASH> 100644
--- a/Classes/Cundd/Noshi/Utilities/ObjectUtility.php
+++ b/Classes/Cundd/Noshi/Utilities/ObjectUtility.php
@@ -20,6 +20,7 @@ class ObjectUtility {
* @param string $keyPath Key path of the property to fetch
* @param object|array $object Source to fetch the data from
* @param mixed $default An optional default value to return if the path could not be resolved. If a callback is passed, it's return value is used
+ * @throws \LogicException if the given key path is no string
* @return mixed
*/
static public function valueForKeyPathOfObject($keyPath, $object, $default = NULL) {
@@ -28,6 +29,8 @@ class ObjectUtility {
$keyPathPartsLength = count($keyPathParts);
$currentValue = $object;
+ if (!is_string($keyPath)) throw new \LogicException('Given key path is not of type string (maybe arguments are ordered incorrect)', 1395484136);
+
for ($i = 0; $i < $keyPathPartsLength; $i++) {
$key = $keyPathParts[$i];
$accessorMethod = 'get' . ucfirst($key);
|
Added a check if the given key path is a string
|
diff --git a/lib/Models/Cesium.js b/lib/Models/Cesium.js
index <HASH>..<HASH> 100644
--- a/lib/Models/Cesium.js
+++ b/lib/Models/Cesium.js
@@ -813,7 +813,7 @@ Cesium.prototype.pickFromScreenPosition = function(screenPosition) {
Cesium.prototype.pickVectorFeatures = function(screenPosition) {
// Pick vector features
var vectorFeatures = [];
- var pickedList = this.scene.drillPick(screenPosition, 100);
+ var pickedList = this.scene.drillPick(screenPosition, 101);
for (var i = 0; i < pickedList.length; ++i) {
var picked = pickedList[i];
var id = picked.id;
|
Allow <I> picked features.
So that the "first <I> are shown" feature works.
|
diff --git a/qgrid/qgridjs/qgrid.widget.js b/qgrid/qgridjs/qgrid.widget.js
index <HASH>..<HASH> 100644
--- a/qgrid/qgridjs/qgrid.widget.js
+++ b/qgrid/qgridjs/qgrid.widget.js
@@ -1,4 +1,4 @@
-if (IPython.version[0] === '4' && parseInt(IPython.version[2]) >= 2) {
+if (parseInt(IPython.version[0]) >= 5 || (IPython.version[0] === '4' && parseInt(IPython.version[2]) >= 2)) {
var path = 'jupyter-js-widgets';
} else {
var path = 'widgets/js/widget';
|
Fix version check to be compatible with IPython <I>
|
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
index <HASH>..<HASH> 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java
@@ -469,11 +469,14 @@ public final class Roster extends Manager {
@Override
public void processException(Exception exception) {
rosterState = RosterState.uninitialized;
- Level logLevel;
+ Level logLevel = Level.SEVERE;
if (exception instanceof NotConnectedException) {
logLevel = Level.FINE;
- } else {
- logLevel = Level.SEVERE;
+ } else if (exception instanceof XMPPErrorException) {
+ Condition condition = ((XMPPErrorException) exception).getStanzaError().getCondition();
+ if (condition == Condition.feature_not_implemented || condition == Condition.service_unavailable) {
+ logLevel = Level.FINE;
+ }
}
LOGGER.log(logLevel, "Exception reloading roster", exception);
for (RosterLoadedListener listener : rosterLoadedListeners) {
|
Conditionally reduce severity of roster reload error logging
If the roster feature is not supported by the server, there's no need to
log this at SEVERE log level.
|
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -486,10 +486,6 @@ module Puppet
:default => "stomp",
:desc => "Which type of queue to use for asynchronous processing.",
},
- :queue_type => {
- :default => "stomp",
- :desc => "Which type of queue to use for asynchronous processing.",
- },
:queue_source => {
:default => "stomp://localhost:61613/",
:desc => "Which type of queue to use for asynchronous processing. If your stomp server requires
|
(MAINT) Fix duplicate key which ruby <I> complains about
|
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index <HASH>..<HASH> 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -19,8 +19,14 @@ class Configuration implements ConfigurationInterface
*/
public function getConfigTreeBuilder()
{
- $treeBuilder = new TreeBuilder();
- $rootNode = $treeBuilder->root('knp_menu');
+ $treeBuilder = new TreeBuilder('knp_menu');
+
+ // Keep compatibility with symfony/config < 4.2
+ if (method_exists($treeBuilder, 'getRootNode')) {
+ $rootNode = $treeBuilder->getRootNode();
+ } else {
+ $rootNode = $treeBuilder->root('knp_menu');
+ }
$rootNode
->children()
|
Don't use the deprecated interface with Symfony <I>
|
diff --git a/opal/browser/css/definition.rb b/opal/browser/css/definition.rb
index <HASH>..<HASH> 100644
--- a/opal/browser/css/definition.rb
+++ b/opal/browser/css/definition.rb
@@ -47,8 +47,12 @@ class Definition
end
end
- def border(options)
- if Hash === options
+ def border(*args)
+ if Hash === args.first
+ if args.length == 1
+ options = args.first
+ end
+
options.each {|name, value|
case name
when :radius
@@ -76,11 +80,11 @@ class Definition
end
else
- style "border-#{name}", Array(value).join(' ')
+ style "border-#{name}", value
end
}
else
- style :border, Array(options).join(' ')
+ style :border, args
end
end
@@ -132,10 +136,10 @@ class Definition
if Hash === argument
argument.each {|sub, value|
- style "#{name}-#{sub}", Array(value).join(' ')
+ style "#{name}-#{sub}", value
}
else
- style name, Array(argument).join(' ')
+ style name, argument
end
else
style name, args.join(' ')
@@ -148,6 +152,10 @@ class Definition
private
def style(name, value = nil, important = @important)
+ if Array === value
+ value = value.join ' '
+ end
+
if Style === name
@style << name
else
|
css/definition: fix up array setting
|
diff --git a/includes/class-freemius.php b/includes/class-freemius.php
index <HASH>..<HASH> 100755
--- a/includes/class-freemius.php
+++ b/includes/class-freemius.php
@@ -7322,7 +7322,7 @@
* @return FS_Plugin_License
*/
private function get_active_child_addon_license() {
- $result = $this->get_parent_instance()->get_current_or_network_user_api_scope()->get( "/plugins/{$this->get_id()}/licenses.json?latest_active_child=true", true );
+ $result = $this->get_parent_instance()->get_current_or_network_user_api_scope()->get( "/plugins/{$this->get_id()}/parent_licenses.json", true );
if (
! $this->is_api_result_object( $result, 'licenses' ) ||
|
[bundle] [add-on] [license] [api] [refactor]
|
diff --git a/test/use.js b/test/use.js
index <HASH>..<HASH> 100644
--- a/test/use.js
+++ b/test/use.js
@@ -25,9 +25,10 @@ describe('dualproto', function () {
};
});
var domain = api();
- domain.mount(['hey'], function (ctxt) {
+ domain.mount(['hey'], function (body, ctxt) {
ctxt.cutout();
});
+ domain.send(['hey']);
});
});
|
Ensure adapted Message is used.
|
diff --git a/discord/ext/tasks/__init__.py b/discord/ext/tasks/__init__.py
index <HASH>..<HASH> 100644
--- a/discord/ext/tasks/__init__.py
+++ b/discord/ext/tasks/__init__.py
@@ -584,12 +584,13 @@ class Loop(Generic[LF]):
time_now = (
now if now is not MISSING else datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0)
).timetz()
+ idx = -1
for idx, time in enumerate(self._time):
if time >= time_now:
self._time_index = idx
break
else:
- self._time_index = 0
+ self._time_index = idx + 1
def _get_time_parameter(
self,
|
[tasks] Fix initial loop execution running prematurely
|
diff --git a/Helper/Db.php b/Helper/Db.php
index <HASH>..<HASH> 100644
--- a/Helper/Db.php
+++ b/Helper/Db.php
@@ -46,4 +46,9 @@ class Db
return " LIMIT $offset, $limit ";
}
+
+ public static function getLastInsertId()
+ {
+ return self::getInstance()->lastInsertId();
+ }
}
diff --git a/Helper/Traits/Db.php b/Helper/Traits/Db.php
index <HASH>..<HASH> 100644
--- a/Helper/Traits/Db.php
+++ b/Helper/Traits/Db.php
@@ -6,18 +6,23 @@ use \Helper\Db as DbHelper;
trait Db
{
- private function dbInstance()
+ private static function dbInstance()
{
return DbHelper::getInstance();
}
- private function execQuery($query, array $parameters = [])
+ private static function execQuery($query, array $parameters = [])
{
return DbHelper::execQuery($query, $parameters);
}
- private function getSqlLimitByLimits($limit, $offset)
+ private static function getSqlLimitByLimits($limit, $offset)
{
return DbHelper::getLimitQuery($limit, $offset);
}
+
+ private static function getLastInsertId()
+ {
+ return DbHelper::getLastInsertId();
+ }
}
\ No newline at end of file
|
Add short way for LastInsertId and make Db helper's method static.
|
diff --git a/Vps/Validate/Hostname.php b/Vps/Validate/Hostname.php
index <HASH>..<HASH> 100644
--- a/Vps/Validate/Hostname.php
+++ b/Vps/Validate/Hostname.php
@@ -1,7 +1,7 @@
<?php
class Vps_Validate_Hostname extends Zend_Validate_Hostname
{
- public function __construct($allow = self::ALLOW_DNS, $validateIdn = true, $validateTld = true, Zend_Validate_Ip $ipValidator = null)
+ public function __construct($allow = self::ALLOW_DNS, $validateIdn = true, $validateTld = false, Zend_Validate_Ip $ipValidator = null)
{
$this->_messageTemplates[self::IP_ADDRESS_NOT_ALLOWED] = trlVps("'%value%' appears to be an IP address, but IP addresses are not allowed");
$this->_messageTemplates[self::UNKNOWN_TLD] = trlVps("'%value%' appears to be a DNS hostname but cannot match TLD against known list");
|
Switch off validating TLD in e-mail adress validation
Due to increasing list of allowed tlds
|
diff --git a/src/bookboon.php b/src/bookboon.php
index <HASH>..<HASH> 100644
--- a/src/bookboon.php
+++ b/src/bookboon.php
@@ -28,7 +28,7 @@ class Bookboon {
private $authenticated = array();
private $headers = array();
private $url = "bookboon.com/api";
- private $cache_class_name= "Bookboon_Memcached";
+ private $cache_class_name= "";
private $cache = null;
public static $CURL_OPTS = array(
|
Disable caching by default for shared solutions
|
diff --git a/lib/Cake/Network/Email/SmtpTransport.php b/lib/Cake/Network/Email/SmtpTransport.php
index <HASH>..<HASH> 100644
--- a/lib/Cake/Network/Email/SmtpTransport.php
+++ b/lib/Cake/Network/Email/SmtpTransport.php
@@ -161,7 +161,6 @@ class SmtpTransport extends AbstractTransport {
$headers = $this->_cakeEmail->getHeaders(array_fill_keys(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc', 'subject'), true));
$headers = $this->_headersToString($headers);
$message = implode("\r\n", $this->_cakeEmail->message());
- pr($headers . "\r\n\r\n" . $message . "\r\n\r\n\r\n.");
$this->_smtpSend($headers . "\r\n\r\n" . $message . "\r\n\r\n\r\n.");
}
|
Ooops, removed debug call.
|
diff --git a/skorch/tests/test_net.py b/skorch/tests/test_net.py
index <HASH>..<HASH> 100644
--- a/skorch/tests/test_net.py
+++ b/skorch/tests/test_net.py
@@ -1092,6 +1092,14 @@ class TestNeuralNet:
assert y_proba.min() >= 0
assert y_proba.max() <= 1
+ def test_set_params_with_unknown_key_raises(self, net):
+ with pytest.raises(ValueError) as exc:
+ net.set_params(foo=123)
+
+ # TODO: check error message more precisely, depending on what
+ # the intended message shouldb e from sklearn side
+ assert exc.value.args[0].startswith('Invalid parameter foo for')
+
class MyRegressor(nn.Module):
"""Simple regression module.
|
Fix failing test after sklearn update.
sklearn <I> changed error message when calling set_params with
wrong key.
|
diff --git a/README.md b/README.md
index <HASH>..<HASH> 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Example
This is a simple POP3 login and listing.
- var sys = require('sys')
+ var util = require('util')
, StreamHandler = require('stream-handler')
;
diff --git a/example.js b/example.js
index <HASH>..<HASH> 100644
--- a/example.js
+++ b/example.js
@@ -1,4 +1,4 @@
- var sys = require('sys')
+ var util = require('util')
, StreamHandler = require('stream-handler')
;
diff --git a/node_stream_handler.js b/node_stream_handler.js
index <HASH>..<HASH> 100644
--- a/node_stream_handler.js
+++ b/node_stream_handler.js
@@ -1,5 +1,5 @@
var events = require('events')
- , sys = require('sys')
+ , util = require('util')
, net = require('net')
;
@@ -49,7 +49,7 @@ function StreamHandler(host, port, delimiter) {
}
});
}
-sys.inherits(StreamHandler, events.EventEmitter);
+util.inherits(StreamHandler, events.EventEmitter);
StreamHandler.prototype.write = function(data) {
this.conn.write(data);
|
[fix] Changed require('sys') to require('util') for compatibility with node <I>
|
diff --git a/ClassCollectionLoader.php b/ClassCollectionLoader.php
index <HASH>..<HASH> 100644
--- a/ClassCollectionLoader.php
+++ b/ClassCollectionLoader.php
@@ -56,7 +56,7 @@ class ClassCollectionLoader
// auto-reload
$reload = false;
if ($autoReload) {
- $metadata = $cacheDir.'/'.$name.'.meta';
+ $metadata = $cacheDir.'/'.$name.$extension.'.meta';
if (!file_exists($metadata) || !file_exists($cache)) {
$reload = true;
} else {
|
[ClassLoader] made a small change to be consistent with the previous change
|
diff --git a/app/components/marty/auth_app.rb b/app/components/marty/auth_app.rb
index <HASH>..<HASH> 100644
--- a/app/components/marty/auth_app.rb
+++ b/app/components/marty/auth_app.rb
@@ -14,6 +14,7 @@ class Marty::AuthApp < Marty::SimpleApp
if !user.nil?
menu << "->" << {
text: user.name,
+ tooltip: 'Current user',
menu: user_menu,
name: "sign_out",
}
|
minor: added one tooltip to signout menu
|
diff --git a/corelib/hash.rb b/corelib/hash.rb
index <HASH>..<HASH> 100644
--- a/corelib/hash.rb
+++ b/corelib/hash.rb
@@ -181,8 +181,11 @@ class Hash
def clone
%x{
- var result = $hash(),
- map = #{self}.map,
+ var result = new self._klass._alloc();
+
+ result.map = {}; result.keys = [];
+
+ var map = #{self}.map,
map2 = result.map,
keys2 = result.keys;
|
Hash#clone should return subclasses
|
diff --git a/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php b/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
index <HASH>..<HASH> 100755
--- a/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
+++ b/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php
@@ -149,7 +149,7 @@ class SqlServerGrammar extends Grammar
*/
public function compileDropIfExists(Blueprint $blueprint, Fluent $command)
{
- return 'if exists (select * from INFORMATION_SCHEMA.TABLES where TABLE_NAME = \''.$blueprint->getTable().'\') drop table '.$blueprint->getTable();
+ return 'if exists (select * from INFORMATION_SCHEMA.TABLES where TABLE_NAME = \''.$blueprint->getTable().'\') drop table ['.$blueprint->getTable().']';
}
/**
|
Fix sqlserver grammar (#<I>)
Added square brackets to the table name. This fixes issues where the table name is equal to a keyword, like user.
|
diff --git a/paramiko/client.py b/paramiko/client.py
index <HASH>..<HASH> 100644
--- a/paramiko/client.py
+++ b/paramiko/client.py
@@ -349,7 +349,7 @@ class SSHClient (object):
self._agent.close()
self._agent = None
- def exec_command(self, command, bufsize=-1, timeout=None):
+ def exec_command(self, command, bufsize=-1, timeout=None, get_pty=False):
"""
Execute a command on the SSH server. A new L{Channel} is opened and
the requested command is executed. The command's input and output
@@ -368,6 +368,8 @@ class SSHClient (object):
@raise SSHException: if the server fails to execute the command
"""
chan = self._transport.open_session()
+ if(get_pty):
+ chan.get_pty()
chan.settimeout(timeout)
chan.exec_command(command)
stdin = chan.makefile('wb', bufsize)
|
Add support for get_pty to SSHClient.exec_command()
|
diff --git a/smartfile/__init__.py b/smartfile/__init__.py
index <HASH>..<HASH> 100644
--- a/smartfile/__init__.py
+++ b/smartfile/__init__.py
@@ -35,6 +35,10 @@ class _BaseAPI(object):
# Generate list of path components from URI template and provided
# arguments. 'None' in the template is replaced with a path if there
# is one provided by the caller.
+ #
+ # NOTE: uri_iter raises StopIteration if it runs out of elements.
+ # This is caught by the generator which stops before all the elements
+ # in self._api_url are used.
uri_iter = iter(uri_args)
paths = (next(uri_iter) if x is None else x for x in self._api_uri)
|
Add note on how part of the URL generation works
|
diff --git a/irc/modes.py b/irc/modes.py
index <HASH>..<HASH> 100644
--- a/irc/modes.py
+++ b/irc/modes.py
@@ -54,7 +54,7 @@ def _parse_modes(mode_string, unary_modes=""):
... len = random.randint(min_len, max_len)
... chars_to_choose = [_py2_compat.chr(x) for x in range(0,1024)]
... chars = (random.choice(chars_to_choose) for x in range(len))
- ... return u''.join(chars)
+ ... return ''.join(chars)
>>> def random_texts(min_len = 3, max_len = 80):
... while True:
... yield random_text(min_len, max_len)
|
Removed another unicode literal, restoring Python <I> compatibility in tests
|
diff --git a/public/js/editors/editors.js b/public/js/editors/editors.js
index <HASH>..<HASH> 100644
--- a/public/js/editors/editors.js
+++ b/public/js/editors/editors.js
@@ -180,7 +180,7 @@ panels.restore = function () {
}
else {
// load from personal settings
- toopen = jsbin.settings.panels;
+ toopen = jsbin.mobile ? [jsbin.settings.panels[0]] : jsbin.settings.panels;
}
}
|
fix: open first valid panel on mobile
Originally it was tryingt open all panels which always included the output, and since in mobile we only show one panel at a time, output was last and would close all other panels.
|
diff --git a/lib/you_shall_not_pass/version.rb b/lib/you_shall_not_pass/version.rb
index <HASH>..<HASH> 100644
--- a/lib/you_shall_not_pass/version.rb
+++ b/lib/you_shall_not_pass/version.rb
@@ -1,3 +1,3 @@
module YouShallNotPass
- VERSION = "0.2.0"
+ VERSION = "0.2.1"
end
|
Releasing version <I>
|
diff --git a/smtLayer/vmUtils.py b/smtLayer/vmUtils.py
index <HASH>..<HASH> 100644
--- a/smtLayer/vmUtils.py
+++ b/smtLayer/vmUtils.py
@@ -520,8 +520,26 @@ def installFS(rh, vaddr, mode, fileSystem, diskType):
strCmd = ' '.join(cmd)
rh.printSysLog("Invoking: " + strCmd)
try:
- out = subprocess.check_output(cmd,
- stderr=subprocess.STDOUT, close_fds=True)
+ # Sometimes the device is not ready: sleep and retry
+ try_num = 0
+ for sleep_secs in [0.1, 0.2, 0.3, 0.5, 1, 2, -1]:
+ try_num += 1
+ try:
+ out = subprocess.check_output(cmd,
+ stderr=subprocess.STDOUT, close_fds=True)
+ rh.printSysLog("Run `%s` successfully." % strCmd)
+ break
+ except CalledProcessError as e:
+ if sleep_secs > 0:
+ rh.printSysLog("Num %d try `%s` failed ("
+ "retry after %s seconds): "
+ "rc=%d msg=%s" % (
+ try_num, strCmd, sleep_secs,
+ e.returncode, e.output))
+ time.sleep(sleep_secs)
+ else:
+ raise
+
if isinstance(out, bytes):
out = bytes.decode(out)
rh.printLn("N", "File system: " + fileSystem +
|
Add retry for `mkfs` when install fs on vm's dasd
This is related to:
<URL>
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ setup(
],
zip_safe=True,
classifiers=[
- 'Development Status :: 4 - Alpha',
+ 'Development Status :: 3 - Alpha',
'Intended Audience :: Developers',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
|
Boilerplate for initial release.
|
diff --git a/src/Data/ImmutableRecordLogic.php b/src/Data/ImmutableRecordLogic.php
index <HASH>..<HASH> 100644
--- a/src/Data/ImmutableRecordLogic.php
+++ b/src/Data/ImmutableRecordLogic.php
@@ -96,14 +96,14 @@ trait ImmutableRecordLogic
case 'float':
case 'bool':
case 'array':
- $nativeData[$key] = $this->{$key};
+ $nativeData[$key] = $this->{$key}();
break;
default:
- if($isNullable && $this->{$key} === null) {
+ if($isNullable && $this->{$key}() === null) {
$nativeData[$key] = null;
continue;
}
- $nativeData[$key] = $this->voTypeToNative($this->{$key}, $key, $type);
+ $nativeData[$key] = $this->voTypeToNative($this->{$key}(), $key, $type);
}
}
|
Use getters in ImmutableRecordLogic::toArray
|
diff --git a/eth_account/datastructures.py b/eth_account/datastructures.py
index <HASH>..<HASH> 100644
--- a/eth_account/datastructures.py
+++ b/eth_account/datastructures.py
@@ -15,3 +15,14 @@ class AttributeDict(AttrDict):
'This data is immutable -- create a copy instead of modifying. '
'For example, AttributeDict(old, replace_key=replace_val).'
)
+
+ def _repr_pretty_(self, builder, cycle):
+ """
+ Custom pretty output for the IPython console
+ """
+ builder.text(self.__class__.__name__ + "(")
+ if cycle:
+ builder.text("<cycle>")
+ else:
+ builder.pretty(self.__dict__)
+ builder.text(")")
|
prettier repr in IPython
|
diff --git a/lib/transpec/cli.rb b/lib/transpec/cli.rb
index <HASH>..<HASH> 100644
--- a/lib/transpec/cli.rb
+++ b/lib/transpec/cli.rb
@@ -26,8 +26,13 @@ module Transpec
end
def run(args)
- paths = OptionParser.new(@configuration).parse(args)
- fail_if_should_not_continue!
+ begin
+ paths = OptionParser.new(@configuration).parse(args)
+ fail_if_should_not_continue!
+ rescue => error
+ warn error.message
+ return false
+ end
process(paths)
@@ -35,9 +40,6 @@ module Transpec
generate_commit_message if @configuration.generate_commit_message?
true
- rescue => error
- warn error.message
- false
end
def process(paths)
diff --git a/spec/transpec/cli_spec.rb b/spec/transpec/cli_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/transpec/cli_spec.rb
+++ b/spec/transpec/cli_spec.rb
@@ -127,13 +127,8 @@ module Transpec
context 'when any other error is raised while running' do
let(:args) { ['non-existent-file'] }
- it 'return false' do
- should be_false
- end
-
- it 'prints message of the exception' do
- cli.should_receive(:warn).with(/No such file or directory/)
- cli.run(args)
+ it 'does not catch the error' do
+ -> { cli.run(args) }.should raise_error
end
end
|
Avoid catching general errors in CLI
|
diff --git a/spacy/about.py b/spacy/about.py
index <HASH>..<HASH> 100644
--- a/spacy/about.py
+++ b/spacy/about.py
@@ -4,7 +4,7 @@
# fmt: off
__title__ = "spacy"
-__version__ = "2.2.0.dev6"
+__version__ = "2.2.0.dev7"
__summary__ = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"
__uri__ = "https://spacy.io"
__author__ = "Explosion AI"
|
Set version to <I>.dev7
|
diff --git a/commands/filter.py b/commands/filter.py
index <HASH>..<HASH> 100644
--- a/commands/filter.py
+++ b/commands/filter.py
@@ -46,6 +46,9 @@ def cmd(send, msg, args):
send("Nope, not gonna do it!")
elif msg.startswith('chain'):
if args['is_admin'](args['nick']):
+ if args['handler'].outputfilter[0].__name__ == '<lambda>':
+ send("Must have a filter set in order to chain.")
+ return
next_filter = msg.split()[1]
if next_filter in textutils.output_filters.keys():
args['handler'].outputfilter.append(textutils.output_filters[next_filter])
|
Disallow !filter chain without a filter set.
Fixes #<I>.
|
diff --git a/core/src/main/java/hudson/model/UpdateCenter.java b/core/src/main/java/hudson/model/UpdateCenter.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/hudson/model/UpdateCenter.java
+++ b/core/src/main/java/hudson/model/UpdateCenter.java
@@ -39,6 +39,7 @@ import hudson.lifecycle.RestartNotSupportedException;
import hudson.model.UpdateSite.Data;
import hudson.model.UpdateSite.Plugin;
import hudson.model.listeners.SaveableListener;
+import hudson.remoting.AtmostOneThreadExecutor;
import hudson.security.ACL;
import hudson.util.DaemonThreadFactory;
import hudson.util.FormValidation;
@@ -129,7 +130,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
* {@link ExecutorService} that performs installation.
* @since 1.501
*/
- private final ExecutorService installerService = Executors.newSingleThreadExecutor(
+ private final ExecutorService installerService = new AtmostOneThreadExecutor(
new DaemonThreadFactory(new ThreadFactory() {
public Thread newThread(Runnable r) {
Thread t = new Thread(r);
|
Reduce the # of idle threads.
|
diff --git a/lib/commit-message.js b/lib/commit-message.js
index <HASH>..<HASH> 100644
--- a/lib/commit-message.js
+++ b/lib/commit-message.js
@@ -27,7 +27,7 @@ var config = {
function CommitMessage(message) {
this._errors = [];
- var cfg = config;
+ var cfg = this.config;
var log = this._log.bind(this);
if (!cfg.pattern[0].test(message)) {
|
Use config correctly, from the prototype
|
diff --git a/sinon-spy-react.js b/sinon-spy-react.js
index <HASH>..<HASH> 100644
--- a/sinon-spy-react.js
+++ b/sinon-spy-react.js
@@ -17,7 +17,7 @@ function spyOnReactClass(reactClass, methodName) {
function reactClassPrototype(reactClass) {
var ctor = reactClass.prototype && reactClass.prototype.constructor;
- if (typeof ctor === 'undefinied')
+ if (typeof ctor === 'undefined')
throw new Error('A component constructor could not be found for this class. Are you sure you passed in a React component?');
return ctor.prototype;
|
Corrected check for constructor existence
|
diff --git a/mythril/analysis/modules/ether_thief.py b/mythril/analysis/modules/ether_thief.py
index <HASH>..<HASH> 100644
--- a/mythril/analysis/modules/ether_thief.py
+++ b/mythril/analysis/modules/ether_thief.py
@@ -67,7 +67,6 @@ class EtherThief(DetectionModule):
:return:
"""
instruction = state.get_current_instruction()
- node = state.node
if instruction["opcode"] != "CALL":
return []
@@ -80,7 +79,7 @@ class EtherThief(DetectionModule):
eth_sent_total = symbol_factory.BitVecVal(0, 256)
- constraints = copy(node.constraints)
+ constraints = copy(state.mstate.constraints)
for tx in state.world_state.transaction_sequence:
if tx.caller == 0xDEADBEEFDEADBEEFDEADBEEFDEADBEEFDEADBEEF:
@@ -101,8 +100,8 @@ class EtherThief(DetectionModule):
debug = json.dumps(transaction_sequence, indent=4)
issue = Issue(
- contract=node.contract_name,
- function_name=node.function_name,
+ contract=state.environment.active_account.contract_name,
+ function_name=state.environment.active_function_name,
address=instruction["address"],
swc_id=UNPROTECTED_ETHER_WITHDRAWAL,
title="Unprotected Ether Withdrawal",
|
remove dependence on cfg & nodes from ether thief
|
diff --git a/Eloquent/Model.php b/Eloquent/Model.php
index <HASH>..<HASH> 100755
--- a/Eloquent/Model.php
+++ b/Eloquent/Model.php
@@ -1405,7 +1405,7 @@ abstract class Model implements ArrayAccess, ArrayableInterface, JsonableInterfa
{
if (isset($this->table)) return $this->table;
- return str_replace('\\', '', snake_case(str_plural(get_class($this))));
+ return str_replace('\\', '', snake_case(str_plural(class_basename($this))));
}
/**
|
Namespaces are now excluded from guessed model names.
|
diff --git a/src/wa_kat/connectors/aleph.py b/src/wa_kat/connectors/aleph.py
index <HASH>..<HASH> 100755
--- a/src/wa_kat/connectors/aleph.py
+++ b/src/wa_kat/connectors/aleph.py
@@ -91,6 +91,18 @@ def by_issn(issn):
if val
}
+ # check whether there is alternative date in 008
+ alt_creation_date = None
+ if additional_info["008"]:
+ # 131114c20139999xr-q||p|s||||||---a0eng-c -> 2013
+ alt_creation_date = additional_info["008"][7:11]
+
+ # 131114c20139999xr-q||p|s||||||---a0eng-c -> 9999
+ end_date = additional_info["008"][11:15]
+ if end_date == "9999":
+ alt_creation_date += "-" # library convention is xxxx-
+
+ # parse author
author = Author.parse_author(marc)
model = Model(
@@ -124,9 +136,8 @@ def by_issn(issn):
),
", "
),
- # publisher_tags=,
creation_dates=_first_or_none(
- marc.get("260c")
+ marc.get("260c", [alt_creation_date])
),
lang_tags=_first_or_none(
marc.get("040b")
|
#<I>: Added better parsing of creation date.
|
diff --git a/core/AssetManager.php b/core/AssetManager.php
index <HASH>..<HASH> 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -395,7 +395,7 @@ class Piwik_AssetManager
// Tries to remove compressed version of the merged file.
// See Piwik::serveStaticFile() for more info on static file compression
- $compressedFileLocation = Piwik::COMPRESSED_FILE_LOCATION . $filename;
+ $compressedFileLocation = PIWIK_USER_PATH . Piwik::COMPRESSED_FILE_LOCATION . $filename;
@unlink ( $compressedFileLocation . ".deflate");
@unlink ( $compressedFileLocation . ".gz");
@@ -430,7 +430,7 @@ class Piwik_AssetManager
*/
private static function getMergedFileDirectory ()
{
- $mergedFileDirectory = self::getAbsoluteLocation(self::MERGED_FILE_DIR);
+ $mergedFileDirectory = PIWIK_USER_PATH . '/' . self::MERGED_FILE_DIR;
if (!is_dir($mergedFileDirectory))
{
|
fixes #<I> - wasn't removing compressed assets on update; merged assets in tmp are relative to PIWIK_USER_PATH
git-svn-id: <URL>
|
diff --git a/src/app/actions/mslookup/searchspace.py b/src/app/actions/mslookup/searchspace.py
index <HASH>..<HASH> 100644
--- a/src/app/actions/mslookup/searchspace.py
+++ b/src/app/actions/mslookup/searchspace.py
@@ -4,7 +4,7 @@ PROTEIN_STORE_CHUNK_SIZE = 100000
def create_searchspace_wholeproteins(lookup, fastafn, minpeplen):
fasta = SeqIO.parse(fastafn, 'fasta')
- prots = {prot.seq: prot.id for prot in fasta}
+ prots = {prot.seq.replace('L', 'I'): prot.id for prot in fasta}
storeseqs = []
peptotal = 0
for protseq, prot_id in prots.items():
|
Do not forget to switch L to I when building DB
|
diff --git a/examples/pages/basic/index.js b/examples/pages/basic/index.js
index <HASH>..<HASH> 100644
--- a/examples/pages/basic/index.js
+++ b/examples/pages/basic/index.js
@@ -49,7 +49,7 @@ class Examples extends Component {
const Item = glamorous(Autocomplete.Item, {
rootEl: 'div',
- forwardProps: ['index', 'item', 'key'],
+ forwardProps: ['index', 'value', 'key'],
})(
{
cursor: 'pointer',
diff --git a/examples/pages/semantic-ui/index.js b/examples/pages/semantic-ui/index.js
index <HASH>..<HASH> 100644
--- a/examples/pages/semantic-ui/index.js
+++ b/examples/pages/semantic-ui/index.js
@@ -28,7 +28,7 @@ function Examples() {
const Item = glamorous(Autocomplete.Item, {
rootEl: 'div',
- forwardProps: ['index', 'item'],
+ forwardProps: ['index', 'value'],
})(
{
position: 'relative',
|
docs(examples): update forwarded prop item -> value (#<I>)
|
diff --git a/src/tools/uavviewerjs/public/js/api_workers/pose3d_worker.js b/src/tools/uavviewerjs/public/js/api_workers/pose3d_worker.js
index <HASH>..<HASH> 100644
--- a/src/tools/uavviewerjs/public/js/api_workers/pose3d_worker.js
+++ b/src/tools/uavviewerjs/public/js/api_workers/pose3d_worker.js
@@ -4,6 +4,10 @@ var global=self;
// importing required files
importScripts('../Ice.min.js');
+importScripts('../jderobot/datetime.js');
+importScripts('../jderobot/exceptions.js');
+importScripts('../jderobot/containers.js');
+importScripts('../jderobot/common.js');
importScripts('../jderobot/pose3d.js');
|
[issue #<I>] solved bug in pose3d of uavviwerjs
|
diff --git a/ofp/v0x01/controller2switch/port_stats_request.py b/ofp/v0x01/controller2switch/port_stats_request.py
index <HASH>..<HASH> 100644
--- a/ofp/v0x01/controller2switch/port_stats_request.py
+++ b/ofp/v0x01/controller2switch/port_stats_request.py
@@ -0,0 +1,29 @@
+"""Information about physical ports is requested with OFPST_PORT"""
+
+# System imports
+
+# Third-party imports
+
+# Local source tree imports
+from foundation import base
+from foundation import basic_types
+
+
+class PortStatsRequest(base.GenericStruct):
+ """
+ Body for ofp_stats_request of type OFPST_PORT
+
+ :param port_no -- OFPST_PORT message must request statistics either
+ for a single port (specified in port_no) or for
+ all ports (if port_no == OFPP_NONE).
+ :param pad --
+
+ """
+ port_no = basic_types.UBInt16()
+ pad = basic_types.UBInt8Array(length=6)
+
+ def __init__(self, port_no=None, pad=None):
+
+ self.port_no = port_no
+ self.pad = pad
+
|
Implements the Port Stats Requests message class - Issue #<I>
|
diff --git a/src/Support/helpers.php b/src/Support/helpers.php
index <HASH>..<HASH> 100644
--- a/src/Support/helpers.php
+++ b/src/Support/helpers.php
@@ -18,18 +18,6 @@ if (! function_exists('extract_title')) {
}
}
-if (! function_exists('domain')) {
- /**
- * Return domain host.
- *
- * @return string
- */
- function domain()
- {
- return parse_url(config('app.url'))['host'];
- }
-}
-
if (! function_exists('route_prefix')) {
/**
* Return route prefix.
|
Remove no longer used domain() global helper
- This is now the responsibility of rinvex/laravel-tenants
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.