hash
stringlengths
40
40
diff
stringlengths
131
26.7k
message
stringlengths
7
694
project
stringlengths
5
67
split
stringclasses
1 value
diff_languages
stringlengths
2
24
4fb7d63d46f68fbf0c593bffbb716b248bc89ccb
diff --git a/applications/notebook-on-next/store.js b/applications/notebook-on-next/store.js index <HASH>..<HASH> 100644 --- a/applications/notebook-on-next/store.js +++ b/applications/notebook-on-next/store.js @@ -13,7 +13,9 @@ const rootReducer = combineReducers({ app: reducers.app, document: reducers.document, comms: reducers.comms, - config: reducers.config + config: reducers.config, + core: reducers.core, + modals: reducers.modals }); const defaultState = { @@ -23,9 +25,8 @@ const defaultState = { config: ImmutableMap({ theme: "light" }), - // TODO FIXME FIXME FIXME - core: ImmutableMap(), - modals: ImmutableMap() + core: state.makeStateRecord(), + modals: state.makeModalsRecord() }; const composeEnhancers = @@ -38,7 +39,6 @@ export default function configureStore() { const middlewares = [createEpicMiddleware(rootEpic)]; return createStore( - // $FlowFixMe rootReducer, defaultState, composeEnhancers(applyMiddleware(...middlewares))
clean up store creation in notebook-on-next
nteract_nteract
train
js
51ae1c22fe0755031c0f7dd34379c613b21c217c
diff --git a/sinatra-contrib/spec/content_for_spec.rb b/sinatra-contrib/spec/content_for_spec.rb index <HASH>..<HASH> 100644 --- a/sinatra-contrib/spec/content_for_spec.rb +++ b/sinatra-contrib/spec/content_for_spec.rb @@ -158,9 +158,9 @@ describe Sinatra::ContentFor do helpers Sinatra::ContentFor set inner, :layout_engine => outer set :views, File.expand_path("../content_for", __FILE__) - get('/:view') { send(inner, params[:view].to_sym) } + get('/:view') { render(inner, params[:view].to_sym) } get('/:layout/:view') do - send inner, params[:view].to_sym, :layout => params[:layout].to_sym + render inner, params[:view].to_sym, :layout => params[:layout].to_sym end end end
use render in specs to avoid deprecation warnings on sinatra <I>
sinatra_sinatra
train
rb
b3190905a806710a03bdb201182a6b2556516f1c
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index <HASH>..<HASH> 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -402,8 +402,8 @@ define({ "CMD_CSS_QUICK_EDIT_NEW_RULE" : "New Rule", "CMD_NEXT_DOC" : "Next Document", "CMD_PREV_DOC" : "Previous Document", - "CMD_NEXT_DOC_LIST_ORDER" : "Next Document (List Order)", - "CMD_PREV_DOC_LIST_ORDER" : "Previous Document (List Order)", + "CMD_NEXT_DOC_LIST_ORDER" : "Next Document in List", + "CMD_PREV_DOC_LIST_ORDER" : "Previous Document in List", "CMD_SHOW_IN_TREE" : "Show in File Tree", "CMD_SHOW_IN_EXPLORER" : "Show in Explorer", "CMD_SHOW_IN_FINDER" : "Show in Finder",
String change for "Next/Previous document" in list order
adobe_brackets
train
js
d9cbef215d5019b3cace29ec7e4d6ca392204a11
diff --git a/memberlist_test.go b/memberlist_test.go index <HASH>..<HASH> 100644 --- a/memberlist_test.go +++ b/memberlist_test.go @@ -237,6 +237,7 @@ func TestCreate_keyringAndSecretKey(t *testing.T) { func TestCreate_invalidLoggerSettings(t *testing.T) { c := DefaultLANConfig() + c.BindAddr = getBindAddr().String() c.Logger = log.New(ioutil.Discard, "", log.LstdFlags) c.LogOutput = ioutil.Discard @@ -1115,6 +1116,11 @@ func TestMemberlist_Join_Prototocol_Compatibility(t *testing.T) { } func TestMemberlist_Join_IPv6(t *testing.T) { + // Since this binds to all interfaces we need to exclude other tests + // from grabbing an interface. + bindLock.Lock() + defer bindLock.Unlock() + c1 := DefaultLANConfig() c1.Name = "A" c1.BindAddr = "[::1]"
Makes some unit tests safer when dealing with interface provisioning.
hashicorp_memberlist
train
go
60c1d5ebb1478b3ae2b2177980bd912ccc5db53f
diff --git a/plop/collector.py b/plop/collector.py index <HASH>..<HASH> 100644 --- a/plop/collector.py +++ b/plop/collector.py @@ -22,6 +22,7 @@ class Collector(object): assert mode in Collector.MODES timer, sig = Collector.MODES[self.mode] signal.signal(sig, self.handler) + signal.siginterrupt(sig, False) self.reset() def reset(self):
collector: don't interrupt syscalls
bdarnell_plop
train
py
fe552fbf1d746f55080009b5a7eee8e162c29910
diff --git a/src/internal/animations.js b/src/internal/animations.js index <HASH>..<HASH> 100644 --- a/src/internal/animations.js +++ b/src/internal/animations.js @@ -22,15 +22,14 @@ export function create_animation(node, from, fn, params) { let started = false; let name; - const css_text = node.style.cssText; - function start() { if (css) { - if (delay) node.style.cssText = css_text; // TODO create delayed animation instead? - name = create_rule(node, 0, 1, duration, 0, easing, css); + name = create_rule(node, 0, 1, duration, delay, easing, css); } - started = true; + if (!delay) { + started = true; + } } function stop() { @@ -40,7 +39,7 @@ export function create_animation(node, from, fn, params) { loop(now => { if (!started && now >= start_time) { - start(); + started = true; } if (started && now >= end) { @@ -61,11 +60,7 @@ export function create_animation(node, from, fn, params) { return true; }); - if (delay) { - if (css) node.style.cssText += css(0, 1); - } else { - start(); - } + start(); tick(0, 1);
Update animations.js Fix issue #<I>
sveltejs_svelte
train
js
b2bb016f743e918ab1c9e81ab52da0b6c53f8784
diff --git a/LiSE/LiSE/character.py b/LiSE/LiSE/character.py index <HASH>..<HASH> 100644 --- a/LiSE/LiSE/character.py +++ b/LiSE/LiSE/character.py @@ -51,7 +51,7 @@ from .place import Place from .portal import Portal from .util import getatt from .query import StatusAlias -from .exc import AmbiguousAvatarError +from .exc import AmbiguousAvatarError, WorldIntegrityError class AbstractCharacter(object): @@ -1846,6 +1846,10 @@ class Character(AbstractCharacter, DiGraph, RuleFollower): any). """ + if name in self.thing: + raise WorldIntegrityError( + "Already have a Thing named {}".format(name) + ) super().add_node(name, **kwargs) if isinstance(location, Node): location = location.name diff --git a/LiSE/LiSE/exc.py b/LiSE/LiSE/exc.py index <HASH>..<HASH> 100644 --- a/LiSE/LiSE/exc.py +++ b/LiSE/LiSE/exc.py @@ -46,6 +46,13 @@ class UserFunctionError(SyntaxError): pass +class WorldIntegrityError(ValueError): + """Error condition for when something breaks the world model, even if + it might be allowed by the database schema. + + """ + + class CacheError(ValueError): """Error condition for something going wrong with a cache""" pass
Add a new exception class for when the world state is bad This handles the type of data integrity fail that I can't reasonably detect in SQLite.
LogicalDash_LiSE
train
py,py
bacda51a9034ab2ac758cc8c8e0a38c0a5a67361
diff --git a/doc/source/conf.py b/doc/source/conf.py index <HASH>..<HASH> 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -118,7 +118,7 @@ copyright = u'2013, Peter Hudec' # The short X.Y version. version = '0.0.0' # The full version, including alpha/beta/rc tags. -release = '0.0.0' +release = '0.0.5' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup,find_packages setup( name='Authomatic', - version='0.0.4', + version='0.0.5', packages=find_packages(), package_data={'': ['*.txt', '*.rst']}, author='Peter Hudec',
Updated the release version to <I>.
authomatic_authomatic
train
py,py
79438c07fbdcba4380ac6498afd216065cb97f64
diff --git a/src/main/java/org/fusesource/jansi/AnsiProcessor.java b/src/main/java/org/fusesource/jansi/AnsiProcessor.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/fusesource/jansi/AnsiProcessor.java +++ b/src/main/java/org/fusesource/jansi/AnsiProcessor.java @@ -56,7 +56,7 @@ public class AnsiProcessor { /** * @return true if the escape command was processed. */ - protected boolean processEscapeCommand(ArrayList<Object> options, int command) throws IOException { // expected diff with AnsiOutputStream.java + protected boolean processEscapeCommand(ArrayList<Object> options, int command) throws IOException { try { switch (command) { case 'A': @@ -204,7 +204,7 @@ public class AnsiProcessor { /** * @return true if the operating system command was processed. */ - protected boolean processOperatingSystemCommand(ArrayList<Object> options) { // expected diff with AnsiOutputStream.java + protected boolean processOperatingSystemCommand(ArrayList<Object> options) { int command = optionInt(options, 0); String label = (String) options.get(1); // for command > 2 label could be composed (i.e. contain ';'), but we'll leave
Remove references to AnsiOutputStream.java
fusesource_jansi
train
java
04ac92ab6a89120993023328199f80232547fa1a
diff --git a/hod/src/main/java/com/hp/autonomy/searchcomponents/hod/search/HodDocumentsService.java b/hod/src/main/java/com/hp/autonomy/searchcomponents/hod/search/HodDocumentsService.java index <HASH>..<HASH> 100644 --- a/hod/src/main/java/com/hp/autonomy/searchcomponents/hod/search/HodDocumentsService.java +++ b/hod/src/main/java/com/hp/autonomy/searchcomponents/hod/search/HodDocumentsService.java @@ -92,7 +92,7 @@ public class HodDocumentsService implements DocumentsService<ResourceIdentifier, final List<HodSearchResult> documentList = new LinkedList<>(); addDomainToSearchResults(documentList, suggestRequest.getQueryRestrictions().getDatabases(), results.getDocuments()); - return new Documents<>(documentList, results.getTotalResults(), results.getExpandedQuery(), results.getSuggestion(), results.getAutoCorrection()); + return new Documents<>(documentList, results.getTotalResults(), results.getExpandedQuery(), results.getSuggestion(), results.getAutoCorrection(), results.getWarnings()); } @Cacheable(CacheNames.GET_DOCUMENT_CONTENT)
Fix compilation error in #e<I>c<I> [rev: alex.scown]
microfocus-idol_haven-search-components
train
java
d2ee2ccefe6c83b385d93c264c871ebeb2f9d1aa
diff --git a/lib/Tmdb/Factory/AbstractFactory.php b/lib/Tmdb/Factory/AbstractFactory.php index <HASH>..<HASH> 100644 --- a/lib/Tmdb/Factory/AbstractFactory.php +++ b/lib/Tmdb/Factory/AbstractFactory.php @@ -237,8 +237,8 @@ abstract class AbstractFactory * @return GenericCollection */ protected function createCustomCollection( - array $data = [], - AbstractModel $class = null, + array $data, + AbstractModel $class, GenericCollection $collection ) { if (!$class || !$collection) {
Don't have required properties after optional property
php-tmdb_api
train
php
dfd9f0f31a20174f117c0dc7ffc6e8840d88cb36
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ tests_require = [ 'redis>=2.10.0', ] -invenio_search_version = '1.0.0' +invenio_search_version = '1.2.0' extras_require = { 'docs:python_version=="2.7"': [
installation: bump to invenio-search <I>
inveniosoftware_invenio-indexer
train
py
839a2a672d53af4b7abd96272e115adcb098ea70
diff --git a/lib/Less/Environment.php b/lib/Less/Environment.php index <HASH>..<HASH> 100755 --- a/lib/Less/Environment.php +++ b/lib/Less/Environment.php @@ -187,7 +187,7 @@ class Environment } function hsva($h, $s, $v, $a) { - $h = (\Less\Environment::number($h) % 360) / 360; + $h = ((\Less\Environment::number($h) % 360) / 360 ) * 360; $s = \Less\Environment::number($s); $v = \Less\Environment::number($v); $a = \Less\Environment::number($a);
fixed a typo in hsv implementation
oyejorge_less.php
train
php
9d59466599a0d46ec9785ee88ab03aecaebe034c
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/ContainerAwareEventDispatcherTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/ContainerAwareEventDispatcherTest.php index <HASH>..<HASH> 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/ContainerAwareEventDispatcherTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/ContainerAwareEventDispatcherTest.php @@ -158,6 +158,7 @@ class ContainerAwareEventDispatcherTest extends \PHPUnit_Framework_TestCase $dispatcher->addListenerService('onEvent', array('service.listener', 'onEvent')); $event->setDispatcher($dispatcher); + $event->setName('onEvent'); $service ->expects($this->once())
fixed a unit test broken by previous merge
symfony_symfony
train
php
903ed0e4a94d96d05eb3f1f5a835ca7b2ac3760c
diff --git a/src/java/liquibase/migrator/Migrator.java b/src/java/liquibase/migrator/Migrator.java index <HASH>..<HASH> 100644 --- a/src/java/liquibase/migrator/Migrator.java +++ b/src/java/liquibase/migrator/Migrator.java @@ -510,7 +510,7 @@ public class Migrator { return ChangeSet.RunStatus.NOT_RAN; } else { if (foundRan.getMd5sum() == null) { - log.info("Updating NULL md5sum for " + this.toString()); + log.info("Updating NULL md5sum for " + changeSet.toString()); Migrator migrator = changeSet.getDatabaseChangeLog().getMigrator(); Connection connection = migrator.getDatabase().getConnection(); PreparedStatement updatePstmt = connection.prepareStatement("update DatabaseChangeLog set md5sum=? where id=? AND author=? AND filename=?".toUpperCase()); @@ -531,7 +531,7 @@ public class Migrator { if (changeSet.shouldRunOnChange()) { return ChangeSet.RunStatus.RUN_AGAIN; } else { - throw new DatabaseHistoryException("MD5 Check for " + toString() + " failed"); + throw new DatabaseHistoryException("MD5 Check for " + changeSet.toString() + " failed"); } } }
Display toString of changeSet correctly. Bug was introduced when moving md5sum code here from the changeSet class git-svn-id: <URL>
liquibase_liquibase
train
java
f812fb66863ba4ec977331ca7538f8fa9a3f3f54
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -920,14 +920,18 @@ function toHex (n) { function utf8ToBytes (str) { var byteArray = [] - for (var i = 0; i < str.length; i++) - if (str.charCodeAt(i) <= 0x7F) + for (var i = 0; i < str.length; i++) { + var b = str.charCodeAt(i) + if (b <= 0x7F) byteArray.push(str.charCodeAt(i)) else { - var h = encodeURIComponent(str.charAt(i)).substr(1).split('%') + var start = i + if (b >= 0xD800 && b <= 0xDFFF) i++ + var h = encodeURIComponent(str.slice(start, i+1)).substr(1).split('%') for (var j = 0; j < h.length; j++) byteArray.push(parseInt(h[j], 16)) } + } return byteArray }
detect and handle utf<I> non-BMP characters (surrogate pairs)
feross_buffer
train
js
846cd414bfa5b3b9f43c05b90218a272e465ec17
diff --git a/version.php b/version.php index <HASH>..<HASH> 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2016012100.00; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2016012100.02; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes.
MDL-<I> admin: Version bump after history rewrite
moodle_moodle
train
php
0beb05d209822d9e66fc39bfae43ef5135e52f27
diff --git a/route_services/route_services.go b/route_services/route_services.go index <HASH>..<HASH> 100644 --- a/route_services/route_services.go +++ b/route_services/route_services.go @@ -22,7 +22,7 @@ import ( ) var _ = RouteServicesDescribe("Route Services", func() { - Context("when a route binds to a service", func() { + PContext("when a route binds to a service", func() { Context("when service broker returns a route service url", func() { var ( serviceInstanceName string
Pend tests affected by create-service-broker issue [#<I>](<URL>)
cloudfoundry_cf-acceptance-tests
train
go
27a931b72b3ba7d8d1ed5f9c3ea11a54b475aa6b
diff --git a/para-core/src/main/java/com/erudika/para/annotations/Email.java b/para-core/src/main/java/com/erudika/para/annotations/Email.java index <HASH>..<HASH> 100644 --- a/para-core/src/main/java/com/erudika/para/annotations/Email.java +++ b/para-core/src/main/java/com/erudika/para/annotations/Email.java @@ -43,7 +43,7 @@ public @interface Email { /** * {@value #EMAIL_PATTERN}. */ - String EMAIL_PATTERN = "[A-Za-z0-9.%+_\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\S]{2,4}$"; + String EMAIL_PATTERN = "[A-Za-z0-9.%+_\\-]+@[A-Za-z0-9.\\-]+\\.[A-Za-z\\S]{2,6}$"; /** * Error for invalid email.
fixed email domain validation too strict, max TLD length is now 6
Erudika_para
train
java
355f6fabe1e4100f94ee8cddd9caf29fac8264b1
diff --git a/sdk/python/lib/pulumi/resource.py b/sdk/python/lib/pulumi/resource.py index <HASH>..<HASH> 100644 --- a/sdk/python/lib/pulumi/resource.py +++ b/sdk/python/lib/pulumi/resource.py @@ -198,7 +198,7 @@ class Resource: :param str module_member: The requested module member. :return: The :class:`ProviderResource` associated with the given module member, or None if one does not exist. - :rtype: Optional[ProviderReference] + :rtype: Optional[ProviderResource] """ components = module_member.split(":") if len(components) != 3:
Typo: ProviderReference -> ProviderResource (#<I>)
pulumi_pulumi
train
py
63b71db7ce5cf055d870bea32b6e6d874ae057b7
diff --git a/lib/tilelive/mbtiles.js b/lib/tilelive/mbtiles.js index <HASH>..<HASH> 100644 --- a/lib/tilelive/mbtiles.js +++ b/lib/tilelive/mbtiles.js @@ -472,7 +472,7 @@ MBTiles.prototype.insertGrid = function(grid, callback) { deflate(grid.grid_utfgrid, function(err, data) { if (err) throw err; that.db.prepare( - 'INSERT OR ABORT INTO grid_utfgrid (' + 'INSERT OR IGNORE INTO grid_utfgrid (' + 'grid_id, ' + 'grid_utfgrid) ' + 'VALUES (?, ?);', @@ -490,7 +490,7 @@ MBTiles.prototype.insertGrid = function(grid, callback) { // - @param {Function} callback MBTiles.prototype.insertImage = function(image, callback) { this.db.prepare( - 'INSERT OR ABORT INTO images (' + 'INSERT OR IGNORE INTO images (' + 'tile_id, ' + 'tile_data) ' + 'VALUES (?, ?);',
Use INSERT OR IGNORE rather than ABORT.
mapbox_tilelive
train
js
9931d1e300417a67a165b633439d048f86e0f218
diff --git a/gendocs/generator.py b/gendocs/generator.py index <HASH>..<HASH> 100644 --- a/gendocs/generator.py +++ b/gendocs/generator.py @@ -304,6 +304,7 @@ class Generator(properties.HasProperties): # Write the file with open(findex, 'w') as f: + if package.__doc__: f.write(package.__doc__) f.write(index) # return filename for index file at package level
Add ability to auto doc package level docstrings
banesullivan_gendocs
train
py
1ee16f1864cf9535cbb845138355c9c51ce7fc94
diff --git a/lib/response.js b/lib/response.js index <HASH>..<HASH> 100644 --- a/lib/response.js +++ b/lib/response.js @@ -114,7 +114,7 @@ Response.prototype.header = function header(name, value) { Response.prototype.json = function json(code, object, headers) { - this.setHeader('Content-Type', 'application/json'); + this.header('Content-Type', 'application/json'); return (this.send(code, object, headers)); }; @@ -143,7 +143,7 @@ Response.prototype.send = function send(code, body, headers) { code = null; } - headers = headers || this.getHeaders(); + headers = headers || {}; if (log.trace()) { log.trace({ @@ -227,8 +227,5 @@ Response.prototype.writeHead = function restifyWriteHead() { this.removeHeader('Content-Type'); } - if (this.etag && !this.getHeader('etag')) - this.setHeader('Etag', this.etag); - this._writeHead.apply(this, arguments); };
response.send is double writing headers
restify_plugins
train
js
def12b088d60d01383c05ee7fd1e9b3dd09bdfe7
diff --git a/packages/link/src/components/Link.js b/packages/link/src/components/Link.js index <HASH>..<HASH> 100644 --- a/packages/link/src/components/Link.js +++ b/packages/link/src/components/Link.js @@ -43,7 +43,7 @@ const Link = props => { }; Link.propTypes = { - children: PropTypes.node.isRequired, + children: PropTypes.node, type: PropTypes.string, leftIcon: PropTypes.string, rightIcon: PropTypes.string, diff --git a/packages/link/src/components/Link.story.js b/packages/link/src/components/Link.story.js index <HASH>..<HASH> 100644 --- a/packages/link/src/components/Link.story.js +++ b/packages/link/src/components/Link.story.js @@ -30,6 +30,7 @@ storiesOf("Link/Featured", module) Awesome Link </Link> )) + .add("icon only", () => <Link href="#" leftIcon="wg-place" />) .add("external, mini size", () => ( <Link href="#" size={fontSizes.SMALL} external lineHeight={1.14}> Awesome Link
fix(link): remove isRequired for children prop affects: @crave/farmblocks-link so we can have icon-only links
CraveFood_farmblocks
train
js,js
d65722e2b5088f7977b55671c60826df23b918b1
diff --git a/gphoto2.py b/gphoto2.py index <HASH>..<HASH> 100644 --- a/gphoto2.py +++ b/gphoto2.py @@ -194,3 +194,16 @@ def list_cameras(): lib.gp_port_info_list_free(port_list_p[0]) lib.gp_abilities_list_free(abilities_list_p[0]) return out + +def autodetect(): + camlist_p = ffi.new("CameraList**") + lib.gp_list_new(camlist_p) + lib.gp_camera_autodetect(camlist_p[0], _global_ctx) + out = {} + for idx in xrange(lib.gp_list_count(camlist_p[0])): + name = util.get_string(lib.gp_list_get_name, camlist_p[0], idx) + value = util.get_string(lib.gp_list_get_value, camlist_p[0], idx) + out[name] = tuple(int(x) for x in + re.match(r"usb:(\d+),(\d+)", value).groups()) + lib.gp_list_free(camlist_p[0]) + return out
Implement auto-detection of attached devices
jbaiter_gphoto2-cffi
train
py
0dc6060fe10ae1421d95ac71b6df186e7d92225d
diff --git a/master/buildbot/master.py b/master/buildbot/master.py index <HASH>..<HASH> 100644 --- a/master/buildbot/master.py +++ b/master/buildbot/master.py @@ -448,7 +448,7 @@ class BuildMaster(service.MultiService): # Skip checks for builders in multimaster mode if not multiMaster: assert b in buildernames, \ - "%s uses unknown builder %s" % (s, b) + "%s (%s) uses unknown builder %s" % (s, s.name, b) if b in unscheduled_buildernames: unscheduled_buildernames.remove(b)
Be more specific when complaining about unknown builder
buildbot_buildbot
train
py
af819f50d5968a08c0b54780366ee1cc728d6530
diff --git a/ftfy/fixes.py b/ftfy/fixes.py index <HASH>..<HASH> 100644 --- a/ftfy/fixes.py +++ b/ftfy/fixes.py @@ -119,7 +119,7 @@ def fix_text_encoding(text): cost += 2 # We need pretty solid evidence to decode from Windows-1251 (Cyrillic). - if ('sloppy_encode', 'windows-1251') in plan_so_far: + if ('encode', 'sloppy-windows-1251') in plan_so_far: cost += 5 if cost < best_cost:
fix expected output in 'plan_so_far'
LuminosoInsight_python-ftfy
train
py
6f6ea179b92064cd344605d96f330c39ac0da60a
diff --git a/parsers/binary.js b/parsers/binary.js index <HASH>..<HASH> 100644 --- a/parsers/binary.js +++ b/parsers/binary.js @@ -1,7 +1,6 @@ 'use strict'; -var BinaryPack = require('binary-pack') - , library = BinaryPack.BrowserSource; +var BinaryPack = require('binary-pack'); /** * Message encoder. @@ -42,7 +41,11 @@ exports.library = [ 'var BinaryPack = (function () {', ' try { return require("binary-pack"); }', ' catch (e) {}', - ' return '+ library.slice(library.indexOf('return ') + 7, -4) +';', + ' var exports = {};', + ' (function () { ', + BinaryPack.BrowserSource, + ' }).call(exports);', + ' return exports.BinaryPack;', '})();', '' ].join('\n');
[fix] Restore compatibility with older versions of binary-pack
primus_primus
train
js
9514f2541e3e2a4a3987362d221c338b6fc33c16
diff --git a/src/Mutation/DeleteNode.php b/src/Mutation/DeleteNode.php index <HASH>..<HASH> 100644 --- a/src/Mutation/DeleteNode.php +++ b/src/Mutation/DeleteNode.php @@ -40,9 +40,9 @@ class DeleteNode extends AbstractMutationResolver $this->getManager()->remove($data); $this->getManager()->flush(); - $this->postDelete($data); + $this->postDelete($this->deletedNode); foreach ($this->extensions as $extension) { - $extension->postDelete($data, $this, $this->context); + $extension->postDelete($this->deletedNode, $this, $this->context); } }
fix issue passing deleted entity to postDelete extension event
ynloultratech_graphql-bundle
train
php
ee972781ec53ecccb973c3c31819b02d434e99b0
diff --git a/lib/grape-apiary/route.rb b/lib/grape-apiary/route.rb index <HASH>..<HASH> 100644 --- a/lib/grape-apiary/route.rb +++ b/lib/grape-apiary/route.rb @@ -42,7 +42,7 @@ module GrapeApiary end def list? - route_method == 'GET' && !route_path.include?(':id') + %w(GET POST).include?(route_method) && !route_path.include?(':id') end private
Ensures generic POSTS are classified as collection
technekes_grape-apiary
train
rb
21e01a8b49d0cc9146cfaf33213ca46b2e40c878
diff --git a/docs/conf.py b/docs/conf.py index <HASH>..<HASH> 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -23,7 +23,7 @@ sys.path.insert( project = 'NailGun' copyright = '2014, Jeremy Audet' # pylint:disable=redefined-builtin -version = '0.5.0' +version = '0.5.1' release = version # General Configuration ------------------------------------------------------- diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ with open('README.rst') as handle: setup( name='nailgun', - version='0.5.0', # Should be identical to the version in docs/conf.py! + version='0.5.1', # Should be identical to the version in docs/conf.py! description='A library that facilitates easy usage of the Satellite 6 API', long_description=LONG_DESCRIPTION, url='https://github.com/SatelliteQE/nailgun',
Release version <I> Changes in this release: * Significantly update documentation, especially the "examples" section.
SatelliteQE_nailgun
train
py,py
7451c662f5fe0e8d52a3cb6320cbc98215ee8610
diff --git a/sphinx_markdown_tables/__init__.py b/sphinx_markdown_tables/__init__.py index <HASH>..<HASH> 100644 --- a/sphinx_markdown_tables/__init__.py +++ b/sphinx_markdown_tables/__init__.py @@ -24,7 +24,7 @@ def process_tables(app, docname, source): table_processor = markdown.extensions.tables.TableProcessor(md.parser) raw_markdown = source[0] - blocks = re.split(r'\n{2,}', raw_markdown) + blocks = re.split(r'(\n{2,})', raw_markdown) for i, block in enumerate(blocks): if table_processor.test(None, block): @@ -34,4 +34,4 @@ def process_tables(app, docname, source): # re-assemble into markdown-with-tables-replaced # must replace element 0 for changes to persist - source[0] = '\n\n'.join(blocks) + source[0] = ''.join(blocks)
preserve whitespace between blocks to maintain line numbers in error messages
ryanfox_sphinx-markdown-tables
train
py
2da05fca7d9254446a41cfe567d7070dfd1c7fac
diff --git a/bokeh/server/session.py b/bokeh/server/session.py index <HASH>..<HASH> 100644 --- a/bokeh/server/session.py +++ b/bokeh/server/session.py @@ -64,17 +64,19 @@ class _AsyncPeriodic(object): future = self._func() def on_done(future): now = self._loop.time() - duration = now - self._last_start_time + duration = (now - self._last_start_time) self._last_start_time = now next_period = max(self._period - duration, 0) - self._handle = self._loop.call_later(next_period, self._step) + # IOLoop.call_later takes a delay in seconds + self._handle = self._loop.call_later(next_period/1000.0, self._step) if future.exception() is not None: log.error("Error thrown from periodic callback: %r", future.exception()) self._loop.add_future(future, on_done) def start(self): self._last_start_time = self._loop.time() - self._handle = self._loop.call_later(self._period, self._step) + # IOLoop.call_later takes a delay in seconds + self._handle = self._loop.call_later(self._period/1000.0, self._step) def stop(self): if self._handle is not None:
IOLoop.call_later takes a delay in seconds
bokeh_bokeh
train
py
fc6402f51ec42aeb0d5a81fa7389f4002dfb2ac0
diff --git a/nipap-www/nipapwww/public/nipap.js b/nipap-www/nipapwww/public/nipap.js index <HASH>..<HASH> 100644 --- a/nipap-www/nipapwww/public/nipap.js +++ b/nipap-www/nipapwww/public/nipap.js @@ -1362,6 +1362,7 @@ function populatePoolTable(data) { // Enable pool dataTable $('#pool_table').dataTable({ 'bAutoWidth': false, + 'bDestroy': true, 'bPaginate': false, 'bSortClasses': false, 'aaData': pool_table_data,
Destroy DataTable when writing to it Make sure that any preexisting DataTable is destroyed before initializing it. Fixes #<I>
SpriteLink_NIPAP
train
js
ee39f0902723ae4be1bc7e4a19e7c66d61656017
diff --git a/keyboard_shortcuts/models.py b/keyboard_shortcuts/models.py index <HASH>..<HASH> 100644 --- a/keyboard_shortcuts/models.py +++ b/keyboard_shortcuts/models.py @@ -1,3 +1 @@ -from django.db import models - -# Create your models here. +# empty diff --git a/keyboard_shortcuts/views.py b/keyboard_shortcuts/views.py index <HASH>..<HASH> 100644 --- a/keyboard_shortcuts/views.py +++ b/keyboard_shortcuts/views.py @@ -1 +1 @@ -# Create your views here. +# empty
deleted the default content from models.py and views.py
DNX_django-keyboard-shorcuts
train
py,py
cd4076d51cfbf0664d6ce5198b05442e67b0ed48
diff --git a/typings/index.js b/typings/index.js index <HASH>..<HASH> 100755 --- a/typings/index.js +++ b/typings/index.js @@ -33,6 +33,13 @@ module.exports = function (grunt) { } function getTypings(basePath, unify, isSelf) { + if (!unify.exists) { + grunt.verbose.write('Ignored typings from missing file [') + .write(unify.path) + .writeln(']'); + return []; + } + grunt.verbose .write('Collecting typings from [') .write(unify.path)
Ignoring missing unify files.
wsick_grunt-fayde-unify
train
js
894270500d92cbc5b5c92ca1f563b97e9c9c95da
diff --git a/src/Type/Data.php b/src/Type/Data.php index <HASH>..<HASH> 100644 --- a/src/Type/Data.php +++ b/src/Type/Data.php @@ -523,6 +523,11 @@ function calculateToArrayBodyFor(Argument $a, ?string $resolvedType, array $defi CODE; } + if ($a->nullable()) { + return " '{$a->name()}' => \$this->{$a->name()} !=== null ? " + . ($typeConfiguration->toPhpValue()('$this->' . $a->name())) . " : null,\n"; + } + return " '{$a->name()}' => " . ($typeConfiguration->toPhpValue()('$this->' . $a->name())) . ",\n"; } @@ -534,7 +539,13 @@ CODE; return " '{$a->name()}' => \array_map($callback, \$this->{$a->name()}),\n"; } + if ($a->nullable()) { + return " '{$a->name()}' => \$this->{$a->name()} !== null ? \$this->" + . ($builder)($definition->type(), $a->name()) . " : null,\n"; + } + return " '{$a->name()}' => \$this->" . ($builder)($definition->type(), $a->name()) . ",\n"; + } }
fix builders for nullable on to array
prolic_fpp
train
php
4679e16bfd1c4d3cd24eb88fe1994425a02f3ce8
diff --git a/fabric_bolt/web_hooks/tests/test_urls.py b/fabric_bolt/web_hooks/tests/test_urls.py index <HASH>..<HASH> 100644 --- a/fabric_bolt/web_hooks/tests/test_urls.py +++ b/fabric_bolt/web_hooks/tests/test_urls.py @@ -91,9 +91,9 @@ class TestURLS(TestCase): self.assertEqual(reverse('projects_project_view', args=(self.project.pk,)), h.get_absolute_url()) - def test_hook_objects_manager(self): - - hooks = hook_models.Hook.objects.hooks(self.project) - - self.assertEqual(self.project_hook, hooks[0]) + # def test_hook_objects_manager(self): + # + # hooks = hook_models.Hook.objects.hooks(self.project) + # + # self.assertEqual(self.project_hook, hooks[0])
Remove this test until I can get the travis settings working
fabric-bolt_fabric-bolt
train
py
75a5a8ce84d713ef7509cb04079321732207add6
diff --git a/sprd/view/SimpleHorizontalColorPickerClass.js b/sprd/view/SimpleHorizontalColorPickerClass.js index <HASH>..<HASH> 100644 --- a/sprd/view/SimpleHorizontalColorPickerClass.js +++ b/sprd/view/SimpleHorizontalColorPickerClass.js @@ -62,7 +62,7 @@ define(["js/ui/View", "js/core/List"], function (View, List) { var pos = this.$.colorList.globalToLocal({x: e.pageX, y: e.pageY}); var numColors = this.$._numColors, - colorIndex = Math.floor((pos.x / this.$tableWidth) * numColors); + colorIndex = Math.max(Math.min(this.$._numColors-1,Math.floor((pos.x / this.$tableWidth) * numColors)),0); this.set({ '_previewColor': this.$.colors.at(colorIndex)
DEV-<I> - Dragging the color drag handler to much will cause the color to disapear
spreadshirt_rAppid.js-sprd
train
js
d07e120e4183d92e6219ec7826e918c4eb3ec79f
diff --git a/test/notations.js b/test/notations.js index <HASH>..<HASH> 100644 --- a/test/notations.js +++ b/test/notations.js @@ -41,9 +41,14 @@ runner.test('option=value notation: value contains "="', function () { { name: 'three' } ] - var argv = [ '--url=my-url?q=123', '--two', '2', '--three=3' ] - var result = cliArgs(optionDefinitions, argv) + var result = cliArgs(optionDefinitions, [ '--url=my-url?q=123', '--two', '2', '--three=3' ]) a.strictEqual(result.url, 'my-url?q=123') a.strictEqual(result.two, '2') a.strictEqual(result.three, '3') + + result = cliArgs(optionDefinitions, [ '--url=my-url?q=123=1' ]) + a.strictEqual(result.url, 'my-url?q=123=1') + + result = cliArgs({ name: 'my-url' }, [ '--my-url=my-url?q=123=1' ]) + a.strictEqual(result['my-url'], 'my-url?q=123=1') })
a few more option=value notation tests
75lb_command-line-args
train
js
e9e436fe222b8afd939ccc46681f970471e4f2f6
diff --git a/semver.py b/semver.py index <HASH>..<HASH> 100644 --- a/semver.py +++ b/semver.py @@ -26,9 +26,15 @@ def parse(version): def compare(ver1, ver2): + def nat_cmp(a, b): + a, b = a and str(a) or '', b and str(b) or '' + convert = lambda text: int(text) if text.isdigit() else text.lower() + alphanum_key = lambda key: [convert(c) for c in re.split('([0-9]+)', key)] + return cmp(alphanum_key(a), alphanum_key(b)) + def compare_by_keys(d1, d2, keys): for key in keys: - v = cmp(d1.get(key), d2.get(key)) + v = nat_cmp(d1.get(key), d2.get(key)) if v != 0: return v return 0
Fix rc build comparison via natural cmp helper.
k-bx_python-semver
train
py
460a3d0656df910077ce8f3e509edfaffdabd8ba
diff --git a/lib/bel_parser/completion.rb b/lib/bel_parser/completion.rb index <HASH>..<HASH> 100644 --- a/lib/bel_parser/completion.rb +++ b/lib/bel_parser/completion.rb @@ -95,15 +95,18 @@ module BELParser } } - completion_result[:semantics] = { - valid: valid, - detail: term_semantics, - message: valid ? 'Valid semantics' : message + completion_result[:validation] = { + expression: completion_result[:value], + valid_syntax: true, + valid_semantics: valid, + message: valid ? 'Valid semantics' : message, + warnings: semantic_warnings.map(&:to_s), + term_signatures: term_semantics } completion_result } .group_by { |completion_result| - completion_result[:semantics][:valid] + completion_result[:validation][:valid_semantics] } (validated_completions[true] || []) + (validated_completions[false] || [])
updated validation resource object on completion added valid_syntax and warnings properties
OpenBEL_bel_parser
train
rb
b4747f4fdc3a9bdb250d09718567a7364dd1c9dd
diff --git a/tests/LL1Parser/ExampleGrammar.php b/tests/LL1Parser/ExampleGrammar.php index <HASH>..<HASH> 100644 --- a/tests/LL1Parser/ExampleGrammar.php +++ b/tests/LL1Parser/ExampleGrammar.php @@ -99,4 +99,33 @@ class ExampleGrammar "F" => [11, [1, 2, 4, 6]], ]; } + + public function getDragonBook414Table(): array + { + return [ + 7 => [ + 3 => [9, 8], + 5 => [9, 8], + ], + 8 => [ + 1 => [1, 9, 8], + 4 => [], + 6 => [], + ], + 9 => [ + 3 => [11, 10], + 5 => [11, 10], + ], + 10 => [ + 1 => [], + 2 => [2, 11, 10], + 4 => [], + 6 => [], + ], + 11 => [ + 3 => [3, 7, 4], + 5 => [5], + ], + ]; + } }
Added lookup table for example <I> from Dragonbook
remorhaz_php-unilex
train
php
22fbeffb43ac104dfe7ffb44c6084b93e33e2079
diff --git a/lib/writeexcel/worksheet.rb b/lib/writeexcel/worksheet.rb index <HASH>..<HASH> 100644 --- a/lib/writeexcel/worksheet.rb +++ b/lib/writeexcel/worksheet.rb @@ -310,20 +310,6 @@ class Worksheet < BIFFWriter super end - ############################################################################### - # - # compatibility_mode() - # - # Set the compatibility mode. - # - # See the explanation in Workbook::compatibility_mode(). This private method - # is mainly used for test purposes. - # - def compatibility_mode(compatibility = 1) # :nodoc: - @compatibility = compatibility - end - private :compatibility_mode - # # The name() method is used to retrieve the name of a worksheet. For example: #
* delete private method Worksheet#comparibility_mode.
cxn03651_writeexcel
train
rb
39fd98be553d941b935db03834fdd4560793c8ee
diff --git a/src/XeroPHP/Models/Accounting/Item.php b/src/XeroPHP/Models/Accounting/Item.php index <HASH>..<HASH> 100644 --- a/src/XeroPHP/Models/Accounting/Item.php +++ b/src/XeroPHP/Models/Accounting/Item.php @@ -67,13 +67,13 @@ class Item extends Remote\Model /** * See Purchases & Sales. * - * @property Purchase[] PurchaseDetails + * @property Purchase PurchaseDetails */ /** * See Purchases & Sales. * - * @property Sale[] SalesDetails + * @property Sale SalesDetails */ /** @@ -358,7 +358,7 @@ class Item extends Remote\Model } /** - * @return Purchase[]|Remote\Collection + * @return Purchase */ public function getPurchaseDetails() { @@ -390,7 +390,7 @@ class Item extends Remote\Model } /** - * @return Remote\Collection|Sale[] + * @return Sale */ public function getSalesDetails() {
Fix return types in Accounting/Item PHP Docs Item no longer returns an array of PurchaseDetails or SalesDetails, and should instead return a single object. Simply updating the PHPDoc comments to reflect this
calcinai_xero-php
train
php
259c40b54292d28243c515e824c580562f53ce19
diff --git a/Listener/ExerciseListener.php b/Listener/ExerciseListener.php index <HASH>..<HASH> 100755 --- a/Listener/ExerciseListener.php +++ b/Listener/ExerciseListener.php @@ -190,7 +190,8 @@ class ExerciseListener extends ContainerAware $newExercise->setEndDate($exerciseToCopy->getEndDate()); $newExercise->setDispButtonInterrupt($exerciseToCopy->getDispButtonInterrupt()); $newExercise->setLockAttempt($exerciseToCopy->getLockAttempt()); - + $newExercise->setPublished($exerciseToCopy->getPublished()); + $em->persist($newExercise); $em->flush();
[ExoBundle] To copy the published parametre in the listener "onCopy"
claroline_Distribution
train
php
5dd79829a3d2be99e26dfa07492c4d9ed5c44fcf
diff --git a/src/Codeception/Module/REST.php b/src/Codeception/Module/REST.php index <HASH>..<HASH> 100644 --- a/src/Codeception/Module/REST.php +++ b/src/Codeception/Module/REST.php @@ -577,7 +577,7 @@ EOF; // allow full url to be requested if (strpos($url, '://') === false) { $url = $this->config['url'] . $url; - if ($this->config['url'] && strpos($url, '://') === false && $this->config['url'][0] !== '/') { + if ($this->config['url'] && strpos($url, '://') === false && strpos($url, '/') !== 0 && $this->config['url'][0] !== '/') { $url = '/' . $url; } }
do not add leading slash when there is one already fix #<I> (#<I>)
Codeception_base
train
php
72d85e43ea7c1cca2009dae3134f54f6f489609d
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,6 @@ setup( license='MIT', packages=['gyazo'], package_data=package_data, - test_suite='tests', python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4', install_requires=install_requires, extras_require=extras_require,
Remove test_suite from setup.py setuptools <I> decommissioned "test" command
ymyzk_python-gyazo
train
py
9023fceabc807adecee063c7790242758e666fb2
diff --git a/drf_dynamic_fields/__init__.py b/drf_dynamic_fields/__init__.py index <HASH>..<HASH> 100644 --- a/drf_dynamic_fields/__init__.py +++ b/drf_dynamic_fields/__init__.py @@ -18,7 +18,16 @@ class DynamicFieldsMixin(object): warnings.warn('Context does not have access to request') return - fields = self.context['request'].query_params.get('fields', None) + # NOTE: drf test framework builds a request object where the query + # parameters are found under the GET attribute. + if hasattr(self.context['request'], 'query_params'): + fields = self.context['request'].query_params.get('fields', None) + elif hasattr(self.context['request'], 'GET'): + fields = self.context['request'].GET.get('fields', None) + else: + warnings.warn('Request object does not contain query paramters') + return + if fields: fields = fields.split(',') # Drop any fields that are not specified in the `fields` argument.
Check if request obj has query_params or GET attr (#3)
dbrgn_drf-dynamic-fields
train
py
2461b8f2987d343b3e220763debeeccd7f0524a8
diff --git a/lib/Conekta/Object.php b/lib/Conekta/Object.php index <HASH>..<HASH> 100644 --- a/lib/Conekta/Object.php +++ b/lib/Conekta/Object.php @@ -42,9 +42,11 @@ class Object extends ArrayObject $this->$k = $v; if ($k == "contextual_data") { $this->contextual_data = new Object(); - foreach ($v as $k2 => $v2) { - $this->contextual_data->$k2 = $v2; - $this->contextual_data->_setVal($k2, $v2); + if (is_array($v) || is_object($v)) { + foreach ($v as $k2 => $v2) { + $this->contextual_data->$k2 = $v2; + $this->contextual_data->_setVal($k2, $v2); + } } } }
Fix contextual data parsing when null. Changes to be committed: modified: lib/Conekta/Object.php
conekta_conekta-php
train
php
1bff84e74de59eff3631673e732b4dcc6c5bb885
diff --git a/src/elements/table/Table.js b/src/elements/table/Table.js index <HASH>..<HASH> 100644 --- a/src/elements/table/Table.js +++ b/src/elements/table/Table.js @@ -117,9 +117,9 @@ export class NovoTableHeader { </thead> <!-- TABLE DATA --> <tbody *ngIf="rows.length > 0"> - <tr class="table-selection-row" *ngIf="config.rowSelectionStyle === 'checkbox' && showSelectAllMessage"> + <tr class="table-selection-row" *ngIf="config.rowSelectionStyle === 'checkbox' && showSelectAllMessage" data-automation-id="table-selection-row"> <td colspan="100%"> - {{labels.selectedRecords(selected.length)}} <a (click)="selectAll(true)">{{labels.totalRecords(rows.length)}}</a> + {{labels.selectedRecords(selected.length)}} <a (click)="selectAll(true)" data-automation-id="all-matching-records">{{labels.totalRecords(rows.length)}}</a> </td> </tr> <template ngFor let-row="$implicit" [ngForOf]="rows | slice:getPageStart():getPageEnd()">
chore(automation): Adding data-automation-ids to Table
bullhorn_novo-elements
train
js
0444b683463defa7d7b35ba4a7ee023479e4d337
diff --git a/werkzeug/datastructures.py b/werkzeug/datastructures.py index <HASH>..<HASH> 100644 --- a/werkzeug/datastructures.py +++ b/werkzeug/datastructures.py @@ -546,7 +546,7 @@ class MultiDict(TypeConversionDict): yield key, values[0] def lists(self): - """Return a list of ``(key, values)`` pairs, where values is the list + """Return a iterator of ``(key, values)`` pairs, where values is the list of all values associated with the key.""" for key, values in iteritems(dict, self):
Update datastructure.py I think `MultiDict.lists()`'s docstring contain a mistake, origin it say "Return a list of ``(key, values)`` pairs", but not true, and not consistent with `.values()`, `listvalues()`
pallets_werkzeug
train
py
ac62a57f1121a9263d415fb4f71112d9bfdecd9d
diff --git a/Traits/ForwardsCalls.php b/Traits/ForwardsCalls.php index <HASH>..<HASH> 100644 --- a/Traits/ForwardsCalls.php +++ b/Traits/ForwardsCalls.php @@ -38,6 +38,27 @@ trait ForwardsCalls } /** + * Forward a method call to the given object, returning $this if the forwarded call returned itself. + * + * @param mixed $object + * @param string $method + * @param array $parameters + * @return mixed + * + * @throws \BadMethodCallException + */ + protected function forwardDecoratedCallTo($object, $method, $parameters) + { + $result = $this->forwardCallTo($object, $method, $parameters); + + if ($result === $object) { + return $this; + } + + return $result; + } + + /** * Throw a bad method call exception for the given method. * * @param string $method
[9.x] Non-breaking forwardDecoratedCallTo refactor (#<I>)
illuminate_support
train
php
e1e0591364563fe062ede8639531537c293331fc
diff --git a/pkg/kubectl/cmd/drain.go b/pkg/kubectl/cmd/drain.go index <HASH>..<HASH> 100644 --- a/pkg/kubectl/cmd/drain.go +++ b/pkg/kubectl/cmd/drain.go @@ -610,6 +610,7 @@ func (o *DrainOptions) evictPods(pods []corev1.Pod, policyGroupVersion string, g } else { globalTimeout = o.Timeout } + globalTimeoutCh := time.After(globalTimeout) for { select { case err := <-errCh: @@ -619,7 +620,7 @@ func (o *DrainOptions) evictPods(pods []corev1.Pod, policyGroupVersion string, g if doneCount == len(pods) { return nil } - case <-time.After(globalTimeout): + case <-globalTimeoutCh: return fmt.Errorf("Drain did not complete within %v", globalTimeout) } }
Don't reset global timeout on each for loop iteration
kubernetes_kubernetes
train
go
97d2e2d5eaa6e0f68027dc129c5d8e4209ed7043
diff --git a/app/controllers/concerns/hyrax/works_controller_behavior.rb b/app/controllers/concerns/hyrax/works_controller_behavior.rb index <HASH>..<HASH> 100644 --- a/app/controllers/concerns/hyrax/works_controller_behavior.rb +++ b/app/controllers/concerns/hyrax/works_controller_behavior.rb @@ -72,9 +72,8 @@ module Hyrax respond_to do |wants| wants.html { presenter && parent_presenter } wants.json do - # load and authorize @curation_concern manually because it's skipped for html + # load @curation_concern manually because it's skipped for html @curation_concern = _curation_concern_type.find(params[:id]) unless curation_concern - authorize! :show, @curation_concern render :show, status: :ok end additional_response_formats(wants)
Don't bother re-authorizing `@curation_concern` on Work JSON show This manual authorization is duplicative; we've just authorized against the SolrDocument, and we're perfectly happy to show the resource HTML, ttl, ntriples, etc... on this basis. There's no need to check the formal ACLs here.
samvera_hyrax
train
rb
965ded447a8c363c432c326a1b24d4b7c2a20dcb
diff --git a/ib_insync/util.py b/ib_insync/util.py index <HASH>..<HASH> 100644 --- a/ib_insync/util.py +++ b/ib_insync/util.py @@ -238,10 +238,7 @@ def _syncAwaitQt(future): future = asyncio.ensure_future(future) qApp = qt.QApplication.instance() while not future.done(): - qApp.processEvents() - if future.done(): - break - time.sleep(0.005) + qApp.processEvents(qt.QEventLoop.WaitForMoreEvents) return future.result()
less latency for syncAwaitQt
erdewit_ib_insync
train
py
0b9ddb52e52184ace40c7bec4e56c0581ef93113
diff --git a/subitem.go b/subitem.go index <HASH>..<HASH> 100644 --- a/subitem.go +++ b/subitem.go @@ -14,7 +14,8 @@ type SubscriptionItemParams struct { Subscription *string `form:"subscription"` TaxRates []*string `form:"tax_rates"` - // The following parameter is only supported on updates + // The following parameters are only supported on updates + OffSession *bool `form:"off_session"` PaymentBehavior *string `form:"payment_behavior"` }
Add OffSession to SubscriptionItem update
stripe_stripe-go
train
go
d43dd16c8ed0d1f8449d40377cdf9b48bc5a35f4
diff --git a/lib/increments/schedule.rb b/lib/increments/schedule.rb index <HASH>..<HASH> 100644 --- a/lib/increments/schedule.rb +++ b/lib/increments/schedule.rb @@ -18,6 +18,7 @@ module Increments def pay_day?(date = Date.today) return work_day?(date) if date.day == 25 + return false if rest_day?(date) next_basic_pay_day = Date.new(date.year, date.month, 25) next_basic_pay_day = next_basic_pay_day.next_month if date > next_basic_pay_day date.next_day.upto(next_basic_pay_day).all? do |date_until_basic_pay_day| diff --git a/spec/increments/schedule_spec.rb b/spec/increments/schedule_spec.rb index <HASH>..<HASH> 100644 --- a/spec/increments/schedule_spec.rb +++ b/spec/increments/schedule_spec.rb @@ -90,6 +90,16 @@ module Increments it { should be true } end + context 'with a weekday 22th whose next 23rd, 24th and 25th are rest day' do + let(:date) { Date.new(2016, 12, 22) } + it { should be true } + end + + context 'with a rest day 23rd whose next 24th and 25th are rest day' do + let(:date) { Date.new(2016, 12, 23) } + it { should be false } + end + context 'with a rest day 26th' do let(:date) { Date.new(2015, 3, 26) } it { should be false }
Fix a bug where <I>-<I>-<I> is wrongly treated as a pay day
increments_increments-schedule
train
rb,rb
886efaec46523183856983f42d162c850719310f
diff --git a/lib/cisco_node_utils/vxlan_vtep.rb b/lib/cisco_node_utils/vxlan_vtep.rb index <HASH>..<HASH> 100644 --- a/lib/cisco_node_utils/vxlan_vtep.rb +++ b/lib/cisco_node_utils/vxlan_vtep.rb @@ -54,16 +54,14 @@ module Cisco end def self.enable(state='') + # vdc only supported on n7k currently. + vdc_name = config_get('limit_resource', 'vdc') + config_set('limit_resource', 'vxlan', vdc_name) unless vdc_name.nil? config_set('vxlan', 'feature', state: state) end def create - unless VxlanVtep.feature_enabled - # Only supported on n7k currently. - vdc_name = config_get('limit_resource', 'vdc') - config_set('limit_resource', 'vxlan', vdc_name) unless vdc_name.nil? - VxlanVtep.enable - end + VxlanVtep.enable unless VxlanVtep.feature_enabled # re-use the "interface command ref hooks" config_set('interface', 'create', @name) end
Moved logic into self.enable
cisco_cisco-network-node-utils
train
rb
97f537f35c4f087878a17ba23472b891388b44f1
diff --git a/zipline/testing/core.py b/zipline/testing/core.py index <HASH>..<HASH> 100644 --- a/zipline/testing/core.py +++ b/zipline/testing/core.py @@ -1142,16 +1142,20 @@ def parameter_space(__fail_fast=False, **params): "supplied to parameter_space()." % extra ) - param_sets = product(*(params[name] for name in argnames)) + make_param_sets = lambda: product(*(params[name] for name in argnames)) if __fail_fast: @wraps(f) def wrapped(self): - for args in param_sets: + for args in make_param_sets(): f(self, *args) return wrapped else: - return subtest(param_sets, *argnames)(f) + @wraps(f) + def wrapped(*args, **kwargs): + subtest(make_param_sets(), *argnames)(f)(*args, **kwargs) + + return wrapped return decorator
TEST: Allow parameter_space to work on repeated calls of test If we have a test that's being called more than once (i.e. two test cases, both subclasses of the same base test case, with different setup but calling the same test), allow the subsequent calls to re-consume the same params
quantopian_zipline
train
py
d56f73eea62c2e7a281c512deaf1931fa5ecb83c
diff --git a/dsari/daemon.py b/dsari/daemon.py index <HASH>..<HASH> 100644 --- a/dsari/daemon.py +++ b/dsari/daemon.py @@ -375,6 +375,11 @@ class Scheduler(): # chdir to the run directory os.chdir(os.path.join(self.config['data_dir'], 'runs', job.name, run.id)) + # Close any remaining open filehandles. At this point it should + # just be /dev/urandom (usually on fd 4), but it's not worth it to + # actually verify. + os.closerange(3, 1024) + # Finally! os.execvp(command[0], command)
Remove stale filehandles from children
rfinnie_dsari
train
py
7e3fafd7763725d9b893cc92c88de26b004d8e76
diff --git a/src/farmbot.js b/src/farmbot.js index <HASH>..<HASH> 100644 --- a/src/farmbot.js +++ b/src/farmbot.js @@ -66,7 +66,7 @@ }); } - Farmbot.prototype.pinWrite = function(values) { + Farmbot.prototype.pinWrite = function(opts) { Farmbot.requireKeys(opts, ["pin", "value1", "mode"]); return this.send({ params: opts,
[STABLE] Patch null exception in pinWrite()
FarmBot_farmbot-js
train
js
bb4652e65c52d66ced8d4fc22ebb37ba3b669190
diff --git a/jmetal-core/src/main/java/org/uma/jmetal/util/distance/impl/EuclideanDistanceBetweenSolutionAndASolutionListInObjectiveSpace.java b/jmetal-core/src/main/java/org/uma/jmetal/util/distance/impl/EuclideanDistanceBetweenSolutionAndASolutionListInObjectiveSpace.java index <HASH>..<HASH> 100644 --- a/jmetal-core/src/main/java/org/uma/jmetal/util/distance/impl/EuclideanDistanceBetweenSolutionAndASolutionListInObjectiveSpace.java +++ b/jmetal-core/src/main/java/org/uma/jmetal/util/distance/impl/EuclideanDistanceBetweenSolutionAndASolutionListInObjectiveSpace.java @@ -12,7 +12,7 @@ import java.util.List; * @author <antonio@lcc.uma.es> */ public class EuclideanDistanceBetweenSolutionAndASolutionListInObjectiveSpace - <S extends Solution<Double>, L extends List<S>> + <S extends Solution<?>, L extends List<S>> implements Distance<S, L> { private EuclideanDistanceBetweenSolutionsInObjectiveSpace<S> distance ;
Generalize list version of EuclideanDistance to any type of solution. The implementation already allows that, but the generics unnecessarily constrain it.
jMetal_jMetal
train
java
1de98c6e51c8c5d356c2fadd00dd57cfb32c2fcc
diff --git a/src/Reflection/ReflectionParameter.php b/src/Reflection/ReflectionParameter.php index <HASH>..<HASH> 100644 --- a/src/Reflection/ReflectionParameter.php +++ b/src/Reflection/ReflectionParameter.php @@ -565,7 +565,11 @@ class ReflectionParameter implements CoreReflector } if ( ! $this->reflector instanceof ClassReflector) { - throw new RuntimeException('Unable to reflect class type because we were not given a ClassReflector'); + throw new RuntimeException(\sprintf( + 'Unable to reflect class type because we were not given a "%s", but a "%s" instead', + ClassReflector::class, + \get_class($this->reflector) + )); } return $this->reflector->reflect($className);
Improving exception message, stating which reflector was given instead of the expected one
Roave_BetterReflection
train
php
1e0a21ac611296fe06b49c27d3137ac401578cc4
diff --git a/xwiki-rendering-test/src/main/java/org/xwiki/rendering/test/cts/CompatibilityTestSuite.java b/xwiki-rendering-test/src/main/java/org/xwiki/rendering/test/cts/CompatibilityTestSuite.java index <HASH>..<HASH> 100644 --- a/xwiki-rendering-test/src/main/java/org/xwiki/rendering/test/cts/CompatibilityTestSuite.java +++ b/xwiki-rendering-test/src/main/java/org/xwiki/rendering/test/cts/CompatibilityTestSuite.java @@ -208,12 +208,6 @@ public class CompatibilityTestSuite extends Suite boolean isApplicable; if (testData.isNotApplicable()) { isApplicable = false; - } else if (testData.syntaxData == null) { - if (hasParserOrRenderer(testData)) { - isApplicable = true; - } else { - isApplicable = false; - } } else { if (hasParserOrRenderer(testData)) { isApplicable = true;
[Misc] Remove duplicate code (thanks to Thomas Mortagne)
xwiki_xwiki-rendering
train
java
425705890cde22dcbf48e3f8df42430bf0c3785a
diff --git a/Console/AuthMakeCommand.php b/Console/AuthMakeCommand.php index <HASH>..<HASH> 100644 --- a/Console/AuthMakeCommand.php +++ b/Console/AuthMakeCommand.php @@ -26,9 +26,10 @@ class AuthMakeCommand extends Command { public function fire() { $this->call('auth:controller'); - $this->call('auth:register-request'); - $this->call('auth:login-request'); $this->call('auth:reminders-controller'); + $this->callSilent('auth:register-request'); + $this->callSilent('auth:login-request'); + $this->info('Authentication requests created successfully.'); $this->call('auth:reminders-table'); } diff --git a/Console/RemindersTableCommand.php b/Console/RemindersTableCommand.php index <HASH>..<HASH> 100644 --- a/Console/RemindersTableCommand.php +++ b/Console/RemindersTableCommand.php @@ -50,7 +50,7 @@ class RemindersTableCommand extends Command { $this->files->put($fullPath, $this->getMigrationStub()); - $this->info('Migration created successfully!'); + $this->info('Migration created successfully.'); $this->call('dump-autoload'); }
Change order of auth:make command.
illuminate_auth
train
php,php
5a5524623cc70838dce3e88d87a374cd9a31453b
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java index <HASH>..<HASH> 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java @@ -439,7 +439,18 @@ public class PacketParserUtils { } else if (elementName.equals("show")) { String modeText = parser.nextText(); - presence.setMode(Presence.Mode.fromString(modeText)); + if (StringUtils.isNotEmpty(modeText)) { + presence.setMode(Presence.Mode.fromString(modeText)); + } else { + // Some implementations send presence stanzas with a + // '<show />' element, which is a invalid XMPP presence + // stanza according to RFC 6121 4.7.2.1 + LOGGER.warning("Empty or null mode text in presence show element form " + + presence.getFrom() + + " with id '" + + presence.getPacketID() + + "' which is invalid according to RFC6121 4.7.2.1"); + } } else if (elementName.equals("error")) { presence.setError(parseError(parser));
Make presence parsing more robust by allowing 'show' to be an empty element: '<show />'
igniterealtime_Smack
train
java
993385093af7b6a9ca3090241657afcb0b42af5f
diff --git a/tests/Output/FileWriterTest.php b/tests/Output/FileWriterTest.php index <HASH>..<HASH> 100644 --- a/tests/Output/FileWriterTest.php +++ b/tests/Output/FileWriterTest.php @@ -15,9 +15,7 @@ class FileWriterTest extends TestCase * for some reason it wasn't found. Since this is a PHPUnit\TestCase object, I felt * like this was a safe enough change to make. */ - if(method_Exists($this, 'expectErrorMessage')) { - $this->expectErrorMessage('Migrations directory "doesntexist" does not exist.'); - } + $this->expectExceptionMessage('Migrations directory "doesntexist" does not exist.'); $writer->write('contents', 'filename.php', 'doesntexist'); }
Fixing FileWriterTest.
laravel-doctrine_migrations
train
php
b6d41f3272a655a2b5b0485692e01dbd8e554fe5
diff --git a/upup/pkg/fi/nodeup/nodetasks/service.go b/upup/pkg/fi/nodeup/nodetasks/service.go index <HASH>..<HASH> 100644 --- a/upup/pkg/fi/nodeup/nodetasks/service.go +++ b/upup/pkg/fi/nodeup/nodetasks/service.go @@ -71,7 +71,7 @@ func (p *Service) GetDependencies(tasks map[string]fi.Task) []fi.Task { // launching a custom Kubernetes build), they all depend on // the "docker.service" Service task. switch v.(type) { - case *File, *Package, *UpdatePackages, *UserTask, *GroupTask, *MountDiskTask, *Chattr: + case *File, *Package, *UpdatePackages, *UserTask, *GroupTask, *MountDiskTask, *Chattr, *BindMount, *Archive: deps = append(deps, v) case *Service, *LoadImageTask: // ignore
nodeup: Add some dependencies for Service We handle service dependencies on BindMount and Archive tasks; this avoids some false-positive warning messages.
kubernetes_kops
train
go
afe3f435d051be9b691759a8cdbfb8af0a610c85
diff --git a/lib/Controller/Data/Array.php b/lib/Controller/Data/Array.php index <HASH>..<HASH> 100644 --- a/lib/Controller/Data/Array.php +++ b/lib/Controller/Data/Array.php @@ -55,8 +55,9 @@ class Controller_Data_Array extends Controller_Data { ->addMoreInfo('id', $data[$model->id_field]); } } else { // update - unset($model->_table[$this->short_name][$oldId]); - $newId = $data[$model->id_field]; + //unset($model->_table[$this->short_name][$oldId]); + $newId = $id; //$data[$model->id_field]; + $data = array_merge($model->_table[$this->short_name][$newId], $data); } $data[$model->id_field] = $newId; $model->_table[$this->short_name][$newId] = $data;
Fix problem with afterSave not being fire for Model/Array->save if modifying record
atk4_atk4
train
php
9abe8d98487ca1da79c9c99bcc8cd94b53070bdb
diff --git a/drivers/hyperv/hyperv.go b/drivers/hyperv/hyperv.go index <HASH>..<HASH> 100644 --- a/drivers/hyperv/hyperv.go +++ b/drivers/hyperv/hyperv.go @@ -61,7 +61,7 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag { }, mcnflag.IntFlag{ Name: "hyperv-disk-size", - Usage: "Hyper-V disk size for host in MB.", + Usage: "Hyper-V maximum size of dynamically expanding disk in MB.", Value: defaultDiskSize, }, mcnflag.IntFlag{
Clarifying description of hyperv-disk-size Making clear the value is a maximum for a dynamic disk not the actual size of a fixed size disk.
docker_machine
train
go
2429270c5d5d7f7dce30b65d123fa233ea0f449a
diff --git a/client-vendor/after-body/promise-utils/promise-throttler.js b/client-vendor/after-body/promise-utils/promise-throttler.js index <HASH>..<HASH> 100644 --- a/client-vendor/after-body/promise-utils/promise-throttler.js +++ b/client-vendor/after-body/promise-utils/promise-throttler.js @@ -49,9 +49,7 @@ if (options.queue && promise && promise.isPending()) { var args = arguments; var self = this; - promise = promise.then(function() { - return fn.apply(self, args); - }).catch(function() { + promise = promise.finally(function() { return fn.apply(self, args); }); }
Fix cancel of promiseThrottled queue
cargomedia_cm
train
js
7d37be310517ee26384e4e75b01a55baea7053a8
diff --git a/lib/rails_admin/config/fields/factories/active_storage.rb b/lib/rails_admin/config/fields/factories/active_storage.rb index <HASH>..<HASH> 100644 --- a/lib/rails_admin/config/fields/factories/active_storage.rb +++ b/lib/rails_admin/config/fields/factories/active_storage.rb @@ -1,6 +1,7 @@ require 'rails_admin/config/fields' require 'rails_admin/config/fields/types' require 'rails_admin/config/fields/types/file_upload' +require 'rails_admin/adapters/active_record/association' RailsAdmin::Config::Fields.register_factory do |parent, properties, fields| if defined?(::ActiveStorage) && properties.is_a?(RailsAdmin::Adapters::ActiveRecord::Association) && (match = /\A(.+)_attachments?\Z/.match properties.name) && properties.klass.to_s == 'ActiveStorage::Attachment'
const RailsAdmin::Adapters::ActiveRecord missing every time I initialize my Mongoid Model
sferik_rails_admin
train
rb
c76ab764c249efb1e5e08b09db52a7d2a3255df3
diff --git a/salt/states/module.py b/salt/states/module.py index <HASH>..<HASH> 100644 --- a/salt/states/module.py +++ b/salt/states/module.py @@ -211,8 +211,12 @@ def run(name, **kwargs): ret['comment'] = 'Module function {0} executed'.format(name) ret['result'] = True - if ret['changes'].get('retcode', 0) != 0: + # if mret is a dict and there is retcode and its non-zero + if isinstance(mret, dict) and mret.get('retcode', 0) != 0: ret['result'] = False + # if its a boolean, return that as the result + elif isinstance(mret, bool): + ret['result'] = mret else: changes_ret = ret['changes'].get('ret', {}) if isinstance(changes_ret, dict) and changes_ret.get('retcode', 0) != 0:
Fix to allow for module.run to fail state execution There was code to check retcode-- but it was done improperly so it would never cause a failure. Also, it seems reasonable that if the return is a boolean we should use that as the result
saltstack_salt
train
py
8660629d7b81844436de759f4b439dec90dcc229
diff --git a/requirements.txt b/requirements.txt index <HASH>..<HASH> 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -requests==2.25.1 +httpx>=0.20.0<1.0.0 websockets==9.1 sphinx-rtd-theme==0.4.1 diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -44,6 +44,6 @@ setup( python_requires=">=3.5", install_requires=[ 'websockets>=8', - 'requests>=2.25' + 'httpx>=0.20.0<1.0.0', ], ) diff --git a/src/mattermostdriver/exceptions.py b/src/mattermostdriver/exceptions.py index <HASH>..<HASH> 100644 --- a/src/mattermostdriver/exceptions.py +++ b/src/mattermostdriver/exceptions.py @@ -1,4 +1,4 @@ -from requests import HTTPError +from httpx import HTTPError class InvalidOrMissingParameters(HTTPError):
httpx part 1: exceptions, requiremets.txt
Vaelor_python-mattermost-driver
train
txt,py,py
acdb333110ede5973b7d28b0a75f5b62b307fc8b
diff --git a/master/buildbot/schedulers/forcesched.py b/master/buildbot/schedulers/forcesched.py index <HASH>..<HASH> 100644 --- a/master/buildbot/schedulers/forcesched.py +++ b/master/buildbot/schedulers/forcesched.py @@ -755,7 +755,7 @@ class ForceScheduler(base.BaseScheduler): else: builderNames = self.builderNames else: - builderNames = list( + builderNames = sorted( set(builderNames).intersection(self.builderNames)) defer.returnValue(builderNames)
Sort the builder names obtained from the set intersection. This fixes a test failure on Python 3
buildbot_buildbot
train
py
eaec0026cff1cdfc974763a43f6ed5a3911c642f
diff --git a/lib/fabrication/schematic/definition.rb b/lib/fabrication/schematic/definition.rb index <HASH>..<HASH> 100644 --- a/lib/fabrication/schematic/definition.rb +++ b/lib/fabrication/schematic/definition.rb @@ -89,6 +89,7 @@ class Fabrication::Schematic::Definition end def merge(overrides={}, &block) + return self unless overrides.any? or block_given? clone.tap do |schematic| schematic.instance_eval(&block) if block_given? overrides.each do |name, value|
Use existing schematic definition unless overrides provided
paulelliott_fabrication
train
rb
f9d0b69bcebba76b2dc5c126c591e673c1f63e63
diff --git a/lib/homesick/actions.rb b/lib/homesick/actions.rb index <HASH>..<HASH> 100644 --- a/lib/homesick/actions.rb +++ b/lib/homesick/actions.rb @@ -11,7 +11,7 @@ class Homesick if ! destination.directory? say_status 'git clone', "#{repo} to #{destination.expand_path}", :green unless options[:quiet] - system "git clone -q #{repo} #{destination}" unless options[:pretend] + system "git clone -q --recursive #{repo} #{destination}" unless options[:pretend] else say_status :exist, destination.expand_path, :blue unless options[:quiet] end
add recursive option to 'homesick clone'
technicalpickles_homesick
train
rb
58c0294d49210d3b1f9adaf19602013d568fe4c5
diff --git a/classes/ezjsctags.php b/classes/ezjsctags.php index <HASH>..<HASH> 100644 --- a/classes/ezjsctags.php +++ b/classes/ezjsctags.php @@ -94,10 +94,13 @@ class ezjscTags extends ezjscServerFunctions $tagsToSuggest[] = $result; } + if ( empty( $tagsToSuggest ) ) + return array( 'status' => 'success', 'message' => '', 'tags' => array() ); + return self::generateOutput( array( 'id' => array( $tagsToSuggest ) ), - $http->postVariable( 'subtree_limit', 0 ), - $http->postVariable( 'hide_root_tag', '0' ), + 0, + false, $http->postVariable( 'locale', '' ) ); } @@ -166,7 +169,7 @@ class ezjscTags extends ezjscServerFunctions return array( 'status' => 'success', 'message' => '', 'tags' => array() ); // @TODO Fix synonyms not showing up in autocomplete - // when subtree limit is defined in class attribute + // when subtree limit is defined in class attribute if ( $subTreeLimit > 0 ) { if ( $hideRootTag )
Fix fatal error when there are no tags to suggest
ezsystems_eztags
train
php
1b6694cfeefb1b8be73b7700d33b238d5128e8d4
diff --git a/lib/rfxcom.js b/lib/rfxcom.js index <HASH>..<HASH> 100644 --- a/lib/rfxcom.js +++ b/lib/rfxcom.js @@ -535,7 +535,7 @@ RfxCom.prototype.lighting2Handler = function(data) { unitcode = data[6], command = commands[data[7]], level = data[8], - rssi = data[9] & 0x0f, + rssi = (data[9] & 0xf0) >> 4, evt; idBytes[0] &= ~0xfc; // "id1 : 2"
Correct the RSSI calculation for lighting2 received messages
rfxcom_node-rfxcom
train
js
bdbaf04b1bd757d9916a0782ee097273e78c1393
diff --git a/aiogram/dispatcher/__init__.py b/aiogram/dispatcher/__init__.py index <HASH>..<HASH> 100644 --- a/aiogram/dispatcher/__init__.py +++ b/aiogram/dispatcher/__init__.py @@ -255,7 +255,7 @@ class Dispatcher: :param func: custom any callable object :param custom_filters: list of custom filters :param kwargs: - :param state: + :param state: :return: decorated function """ if content_types is None: @@ -644,7 +644,7 @@ class Dispatcher: func=func, state=state, **kwargs) - self.chosen_inline_result_handlers.register(callback, filters_set) + self.callback_query_handlers.register(callback, filters_set) def callback_query_handler(self, *, func=None, state=None, custom_filters=None, **kwargs): """
Hm... lost.. I thinks i'm already merged that...
aiogram_aiogram
train
py
8236465a23dc0603715827ab5f8b18e3fc930814
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -119,7 +119,10 @@ setup( # $ pip install -e .[dev,test] extras_require={ 'test': ['hypothesis', 'pytest', 'pytest-mock', 'tox'], - 'docs': ['sphinx', 'sphinx_rtd_theme'] + 'docs': ['sphinx', 'sphinx_rtd_theme'], + 'pytest_runner': ['cosmic_ray_pytest_runner'], + 'nose_runner': ['cosmic_ray_nose_runner'], + 'celery3_engine': ['cosmic_ray_celery3_engine'], }, entry_points={ 'console_scripts': [ @@ -134,7 +137,7 @@ setup( 'cosmic_ray.operators': OPERATORS, 'cosmic_ray.execution_engines': [ 'local = cosmic_ray.execution.local:LocalExecutionEngine', - ] + ], }, long_description=LONG_DESCRIPTION, )
Created "extra_requires" for the non-builtin plugins. These plugins are now available on PyPI, so these extra_requires reference those wheels.
sixty-north_cosmic-ray
train
py
3cb33b295309ec41eeeb88afa2885cecdb31f2e5
diff --git a/test/test_formatting_api.py b/test/test_formatting_api.py index <HASH>..<HASH> 100644 --- a/test/test_formatting_api.py +++ b/test/test_formatting_api.py @@ -71,10 +71,12 @@ class TestNullComponent(TestCase): class TestPlaceholder(TestCase): def setUp(self): self.terminal = Terminal(force_styling=True) + self.format = FormatPlaceholderFactory() + self.style = StylePlaceholderFactory() self.styles = { - 'heading': FormatPlaceholder('underline'), - 'h1': StylePlaceholder('heading'), - 'h2': StylePlaceholder('heading') + FormatPlaceholder('red')} + 'heading': self.format.underline, + 'h1': self.style.heading, + 'h2': self.style.heading + self.format.red} def test_populate_format_placeholder(self): format_placeholder = FormatPlaceholder('red')
Make placehoder test's style construction more like the API
ch3pjw_junction
train
py
b2dc75a8c8d71a8ff6221fa461e921db237b712d
diff --git a/packages/core/parcel/src/cli.js b/packages/core/parcel/src/cli.js index <HASH>..<HASH> 100755 --- a/packages/core/parcel/src/cli.js +++ b/packages/core/parcel/src/cli.js @@ -95,6 +95,7 @@ let build = program .command('build [input...]') .description('bundles for production') .option('--no-minify', 'disable minification') + .option('--no-scope-hoist', 'disable scope-hoisting') .action(run); applyOptions(build, commonOptions); @@ -238,11 +239,12 @@ async function normalizeOptions(command): Promise<InitialParcelOptions> { cacheDir: command.cacheDir, mode, minify: command.minify != null ? command.minify : mode === 'production', - sourceMaps: command.sourceMaps != false, + sourceMaps: command.sourceMaps ?? true, + scopeHoist: command.scopeHoist ?? true, hot: hmr, serve, targets: command.target.length > 0 ? command.target : null, - autoinstall: command.autoinstall !== false, + autoinstall: command.autoinstall ?? true, logLevel: command.logLevel, profile: command.profile };
Allow --no-scope-hoist as a cli option for builds
parcel-bundler_parcel
train
js
915a92bda684e747b898dee828debba44be67842
diff --git a/src/components/fields/ObjectField.js b/src/components/fields/ObjectField.js index <HASH>..<HASH> 100644 --- a/src/components/fields/ObjectField.js +++ b/src/components/fields/ObjectField.js @@ -72,7 +72,7 @@ class ObjectField extends Component { {(uiSchema["ui:title"] || title) && <TitleField id={`${idSchema.$id}__title`} - title={title || uiSchema["ui:title"]} + title={uiSchema["ui:title"] || title} required={required} formContext={formContext} />}
Fix ui:title for objects (#<I>) (#<I>)
mozilla-services_react-jsonschema-form
train
js
4401ee1fa1d2740f7f25a196f6f8c27ec335ae7f
diff --git a/Kwc/Newsletter/Detail/Mail/Paragraphs/LinkTag/Component.php b/Kwc/Newsletter/Detail/Mail/Paragraphs/LinkTag/Component.php index <HASH>..<HASH> 100644 --- a/Kwc/Newsletter/Detail/Mail/Paragraphs/LinkTag/Component.php +++ b/Kwc/Newsletter/Detail/Mail/Paragraphs/LinkTag/Component.php @@ -9,6 +9,14 @@ class Kwc_Newsletter_Detail_Mail_Paragraphs_LinkTag_Component 'Kwc_Newsletter_Detail_Mail_Paragraphs_LinkTag_Unsubscribe_Component'; $ret['generators']['child']['component']['editSubscriber'] = 'Kwc_Newsletter_Detail_Mail_Paragraphs_LinkTag_EditSubscriber_Component'; + + $cc = Kwf_Registry::get('config')->kwc->childComponents; + if (isset($cc->Kwc_Newsletter_Detail_Mail_Paragraphs_LinkTag_Component)) { + $ret['generators']['child']['component'] = array_merge( + $ret['generators']['child']['component'], + $cc->Kwc_Newsletter_Detail_Mail_Paragraphs_LinkTag_Component->toArray() + ); + } return $ret; } -} \ No newline at end of file +}
Newsletter LinkTags are now configurable thru config.ini setting kwc.childComponents.Kwc_Newsletter_Detail_Mail_Paragraphs_LinkTag_Component
koala-framework_koala-framework
train
php
0dadbb451f6acb097ba7c548c8c315f083a633db
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -77,7 +77,8 @@ setup( 'Development Status :: 3 - Alpha', 'Environment :: Console', 'Intended Audience :: Developers', - 'License :: OSI Approved :: MIT License', + 'License :: OSI Approved :: GNU General Public License v3 ' + + 'or later (GPLv3+)', 'Operating System :: OS Independent', 'Natural Language :: English', 'Programming Language :: Python',
changed classifier to GPLv3+
kcolford_txt2boil
train
py
70c436d4dd8b99f4f44c0076b9b22f6744b76a31
diff --git a/library/src/main/java/com/liulishuo/filedownloader/message/MessageSnapshotTaker.java b/library/src/main/java/com/liulishuo/filedownloader/message/MessageSnapshotTaker.java index <HASH>..<HASH> 100644 --- a/library/src/main/java/com/liulishuo/filedownloader/message/MessageSnapshotTaker.java +++ b/library/src/main/java/com/liulishuo/filedownloader/message/MessageSnapshotTaker.java @@ -169,10 +169,11 @@ public class MessageSnapshotTaker { default: // deal with as error. final String message = FileDownloadUtils. - formatString("it can't takes a snapshot for the task(%s) when its status " + - "is %d,", model, status); + formatString("it can't takes a snapshot for the task(%s) when its status is %d,", + model, status); - FileDownloadLog.w(MessageSnapshotTaker.class, message); + FileDownloadLog.w(MessageSnapshotTaker.class, + "it can't takes a snapshot for the task(%s) when its status is %d,", model, status); final Throwable throwable; if (processParams.getException() != null) {
fix: fix some case double-format raise can't match exception
lingochamp_FileDownloader
train
java
9d127f8de3fa489b2c0d896dd9612f43e45f7cdd
diff --git a/daemon/cluster/services.go b/daemon/cluster/services.go index <HASH>..<HASH> 100644 --- a/daemon/cluster/services.go +++ b/daemon/cluster/services.go @@ -193,7 +193,7 @@ func (c *Cluster) UpdateService(serviceIDOrName string, version uint64, spec typ } } - resp := &apitypes.ServiceUpdateResponse{} + resp = &apitypes.ServiceUpdateResponse{} // pin image by digest if os.Getenv("DOCKER_SERVICE_PREFER_OFFLINE_IMAGE") != "1" {
cluster: Fix shadowed resp variable The response would never reach the client because it was being redeclared in the current scope.
moby_moby
train
go
6d9aecbbcad7a0caef205c3d495c184486169202
diff --git a/collectors/languages.php b/collectors/languages.php index <HASH>..<HASH> 100644 --- a/collectors/languages.php +++ b/collectors/languages.php @@ -36,6 +36,10 @@ class QM_Collector_Languages extends QM_Collector { */ public function log_file_load( $override, $domain, $mofile ) { + if ( 'query-monitor' === $domain && self::hide_qm() ) { + return $override; + } + $trace = new QM_Backtrace; $filtered = $trace->get_filtered_trace(); $caller = array();
Hide Query Monitor from the Languages panel when relevant.
johnbillion_query-monitor
train
php
7044468d4335de21e54df0abb3497cbbd08c36c4
diff --git a/lib/util/http-mgr.js b/lib/util/http-mgr.js index <HASH>..<HASH> 100644 --- a/lib/util/http-mgr.js +++ b/lib/util/http-mgr.js @@ -234,7 +234,9 @@ function updateBody(url, callback, init) { return; } var code = res.statusCode; - if (!err && code != 200 && code != 204) { + if (code == 404) { + err = body = ''; + } else if (!err && code != 200 && code != 204) { err = new Error('Response ' + code); } if (err) {
refactor: handle reponse <I> of remote rules
avwo_whistle
train
js
30a219abc735bebd359f9f60065a69b1bca4999a
diff --git a/llrb/llrb.go b/llrb/llrb.go index <HASH>..<HASH> 100644 --- a/llrb/llrb.go +++ b/llrb/llrb.go @@ -274,7 +274,7 @@ func delete(h *node, item Item) (*node, Item) { return fixUp(h), deleted } -// |Iter| returns a chan that iterates through all elements in the +// Iter() returns a chan that iterates through all elements in the // tree in ascending order. func (t *Tree) Iter() <-chan Item { c := make(chan Item) @@ -285,6 +285,8 @@ func (t *Tree) Iter() <-chan Item { return c } +// IterRange() returns a chan that iterates through all elements E in the +// tree with @lower <= E < @upper in ascending order. func (t *Tree) IterRange(lower, upper Item) <-chan Item { c := make(chan Item) go func() {
added doc to IterRange
petar_GoLLRB
train
go
ed5292d9b4882a64cdc66918295db90c19db09c7
diff --git a/rtv/terminal.py b/rtv/terminal.py index <HASH>..<HASH> 100644 --- a/rtv/terminal.py +++ b/rtv/terminal.py @@ -15,6 +15,7 @@ from contextlib import contextmanager from tempfile import NamedTemporaryFile import six +from six.moves.urllib.parse import quote from kitchen.text.display import textual_width_chop from mailcap_fix import mailcap @@ -468,7 +469,12 @@ class Terminal(object): """ if self.display: - command = "import webbrowser; webbrowser.open_new_tab('%s')" % url + # Note that we need to sanitize the url before inserting it into + # the python code to prevent injection attacks. + command = ( + "import webbrowser\n" + "from six.moves.urllib.parse import unquote\n" + "webbrowser.open_new_tab(unquote('%s'))" % quote(url)) args = [sys.executable, '-c', command] with self.loader('Opening page in a new window'), \ open(os.devnull, 'ab+', 0) as null:
Secure urls before sending to Popen.
michael-lazar_rtv
train
py
274f064875f5e3fb7baf9276df61e27bae1421e9
diff --git a/dispatcher/behavior/attachable.php b/dispatcher/behavior/attachable.php index <HASH>..<HASH> 100644 --- a/dispatcher/behavior/attachable.php +++ b/dispatcher/behavior/attachable.php @@ -45,15 +45,13 @@ class ComFilesDispatcherBehaviorAttachable extends KBehaviorAbstract $query = $context->getRequest()->getQuery(); - $action = $context->getRequest()->getData()->_action; - if ($query->routed && in_array($query->view, array('file', 'files'))) { $this->_forward($context); $this->send($context); $result = false; - } elseif (in_array($query->view, array('attachment', 'attachments')) || - in_array($action, array('attach', 'detach'))) + } + elseif (in_array($query->view, array('attachment', 'attachments'))) { $container = $this->getObject('com:files.model.containers')->slug($this->_container)->fetch();
re #<I> Simplified condition.
joomlatools_joomlatools-framework
train
php
a05a54bb505fa976438cfae1a2debf2703d29638
diff --git a/ampersand-dom.js b/ampersand-dom.js index <HASH>..<HASH> 100644 --- a/ampersand-dom.js +++ b/ampersand-dom.js @@ -36,10 +36,14 @@ var dom = module.exports = { addAttribute: function (el, attr) { // setting to empty string does same el.setAttribute(attr, ''); + // Some browsers won't update UI for checkboxes unless you + // set it like so: https://bugzilla.mozilla.org/show_bug.cgi?id=327020 + if (attr === 'checked') el.checked = true; }, // completely removes attribute removeAttribute: function (el, attr) { el.removeAttribute(attr); + if (attr === 'checked') el.checked = false; }, // sets attribute to string value given, clearing any current value setAttribute: function (el, attr, value) {
add explicit assigment to handle browsers inconsistencies around doing setAttribute('checked')
AmpersandJS_ampersand-dom
train
js
ef71c3241b415aecf41fabadd87654ff5ee93db8
diff --git a/spyder/plugins/ipythonconsole.py b/spyder/plugins/ipythonconsole.py index <HASH>..<HASH> 100644 --- a/spyder/plugins/ipythonconsole.py +++ b/spyder/plugins/ipythonconsole.py @@ -869,9 +869,12 @@ class IPythonConsole(SpyderPluginWidget): """Execute code instructions.""" sw = self.get_current_shellwidget() if sw is not None: - if clear_variables: - sw.reset_namespace(force=True) - sw.execute(to_text_string(lines)) + if sw._reading: + pass + else: + if clear_variables: + sw.reset_namespace(force=True) + sw.execute(to_text_string(to_text_string(lines))) self.activateWindow() self.get_current_client().get_control().setFocus()
IPython console: Don't block the console trying to run cells or lines while debugging
spyder-ide_spyder
train
py
8c5f328781fe1f8b9921233771fb28dfd2e737fb
diff --git a/azurerm/resource_arm_healthcare_service.go b/azurerm/resource_arm_healthcare_service.go index <HASH>..<HASH> 100644 --- a/azurerm/resource_arm_healthcare_service.go +++ b/azurerm/resource_arm_healthcare_service.go @@ -78,6 +78,7 @@ func resourceArmHealthcareService() *schema.Resource { "authentication_configuration": { Type: schema.TypeList, Optional: true, + Computed: true, MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{
r/healthcare_service: making the `authentication_configuration` block computed There's a default value set within Azure
terraform-providers_terraform-provider-azurerm
train
go
909d193766d48237485a284e1aac115ee73a5e63
diff --git a/lib/Alchemy/Phrasea/Core/Provider/TwigServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/TwigServiceProvider.php index <HASH>..<HASH> 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/TwigServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/TwigServiceProvider.php @@ -120,7 +120,7 @@ class TwigServiceProvider implements ServiceProviderInterface $twig->addFilter(new \Twig_SimpleFilter('linkify', function (\Twig_Environment $twig, $string) use ($app) { return preg_replace( - "/(\\W|^)(https?:\/{2,4}[\\w:#%\/;$()~_?\/\-=\\\.&]+)/m" + "/(\\W|^)(https?:\/{2,4}[\\w:#!%\/;$()~_?\/\-=\\\.&]+)/m" , '$1$2 <a title="' . $app['translator']->trans('Open the URL in a new window') . '" class=" fa fa-external-link" href="$2" style="font-size:1.2em;display:inline;padding:2px 5px;margin:0 4px 0 2px;" target="_blank"> &nbsp;</a>$7' , $string
PHRAS-<I> fix clickable link (#<I>)
alchemy-fr_Phraseanet
train
php
663b266718b599032311d724831be42216f1c76b
diff --git a/app/code/local/Aoe/Scheduler/Model/Observer.php b/app/code/local/Aoe/Scheduler/Model/Observer.php index <HASH>..<HASH> 100644 --- a/app/code/local/Aoe/Scheduler/Model/Observer.php +++ b/app/code/local/Aoe/Scheduler/Model/Observer.php @@ -22,7 +22,14 @@ class Aoe_Scheduler_Model_Observer extends Mage_Cron_Model_Observer { $schedules = $this->getPendingSchedules(); $scheduleLifetime = Mage::getStoreConfig(self::XML_PATH_SCHEDULE_LIFETIME) * 60; $now = time(); - $jobsRoot = Mage::getConfig()->getNode('crontab/jobs'); + + // fetch global cronjob config + $jobsRoot = Mage::getConfig()->getNode('crontab/jobs'); + + // extend cronjob config with the configurable ones + $jobsRoot->extend( + Mage::getConfig()->getNode('default/crontab/jobs') + ); foreach ($schedules->getIterator() as $schedule) { /* @var $schedule Aoe_Scheduler_Model_Schedule */ try {
extend cronjob config with the configurable ones
AOEpeople_Aoe_Scheduler
train
php
72d98c9275c84dabe5841dbd1392bb556faca43e
diff --git a/src/Project/Task/Drupal/DrupalTasks.php b/src/Project/Task/Drupal/DrupalTasks.php index <HASH>..<HASH> 100644 --- a/src/Project/Task/Drupal/DrupalTasks.php +++ b/src/Project/Task/Drupal/DrupalTasks.php @@ -23,16 +23,30 @@ class DrupalTasks extends Tasks /** * Setup local environment for already built projects. + * + * @param array $opts + * @option bool $no-engine Don't start local development engine. + * @option bool $no-browser Don't launch a browser window after setup is complete. */ - public function drupalLocalSetup() + public function drupalLocalSetup($opts = ['no-engine' => false, 'no-browser' => false]) { - $this->getProjectInstance() - ->projectEngineUp() - ->setupDrupalLocalSettings() - ->setupDrupalInstall() - ->projectLaunchBrowser(); + $instance = $this + ->getProjectInstance() + ->setupDrupalLocalSettings(); + + if (!$opts['no-engine']) { + $instance->projectEngineUp(); + } + + $instance->setupDrupalInstall(); + + if (!$opts['no-browser']) { + $instance->projectLaunchBrowser(); + } $this->drupalDrushAlias(); + + return $this; } /**
Add command options to the Drupal local-setup task.
droath_project-x
train
php